cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources DirContextURLConnection.java RecyclableNamingEnumeration.java

[remm]

remm        2004/07/23 15:43:29

  Modified:    catalina/src/share/org/apache/naming/resources
                        DirContextURLConnection.java
                        RecyclableNamingEnumeration.java
  Log:
  - enum -> enumeration (JDK 1.5 update).
  
  Revision  Changes    Path
  1.3       +4 -4      
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java
  
  Index: DirContextURLConnection.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/DirContextURLConnection.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DirContextURLConnection.java      27 Feb 2004 14:58:54 -0000      1.2
  +++ DirContextURLConnection.java      23 Jul 2004 22:43:29 -0000      1.3
  @@ -339,9 +339,9 @@
           
           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) {
  
  
  
  1.4       +6 -6      
jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java
  
  Index: RecyclableNamingEnumeration.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/resources/RecyclableNamingEnumeration.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RecyclableNamingEnumeration.java  27 Feb 2004 14:58:54 -0000      1.3
  +++ RecyclableNamingEnumeration.java  23 Jul 2004 22:43:29 -0000      1.4
  @@ -55,7 +55,7 @@
       /**
        * Underlying enumeration.
        */
  -    protected Enumeration enum;
  +    protected Enumeration enumeration;
   
   
       // --------------------------------------------------------- Public Methods
  @@ -75,7 +75,7 @@
        */
       public boolean hasMore()
           throws NamingException {
  -        return enum.hasMoreElements();
  +        return enumeration.hasMoreElements();
       }
   
   
  @@ -88,12 +88,12 @@
   
   
       public boolean hasMoreElements() {
  -        return enum.hasMoreElements();
  +        return enumeration.hasMoreElements();
       }
   
   
       public Object nextElement() {
  -        return enum.nextElement();
  +        return enumeration.nextElement();
       }
   
   
  @@ -104,7 +104,7 @@
        * Recycle.
        */
       void recycle() {
  -        enum = entries.elements();
  +     enumeration = entries.elements();
       }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]