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/src/java/org/apache/commons/collections/iterators EnumerationIterator.java
Date Wed, 21 Apr 2004 20:34:12 GMT
scolebourne    2004/04/21 13:34:12

  Modified:    collections/src/java/org/apache/commons/collections
                        MapUtils.java
               collections/src/java/org/apache/commons/collections/iterators
                        EnumerationIterator.java
  Log:
  Change enum to enumeration for JDK1.5 compliance
  
  Revision  Changes    Path
  1.46      +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java
  
  Index: MapUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/MapUtils.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- MapUtils.java	1 Apr 2004 20:12:00 -0000	1.45
  +++ MapUtils.java	21 Apr 2004 20:34:11 -0000	1.46
  @@ -865,11 +865,11 @@
        * @throws NullPointerException if the bundle is null
        */
       public static Map toMap(final ResourceBundle resourceBundle) {
  -        Enumeration enum = resourceBundle.getKeys();
  +        Enumeration enumeration = resourceBundle.getKeys();
           Map map = new HashMap();
   
  -        while (enum.hasMoreElements()) {
  -            String key = (String) enum.nextElement();
  +        while (enumeration.hasMoreElements()) {
  +            String key = (String) enumeration.nextElement();
               Object value = resourceBundle.getObject(key);
               map.put(key, value);
           }
  
  
  
  1.8       +4 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EnumerationIterator.java	18 Feb 2004 00:59:50 -0000	1.7
  +++ EnumerationIterator.java	21 Apr 2004 20:34:12 -0000	1.8
  @@ -62,12 +62,12 @@
        * Constructs a new <code>EnumerationIterator</code> that will remove
        * elements from the specified collection.
        *
  -     * @param enum  the enumeration to use
  +     * @param enumeration  the enumeration to use
        * @param collection  the collection to remove elements form
        */
  -    public EnumerationIterator(final Enumeration enum, final Collection collection) {
  +    public EnumerationIterator(final Enumeration enumeration, final Collection collection)
{
           super();
  -        this.enumeration = enum;
  +        this.enumeration = enumeration;
           this.collection = collection;
           this.last = null;
       }
  
  
  

---------------------------------------------------------------------
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