1 files changed, 14 insertions, 7 deletions

diff --git a/javax/security/auth/kerberos/ServicePermission.java b/javax/security/auth/kerberos/ServicePermission.java
index 4412ea459..ba015246e 100644
--- a/javax/security/auth/kerberos/ServicePermission.java
+++ b/javax/security/auth/kerberos/ServicePermission.java
@@ -1,5 +1,5 @@
 /* ServicePermission.java -- kerberos service permission
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2014 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,8 +54,7 @@ import java.util.Vector;
 public final class ServicePermission
     extends Permission
 {
-  // FIXME: Enable this when serialization works.
-  // private static final long serialVersionUID = -1227585031618624935L;
+  private static final long serialVersionUID = -1227585031618624935L;
 
   private static final int INITIATE = 1;
   private static final int ACCEPT = 2;
@@ -82,6 +81,7 @@ public final class ServicePermission
     parseActions(action);
   }
 
+  @Override
   public boolean implies(Permission perm)
   {
     if (! (perm instanceof ServicePermission))
@@ -92,6 +92,7 @@ public final class ServicePermission
     return getName().equals(sp.getName());
   }
 
+  @Override
   public boolean equals(Object obj)
   {
     if (! (obj instanceof ServicePermission))
@@ -100,6 +101,7 @@ public final class ServicePermission
     return flags == sp.flags && getName().equals(sp.getName());
   }
 
+  @Override
   public int hashCode()
   {
     return getName().hashCode() + flags;
@@ -108,6 +110,7 @@ public final class ServicePermission
   /**
    * Return a string representing the actions.
    */
+  @Override
   public String getActions()
   {
     if (flags == (INITIATE | ACCEPT))
@@ -119,12 +122,14 @@ public final class ServicePermission
     return "";
   }
 
+  @Override
   public PermissionCollection newPermissionCollection()
   {
     return new PermissionCollection()
     {
-      private Vector permissions = new Vector();
+      private Vector<Permission> permissions = new Vector<Permission>();
 
+      @Override
       public void add(Permission perm)
       {
         if (isReadOnly())
@@ -134,21 +139,23 @@ public final class ServicePermission
         permissions.add(perm);
       }
 
+      @Override
       public boolean implies(Permission perm)
       {
         if (! (perm instanceof ServicePermission))
           return false;
-        Enumeration e = elements();
+        Enumeration<Permission> e = elements();
         while (e.hasMoreElements())
           {
-            ServicePermission sp = (ServicePermission) e.nextElement();
+            Permission sp = e.nextElement();
             if (sp.implies(perm))
               return true;
           }
         return false;
       }
 
-      public Enumeration elements()
+      @Override
+      public Enumeration<Permission> elements()
       {
         return permissions.elements();
       }