remm 2004/07/23 15:42:54
Modified: catalina/src/share/org/apache/naming
NamingContextEnumeration.java
NamingContextBindingsEnumeration.java
Log:
- enum -> enumeration (JDK 1.5 update).
Revision Changes Path
1.5 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContextEnumeration.java
Index: NamingContextEnumeration.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContextEnumeration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamingContextEnumeration.java 16 Jul 2004 17:09:50 -0000 1.4
+++ NamingContextEnumeration.java 23 Jul 2004 22:42:54 -0000 1.5
@@ -38,7 +38,7 @@
public NamingContextEnumeration(Iterator entries) {
- enum = entries;
+ iterator = entries;
}
@@ -48,7 +48,7 @@
/**
* Underlying enumeration.
*/
- protected Iterator enum;
+ protected Iterator iterator;
// --------------------------------------------------------- Public Methods
@@ -68,7 +68,7 @@
*/
public boolean hasMore()
throws NamingException {
- return enum.hasNext();
+ return iterator.hasNext();
}
@@ -81,12 +81,12 @@
public boolean hasMoreElements() {
- return enum.hasNext();
+ return iterator.hasNext();
}
public Object nextElement() {
- NamingEntry entry = (NamingEntry) enum.next();
+ NamingEntry entry = (NamingEntry) iterator.next();
return new NameClassPair(entry.name, entry.value.getClass().getName());
}
1.5 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java
Index: NamingContextBindingsEnumeration.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamingContextBindingsEnumeration.java 16 Jul 2004 17:09:50 -0000 1.4
+++ NamingContextBindingsEnumeration.java 23 Jul 2004 22:42:54 -0000 1.5
@@ -38,7 +38,7 @@
public NamingContextBindingsEnumeration(Iterator entries) {
- enum = entries;
+ iterator = entries;
}
@@ -48,7 +48,7 @@
/**
* Underlying enumeration.
*/
- protected Iterator enum;
+ protected Iterator iterator;
// --------------------------------------------------------- Public Methods
@@ -68,7 +68,7 @@
*/
public boolean hasMore()
throws NamingException {
- return enum.hasNext();
+ return iterator.hasNext();
}
@@ -81,12 +81,12 @@
public boolean hasMoreElements() {
- return enum.hasNext();
+ return iterator.hasNext();
}
public Object nextElement() {
- NamingEntry entry = (NamingEntry) enum.next();
+ NamingEntry entry = (NamingEntry) iterator.next();
return new Binding(entry.name, entry.value.getClass().getName(),
entry.value, true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
