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 Flat3Map.java
Date Sat, 08 Nov 2003 18:49:06 GMT
scolebourne    2003/11/08 10:49:06

  Modified:    collections/src/java/org/apache/commons/collections
                        Flat3Map.java
  Log:
  Update MapIterator to remove asMapEntry
  
  Revision  Changes    Path
  1.2       +4 -14     jakarta-commons/collections/src/java/org/apache/commons/collections/Flat3Map.java
  
  Index: Flat3Map.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/Flat3Map.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Flat3Map.java	2 Nov 2003 23:41:46 -0000	1.1
  +++ Flat3Map.java	8 Nov 2003 18:49:06 -0000	1.2
  @@ -66,10 +66,9 @@
   import java.util.NoSuchElementException;
   import java.util.Set;
   
  -import org.apache.commons.collections.iterators.DefaultMapIterator;
  +import org.apache.commons.collections.iterators.EntrySetMapIterator;
   import org.apache.commons.collections.iterators.MapIterator;
   import org.apache.commons.collections.iterators.ResetableMapIterator;
  -import org.apache.commons.collections.pairs.AbstractMapEntry;
   
   /**
    * A <code>Map</code> implementation that stores data in simple fields until
  @@ -578,7 +577,7 @@
        */
       public MapIterator mapIterator() {
           if (iMap != null) {
  -            return new DefaultMapIterator(this);
  +            return new EntrySetMapIterator(this);
           }
           if (iSize == 0) {
               return IteratorUtils.EMPTY_MAP_ITERATOR;
  @@ -670,15 +669,6 @@
           public void reset() {
               iIndex = 0;
               iCanRemove = false;
  -        }
  -        
  -        public Entry asMapEntry() {
  -            return new AbstractMapEntry(getKey(), getValue()) {
  -                public Object setValue(Object value) {
  -                    FlatMapIterator.this.setValue(value);
  -                    return super.setValue(value);
  -                }
  -            };
           }
           
           public String toString() {
  
  
  

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