commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/collections RELEASE-NOTES-2.1.1.html
Date Sat, 22 May 2004 11:39:27 GMT
scolebourne    2004/05/22 04:39:27

  Modified:    collections/src/java/org/apache/commons/collections/iterators
                        Tag: COLLECTIONS_2_1_BRANCH
                        EnumerationIterator.java
               collections/src/java/org/apache/commons/collections Tag:
                        COLLECTIONS_2_1_BRANCH EnumerationIterator.java
                        CollectionUtils.java
               collections Tag: COLLECTIONS_2_1_BRANCH
                        RELEASE-NOTES-2.1.1.html
  Log:
  Rename enum variables to enumeration to enable compilation on JDK1.5
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +7 -7      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java
  
  Index: EnumerationIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EnumerationIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- EnumerationIterator.java	15 Aug 2002 23:13:51 -0000	1.1
  +++ EnumerationIterator.java	22 May 2004 11:39:26 -0000	1.1.2.1
  @@ -101,11 +101,11 @@
        *  Constructs a new <Code>EnumerationIterator</Code> that will remove
        *  elements from the specified collection.
        *
  -     *  @param enum  the enumeration to use
  -     *  @param collection  the collection to remove elements form
  +     *  @param enumeration  the enumeration to use
  +     *  @param collection  the collection to remove elements from
        */
  -    public EnumerationIterator( Enumeration enum, Collection collection ) {
  -        this.enumeration = enum;
  +    public EnumerationIterator( Enumeration enumeration, Collection collection ) {
  +        this.enumeration = enumeration;
           this.collection = collection;
           this.last = null;
       }
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +7 -7      jakarta-commons/collections/src/java/org/apache/commons/collections/Attic/EnumerationIterator.java
  
  Index: EnumerationIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/Attic/EnumerationIterator.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- EnumerationIterator.java	12 Oct 2002 22:15:18 -0000	1.7
  +++ EnumerationIterator.java	22 May 2004 11:39:26 -0000	1.7.2.1
  @@ -96,11 +96,11 @@
        *  Constructs a new <Code>EnumerationIterator</Code> that will remove
        *  elements from the specified collection.
        *
  -     *  @param enum  the enumeration to use
  -     *  @param collection  the collection to remove elements form
  +     *  @param enumeration  the enumeration to use
  +     *  @param collection  the collection to remove elements from
        */
  -    public EnumerationIterator( Enumeration enum, Collection collection ) {
  -        super(enum, collection);
  +    public EnumerationIterator( Enumeration enumeration, Collection collection ) {
  +        super(enumeration, collection);
       }
   
   }
  
  
  
  1.18.2.1  +8 -8      jakarta-commons/collections/src/java/org/apache/commons/collections/CollectionUtils.java
  
  Index: CollectionUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/CollectionUtils.java,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- CollectionUtils.java	13 Oct 2002 00:38:36 -0000	1.18
  +++ CollectionUtils.java	22 May 2004 11:39:26 -0000	1.18.2.1
  @@ -636,13 +636,13 @@
               return ((Object[])obj)[idx];
           } 
           else if(obj instanceof Enumeration) {
  -            Enumeration enum = (Enumeration)obj;
  -            while(enum.hasMoreElements()) {
  +            Enumeration enumeration = (Enumeration)obj;
  +            while(enumeration.hasMoreElements()) {
                   idx--;
                   if(idx == -1) {
  -                    return enum.nextElement();
  +                    return enumeration.nextElement();
                   } else {
  -                    enum.nextElement();
  +                    enumeration.nextElement();
                   }
               }
           } 
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +1 -0      jakarta-commons/collections/Attic/RELEASE-NOTES-2.1.1.html
  
  Index: RELEASE-NOTES-2.1.1.html
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/Attic/RELEASE-NOTES-2.1.1.html,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- RELEASE-NOTES-2.1.1.html	22 May 2004 11:18:45 -0000	1.1.2.1
  +++ RELEASE-NOTES-2.1.1.html	22 May 2004 11:39:26 -0000	1.1.2.2
  @@ -33,6 +33,7 @@
        use <code>EmptyIterator.INSTANCE</code> instead</li>
   <li>Added <code>EmptyIterator</code></li>
   <li>Added <code>EmptyListIterator</code></li>
  +<li>Renamed enum variables to enumeration to enable compilation on JDK1.5</li>
   </ul>
   </p>
   <p>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message