diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/java/security/acl | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2 | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/classpath/java/security/acl')
| -rw-r--r-- | libjava/classpath/java/security/acl/Acl.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/security/acl/AclEntry.java | 6 | ||||
| -rw-r--r-- | libjava/classpath/java/security/acl/Group.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libjava/classpath/java/security/acl/Acl.java b/libjava/classpath/java/security/acl/Acl.java index ff139af..6a3f7d5 100644 --- a/libjava/classpath/java/security/acl/Acl.java +++ b/libjava/classpath/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/libjava/classpath/java/security/acl/AclEntry.java b/libjava/classpath/java/security/acl/AclEntry.java index 7b1bcf5..ea906f1 100644 --- a/libjava/classpath/java/security/acl/AclEntry.java +++ b/libjava/classpath/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/libjava/classpath/java/security/acl/Group.java b/libjava/classpath/java/security/acl/Group.java index 3ffdf15..ed6d56a 100644 --- a/libjava/classpath/java/security/acl/Group.java +++ b/libjava/classpath/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(); } |