henning 2003/02/18 07:37:59
Modified: src/java/org/apache/turbine/util/security GroupSet.java
PermissionSet.java RoleSet.java
Log:
deprecate elements(). Add an iterator() method which returns the set iterators
Revision Changes Path
1.6 +12 -2
jakarta-turbine-2/src/java/org/apache/turbine/util/security/GroupSet.java
Index: GroupSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/security/GroupSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GroupSet.java 12 Feb 2003 17:24:30 -0000 1.5
+++ GroupSet.java 18 Feb 2003 15:37:59 -0000 1.6
@@ -225,9 +225,19 @@
}
/**
- * Returns an Iterator for Groups in this GroupSet.
+ * @deprecated Use iterator() instead.
*/
public Iterator elements()
+ {
+ return set.iterator();
+ }
+
+ /**
+ * Returns an Iterator for Groups in this GroupSet.
+ *
+ * @return An Iterator for this GroupSet
+ */
+ public Iterator iterator()
{
return set.iterator();
}
1.6 +12 -2
jakarta-turbine-2/src/java/org/apache/turbine/util/security/PermissionSet.java
Index: PermissionSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/security/PermissionSet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PermissionSet.java 12 Feb 2003 17:24:31 -0000 1.5
+++ PermissionSet.java 18 Feb 2003 15:37:59 -0000 1.6
@@ -230,9 +230,19 @@
}
/**
- * Returns an Iterator for Permissions in this PermissionSet.
+ * @deprecated Use iterator() instead.
*/
public Iterator elements()
+ {
+ return set.iterator();
+ }
+
+ /**
+ * Returns an Iterator for Groups in this GroupSet.
+ *
+ * @return An Iterator for this GroupSet
+ */
+ public Iterator iterator()
{
return set.iterator();
}
1.5 +12 -2
jakarta-turbine-2/src/java/org/apache/turbine/util/security/RoleSet.java
Index: RoleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/security/RoleSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RoleSet.java 12 Feb 2003 17:24:31 -0000 1.4
+++ RoleSet.java 18 Feb 2003 15:37:59 -0000 1.5
@@ -227,9 +227,19 @@
}
/**
- * Returns an Iterator for Roles in this RoleSet.
+ * @deprecated Use iterator() instead.
*/
public Iterator elements()
+ {
+ return set.iterator();
+ }
+
+ /**
+ * Returns an Iterator for Groups in this GroupSet.
+ *
+ * @return An Iterator for this GroupSet
+ */
+ public Iterator iterator()
{
return set.iterator();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
