2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)

3 files changed, 7 insertions, 7 deletions

diff --git a/java/security/acl/Acl.java b/java/security/acl/Acl.java
index ff139afd6..6a3f7d52a 100644
--- a/java/security/acl/Acl.java
+++ b/java/security/acl/Acl.java
@@ -117,7 +117,7 @@ public interface Acl extends Owner
    *
    * @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 @@ public interface Acl extends Owner
    *
    * @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>
diff --git a/java/security/acl/AclEntry.java b/java/security/acl/AclEntry.java
index 7b1bcf54d..ea906f184 100644
--- a/java/security/acl/AclEntry.java
+++ b/java/security/acl/AclEntry.java
@@ -94,7 +94,7 @@ public interface AclEntry extends Cloneable
   /**
    * 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 @@ public interface AclEntry extends Cloneable
    * 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 @@ public interface AclEntry extends Cloneable
    *
    * @return A list of permissions for this ACL entry
    */
-  Enumeration permissions();
+  Enumeration<Permission> permissions();
 
   /**
    * This method returns this object as a <code>String</code>.
diff --git a/java/security/acl/Group.java b/java/security/acl/Group.java
index 3ffdf15a4..ed6d56a57 100644
--- a/java/security/acl/Group.java
+++ b/java/security/acl/Group.java
@@ -74,7 +74,7 @@ public interface Group extends Principal
    * 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 @@ public interface Group extends Principal
    *
    * @return The list of all members of the group
    */
-  Enumeration members();
+  Enumeration<? extends Principal> members();
 }