[cp-patches] [generics] Patch: FYI: genericize java.security.acl

[Tom Tromey]

I'm checking this in on the generics branch.

This genericizes the methods in java.security.acl.
There don't seem to be any implementations of these interfaces in
Classpath, so this is all that is needed.

Tom

2005-10-24  Tom Tromey  <address@hidden>

        * java/security/acl/Group.java (isMember): Javadoc fix.
        (members): Changed return type.
        * java/security/acl/AclEntry.java (addPermission): Fixed javadoc.
        (checkPermission): Likewise.
        (permissions): Changed return type.
        * java/security/acl/Acl.java (entries): Changed return type.
        (getPermissions): Likewise.

Index: java/security/acl/Acl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/acl/Acl.java,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 Acl.java
--- java/security/acl/Acl.java  2 Aug 2005 20:12:25 -0000       1.6.2.1
+++ java/security/acl/Acl.java  25 Oct 2005 01:03:50 -0000
@@ -117,7 +117,7 @@
    *
    * @return An enumeration of the ACL entries
    */
-  Enumeration entries();
+  Enumeration<AclEntry> entries();
 
   /**
    * This method tests whether or not the specified <code>Principal</code>
@@ -142,7 +142,7 @@
    *
    * @return A list of permissions for the <code>Principal</code>.
    */
-  Enumeration getPermissions(Principal user);
+  Enumeration<Permission> getPermissions(Principal user);
 
   /**
    * This method returns the ACL as a <code>String</code>
Index: java/security/acl/AclEntry.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/acl/AclEntry.java,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 AclEntry.java
--- java/security/acl/AclEntry.java     2 Aug 2005 20:12:26 -0000       1.5.2.1
+++ java/security/acl/AclEntry.java     25 Oct 2005 01:03:50 -0000
@@ -94,7 +94,7 @@
   /**
    * This method adds the specified permission to this ACL entry.
    *
-   * @param perm The <code>Permission</code> to add
+   * @param permission The <code>Permission</code> to add
    *
    * @return <code>true</code> if the permission was added or 
<code>false</code> if it was already set for this entry
    */
@@ -113,7 +113,7 @@
    * This method tests whether or not the specified permission is associated
    * with this ACL entry.
    *
-   * @param perm The <code>Permission</code> to test
+   * @param permission The <code>Permission</code> to test
    *
    * @return <code>true</code> if this permission is associated with this 
entry or <code>false</code> otherwise
    */
@@ -125,7 +125,7 @@
    *
    * @return A list of permissions for this ACL entry
    */
-  Enumeration permissions();
+  Enumeration<Permission> permissions();
 
   /**
    * This method returns this object as a <code>String</code>.
Index: java/security/acl/Group.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/acl/Group.java,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 Group.java
--- java/security/acl/Group.java        2 Aug 2005 20:12:26 -0000       1.6.2.1
+++ java/security/acl/Group.java        25 Oct 2005 01:03:50 -0000
@@ -74,7 +74,7 @@
    * This method tests whether or not a given <code>Principal</code> is a
    * member of this group.
    *
-   * @param user The <code>Principal</code> to test for membership
+   * @param member The <code>Principal</code> to test for membership
    *
    * @return <code>true</code> if the user is member, <code>false</code> 
otherwise
    */
@@ -86,5 +86,5 @@
    *
    * @return The list of all members of the group
    */
-  Enumeration members();
+  Enumeration<? extends Principal> members();
 }