Author: markt Date: Sat Dec 31 06:32:01 2005 New Revision: 360283 URL: http://svn.apache.org/viewcvs?rev=360283&view=rev Log: Code clean up.
Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextEnumeration.java tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java?rev=360283&r1=360282&r2=360283&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextBindingsEnumeration.java Sat Dec 31 06:32:01 2005 @@ -38,12 +38,12 @@ public NamingContextBindingsEnumeration(Vector entries) { - enum = entries.elements(); + enumeration = entries.elements(); } - public NamingContextBindingsEnumeration(Enumeration enum) { - this.enum = enum; + public NamingContextBindingsEnumeration(Enumeration enumeration) { + this.enumeration = enumeration; } @@ -53,7 +53,7 @@ /** * Underlying enumeration. */ - protected Enumeration enum; + protected Enumeration enumeration; // --------------------------------------------------------- Public Methods @@ -73,7 +73,7 @@ */ public boolean hasMore() throws NamingException { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } @@ -86,12 +86,12 @@ public boolean hasMoreElements() { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } public Object nextElement() { - NamingEntry entry = (NamingEntry) enum.nextElement(); + NamingEntry entry = (NamingEntry) enumeration.nextElement(); return new Binding(entry.name, entry.value.getClass().getName(), entry.value, true); } Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextEnumeration.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextEnumeration.java?rev=360283&r1=360282&r2=360283&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextEnumeration.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/NamingContextEnumeration.java Sat Dec 31 06:32:01 2005 @@ -38,12 +38,12 @@ public NamingContextEnumeration(Vector entries) { - enum = entries.elements(); + enumeration = entries.elements(); } - public NamingContextEnumeration(Enumeration enum) { - this.enum = enum; + public NamingContextEnumeration(Enumeration enumeration) { + this.enumeration = enumeration; } @@ -53,7 +53,7 @@ /** * Underlying enumeration. */ - protected Enumeration enum; + protected Enumeration enumeration; // --------------------------------------------------------- Public Methods @@ -73,7 +73,7 @@ */ public boolean hasMore() throws NamingException { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } @@ -86,12 +86,12 @@ public boolean hasMoreElements() { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } public Object nextElement() { - NamingEntry entry = (NamingEntry) enum.nextElement(); + NamingEntry entry = (NamingEntry) enumeration.nextElement(); return new NameClassPair(entry.name, entry.value.getClass().getName()); } Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java?rev=360283&r1=360282&r2=360283&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java Sat Dec 31 06:32:01 2005 @@ -339,9 +339,11 @@ if (collection != null) { try { - NamingEnumeration enum = context.list(getURL().getFile()); - while (enum.hasMoreElements()) { - NameClassPair ncp = (NameClassPair) enum.nextElement(); + NamingEnumeration enumeration = + context.list(getURL().getFile()); + while (enumeration.hasMoreElements()) { + NameClassPair ncp = + (NameClassPair) enumeration.nextElement(); result.addElement(ncp.getName()); } } catch (NamingException e) { Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java?rev=360283&r1=360282&r2=360283&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/ProxyDirContext.java Sat Dec 31 06:32:01 2005 @@ -37,7 +37,7 @@ import org.apache.naming.StringManager; -import org.apache.commons.collections.LRUMap; +import org.apache.commons.collections.map.LRUMap; /** * Proxy Directory Context implementation. Modified: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java?rev=360283&r1=360282&r2=360283&view=diff ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java (original) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java Sat Dec 31 06:32:01 2005 @@ -54,7 +54,7 @@ /** * Underlying enumeration. */ - protected Enumeration enum; + protected Enumeration enumeration; // --------------------------------------------------------- Public Methods @@ -74,7 +74,7 @@ */ public boolean hasMore() throws NamingException { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } @@ -87,12 +87,12 @@ public boolean hasMoreElements() { - return enum.hasMoreElements(); + return enumeration.hasMoreElements(); } public Object nextElement() { - return enum.nextElement(); + return enumeration.nextElement(); } @@ -103,7 +103,7 @@ * Recycle. */ void recycle() { - enum = entries.elements(); + enumeration = entries.elements(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]