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/test/org/apache/commons/collections TestIteratorUtils.java
Date Mon, 01 Dec 2003 22:49:01 GMT
scolebourne    2003/12/01 14:49:01

  Modified:    collections/src/test/org/apache/commons/collections/iterators
                        AbstractTestOrderedMapIterator.java
                        AbstractTestMapIterator.java
                        TestUnmodifiableOrderedMapIterator.java
                        TestSingletonIterator.java
                        TestSingletonListIterator.java
                        TestUnmodifiableMapIterator.java
               collections/src/java/org/apache/commons/collections
                        IteratorUtils.java OrderedMap.java BidiMap.java
                        AMap.java
               collections/src/java/org/apache/commons/collections/map
                        AbstractOrderedMapDecorator.java
                        ListOrderedMap.java Flat3Map.java HashedMap.java
                        UnmodifiableMap.java UnmodifiableOrderedMap.java
               collections/src/java/org/apache/commons/collections/decorators
                        OrderedMap.java
               collections/src/test/org/apache/commons/collections/map
                        AbstractTestAMap.java TestFlat3Map.java
                        AbstractTestOrderedMap.java
               collections/src/java/org/apache/commons/collections/iterators
                        EntrySetMapIterator.java
                        UnmodifiableMapIterator.java
                        AbstractOrderedMapIteratorDecorator.java
                        UnmodifiableOrderedMapIterator.java
                        ArrayListIterator.java ArrayIterator.java
                        LoopingIterator.java ObjectArrayIterator.java
                        ObjectArrayListIterator.java
                        AbstractMapIteratorDecorator.java
                        SingletonIterator.java SingletonListIterator.java
               collections/src/java/org/apache/commons/collections/bidimap
                        AbstractDualBidiMap.java DualTreeBidiMap.java
                        TreeBidiMap.java
               collections/src/test/org/apache/commons/collections/bidimap
                        AbstractTestOrderedBidiMap.java
                        AbstractTestBidiMap.java
               collections/src/test/org/apache/commons/collections
                        TestIteratorUtils.java
  Added:       collections/src/java/org/apache/commons/collections
                        ResettableListIterator.java ResettableIterator.java
                        OrderedIterator.java MapIterator.java
                        OrderedMapIterator.java
  Removed:     collections/src/java/org/apache/commons/collections/iterators
                        MapIterator.java OrderedMapIterator.java
                        ResettableListIterator.java ResettableIterator.java
                        OrderedIterator.java
  Log:
  Move iterator interfaces to main package
  
  Revision  Changes    Path
  1.3       +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java
  
  Index: AbstractTestOrderedMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTestOrderedMapIterator.java	20 Nov 2003 21:44:58 -0000	1.2
  +++ AbstractTestOrderedMapIterator.java	1 Dec 2003 22:48:58 -0000	1.3
  @@ -65,6 +65,8 @@
   import java.util.NoSuchElementException;
   import java.util.Set;
   
  +import org.apache.commons.collections.OrderedMapIterator;
  +
   /**
    * Abstract class for testing the OrderedMapIterator interface.
    * <p>
  
  
  
  1.7       +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java
  
  Index: AbstractTestMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractTestMapIterator.java	20 Nov 2003 00:31:42 -0000	1.6
  +++ AbstractTestMapIterator.java	1 Dec 2003 22:48:58 -0000	1.7
  @@ -63,6 +63,8 @@
   import java.util.NoSuchElementException;
   import java.util.Set;
   
  +import org.apache.commons.collections.MapIterator;
  +
   /**
    * Abstract class for testing the MapIterator interface.
    * <p>
  
  
  
  1.3       +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
  
  Index: TestUnmodifiableOrderedMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestUnmodifiableOrderedMapIterator.java	1 Dec 2003 22:34:55 -0000	1.2
  +++ TestUnmodifiableOrderedMapIterator.java	1 Dec 2003 22:48:58 -0000	1.3
  @@ -64,7 +64,9 @@
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedMap;
  +import org.apache.commons.collections.OrderedMapIterator;
   import org.apache.commons.collections.Unmodifiable;
   import org.apache.commons.collections.map.ListOrderedMap;
   
  
  
  
  1.9       +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java
  
  Index: TestSingletonIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestSingletonIterator.java	14 Nov 2003 22:58:27 -0000	1.8
  +++ TestSingletonIterator.java	1 Dec 2003 22:48:58 -0000	1.9
  @@ -63,6 +63,8 @@
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  +import org.apache.commons.collections.ResettableIterator;
  +
   /**
    * Tests the SingletonIterator to ensure that the next() method will actually
    * perform the iteration rather than the hasNext() method.
  
  
  
  1.9       +4 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java
  
  Index: TestSingletonListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestSingletonListIterator.java	14 Nov 2003 22:58:27 -0000	1.8
  +++ TestSingletonListIterator.java	1 Dec 2003 22:48:59 -0000	1.9
  @@ -63,6 +63,8 @@
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  +import org.apache.commons.collections.ResettableListIterator;
  +
   /**
    * Tests the SingletonListIterator.
    *
  
  
  
  1.6       +3 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
  
  Index: TestUnmodifiableMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestUnmodifiableMapIterator.java	1 Dec 2003 22:34:55 -0000	1.5
  +++ TestUnmodifiableMapIterator.java	1 Dec 2003 22:48:59 -0000	1.6
  @@ -64,6 +64,7 @@
   import junit.framework.TestSuite;
   
   import org.apache.commons.collections.BidiMap;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.Unmodifiable;
   import org.apache.commons.collections.bidimap.DualHashBidiMap;
   
  
  
  
  1.18      +2 -7      jakarta-commons/collections/src/java/org/apache/commons/collections/IteratorUtils.java
  
  Index: IteratorUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/IteratorUtils.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- IteratorUtils.java	14 Nov 2003 22:58:27 -0000	1.17
  +++ IteratorUtils.java	1 Dec 2003 22:48:59 -0000	1.18
  @@ -80,13 +80,8 @@
   import org.apache.commons.collections.iterators.IteratorEnumeration;
   import org.apache.commons.collections.iterators.ListIteratorWrapper;
   import org.apache.commons.collections.iterators.LoopingIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   import org.apache.commons.collections.iterators.ObjectArrayIterator;
   import org.apache.commons.collections.iterators.ObjectArrayListIterator;
  -import org.apache.commons.collections.iterators.OrderedIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
  -import org.apache.commons.collections.iterators.ResettableListIterator;
   import org.apache.commons.collections.iterators.SingletonIterator;
   import org.apache.commons.collections.iterators.SingletonListIterator;
   import org.apache.commons.collections.iterators.TransformIterator;
  
  
  
  1.2       +2 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedMap.java
  
  Index: OrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OrderedMap.java	1 Dec 2003 22:34:55 -0000	1.1
  +++ OrderedMap.java	1 Dec 2003 22:48:59 -0000	1.2
  @@ -57,8 +57,6 @@
    */
   package org.apache.commons.collections;
   
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  -
   /**
    * Defines a map that maintains order and allows both forward and backward
    * iteration through that order.
  
  
  
  1.9       +3 -7      jakarta-commons/collections/src/java/org/apache/commons/collections/BidiMap.java
  
  Index: BidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/BidiMap.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BidiMap.java	1 Dec 2003 22:34:55 -0000	1.8
  +++ BidiMap.java	1 Dec 2003 22:48:59 -0000	1.9
  @@ -57,10 +57,6 @@
    */
   package org.apache.commons.collections;
   
  -import java.util.Map;
  -
  -import org.apache.commons.collections.iterators.MapIterator;
  -
   /**
    * Defines a map that allows bidirectional lookup between key and values.
    * <p>
  @@ -78,7 +74,7 @@
    *
    * @author Stephen Colebourne
    */
  -public interface BidiMap extends Map {
  +public interface BidiMap extends AMap {
       
       /**
        * Obtains a <code>MapIterator</code> over the map.
  
  
  
  1.2       +2 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/AMap.java
  
  Index: AMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/AMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AMap.java	1 Dec 2003 22:34:55 -0000	1.1
  +++ AMap.java	1 Dec 2003 22:48:59 -0000	1.2
  @@ -59,8 +59,6 @@
   
   import java.util.Map;
   
  -import org.apache.commons.collections.iterators.MapIterator;
  -
   /**
    * Defines a map that can be iterated directly without needing to create an entry set.
    * <p>
  
  
  
  1.1                  jakarta-commons/collections/src/java/org/apache/commons/collections/ResettableListIterator.java
  
  Index: ResettableListIterator.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ResettableListIterator.java,v 1.1 2003/12/01 22:48:59 scolebourne Exp $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowledgement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgement may appear in the software itself,
   *    if and wherever such third-party acknowledgements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.collections;
  
  import java.util.ListIterator;
  
  /** 
   * Interface implemented by those list iterators that can be reset back 
   * to an initial state.
   *
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
   * 
   * @author Stephen Colebourne
   */
  public interface ResettableListIterator extends ListIterator, ResettableIterator {
  
      /**
       * Resets the iterator back to the position at which the iterator
       * was created.
       */
      public void reset();
  
  }
  
  
  
  1.1                  jakarta-commons/collections/src/java/org/apache/commons/collections/ResettableIterator.java
  
  Index: ResettableIterator.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/ResettableIterator.java,v 1.1 2003/12/01 22:48:59 scolebourne Exp $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowledgement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgement may appear in the software itself,
   *    if and wherever such third-party acknowledgements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.collections;
  
  import java.util.Iterator;
  
  /** 
   * Interface implemented by those iterators that can be reset back to an 
   * initial state.
   *
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
   * 
   * @author Stephen Colebourne
   */
  public interface ResettableIterator extends Iterator {
  
      /**
       * Resets the iterator back to the position at which the iterator
       * was created.
       */
      public void reset();
  
  }
  
  
  
  1.1                  jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedIterator.java
  
  Index: OrderedIterator.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedIterator.java,v 1.1 2003/12/01 22:48:59 scolebourne Exp $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowledgement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgement may appear in the software itself,
   *    if and wherever such third-party acknowledgements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.collections;
  
  import java.util.Iterator;
  
  /**
   * Defines an iterator that operates over a ordered collections.
   * <p>
   * This iterator allows both forward and reverse iteration through the collection.
   *  
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
   *
   * @author Stephen Colebourne
   */
  public interface OrderedIterator extends Iterator {
      
      /**
       * Checks to see if there is a previous entry that can be iterated to.
       *
       * @return <code>true</code> if the iterator has a previous element
       */
      boolean hasPrevious();
  
      /**
       * Gets the previous element from the collection.
       *
       * @return the previous key in the iteration
       * @throws NoSuchElementException if the iteration is finished
       */
      Object previous();
  
  }
  
  
  
  1.3       +19 -10    jakarta-commons/collections/src/java/org/apache/commons/collections/MapIterator.java
  
  
  
  
  1.1                  jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedMapIterator.java
  
  Index: OrderedMapIterator.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/OrderedMapIterator.java,v 1.1 2003/12/01 22:48:59 scolebourne Exp $
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowledgement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgement may appear in the software itself,
   *    if and wherever such third-party acknowledgements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  package org.apache.commons.collections;
  
  /**
   * Defines an iterator that operates over an ordered <code>Map</code>.
   * <p>
   * This iterator allows both forward and reverse iteration through the map.
   *  
   * @since Commons Collections 3.0
   * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
   *
   * @author Stephen Colebourne
   */
  public interface OrderedMapIterator extends MapIterator, OrderedIterator {
      
      /**
       * Checks to see if there is a previous entry that can be iterated to.
       *
       * @return <code>true</code> if the iterator has a previous element
       */
      boolean hasPrevious();
  
      /**
       * Gets the previous <em>key</em> from the <code>Map</code>.
       *
       * @return the previous key in the iteration
       * @throws NoSuchElementException if the iteration is finished
       */
      Object previous();
  
  }
  
  
  
  1.3       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
  
  Index: AbstractOrderedMapDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractOrderedMapDecorator.java	1 Dec 2003 22:34:53 -0000	1.2
  +++ AbstractOrderedMapDecorator.java	1 Dec 2003 22:48:59 -0000	1.3
  @@ -57,9 +57,9 @@
    */
   package org.apache.commons.collections.map;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedMap;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  +import org.apache.commons.collections.OrderedMapIterator;
   
   /** 
    * Provides a base decorator that enables additional functionality to be added
  
  
  
  1.5       +5 -5      jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java
  
  Index: ListOrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ListOrderedMap.java	1 Dec 2003 22:34:53 -0000	1.4
  +++ ListOrderedMap.java	1 Dec 2003 22:48:59 -0000	1.5
  @@ -68,11 +68,11 @@
   import java.util.NoSuchElementException;
   import java.util.Set;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedMap;
  +import org.apache.commons.collections.OrderedMapIterator;
  +import org.apache.commons.collections.ResettableIterator;
   import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
   import org.apache.commons.collections.pairs.AbstractMapEntry;
   
   /**
  
  
  
  1.4       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/map/Flat3Map.java
  
  Index: Flat3Map.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Flat3Map.java	1 Dec 2003 22:34:53 -0000	1.3
  +++ Flat3Map.java	1 Dec 2003 22:48:59 -0000	1.4
  @@ -68,9 +68,9 @@
   
   import org.apache.commons.collections.AMap;
   import org.apache.commons.collections.IteratorUtils;
  +import org.apache.commons.collections.MapIterator;
  +import org.apache.commons.collections.ResettableIterator;
   import org.apache.commons.collections.iterators.EntrySetMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
   
   /**
    * A <code>Map</code> implementation that stores data in simple fields until
  
  
  
  1.2       +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/map/HashedMap.java
  
  Index: HashedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/HashedMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HashedMap.java	1 Dec 2003 22:34:53 -0000	1.1
  +++ HashedMap.java	1 Dec 2003 22:48:59 -0000	1.2
  @@ -72,7 +72,7 @@
   
   import org.apache.commons.collections.AMap;
   import org.apache.commons.collections.IteratorUtils;
  -import org.apache.commons.collections.iterators.MapIterator;
  +import org.apache.commons.collections.MapIterator;
   
   /**
    * A <code>Map</code> implementation that is a general purpose replacement
  
  
  
  1.4       +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
  
  Index: UnmodifiableMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UnmodifiableMap.java	1 Dec 2003 22:34:53 -0000	1.3
  +++ UnmodifiableMap.java	1 Dec 2003 22:48:59 -0000	1.4
  @@ -64,11 +64,11 @@
   import java.util.Set;
   
   import org.apache.commons.collections.AMap;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.Unmodifiable;
   import org.apache.commons.collections.collection.UnmodifiableCollection;
   import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
   import org.apache.commons.collections.iterators.EntrySetMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
   import org.apache.commons.collections.pairs.AbstractMapEntryDecorator;
   import org.apache.commons.collections.set.UnmodifiableSet;
  
  
  
  1.3       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
  
  Index: UnmodifiableOrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnmodifiableOrderedMap.java	1 Dec 2003 22:34:53 -0000	1.2
  +++ UnmodifiableOrderedMap.java	1 Dec 2003 22:48:59 -0000	1.3
  @@ -61,11 +61,11 @@
   import java.util.Map;
   import java.util.Set;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedMap;
  +import org.apache.commons.collections.OrderedMapIterator;
   import org.apache.commons.collections.Unmodifiable;
   import org.apache.commons.collections.collection.UnmodifiableCollection;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
   import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
   import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator;
   import org.apache.commons.collections.map.UnmodifiableMap.UnmodifiableEntrySet;
  
  
  
  1.8       +3 -3      jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/OrderedMap.java
  
  Index: OrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/decorators/OrderedMap.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OrderedMap.java	16 Nov 2003 00:39:37 -0000	1.7
  +++ OrderedMap.java	1 Dec 2003 22:48:59 -0000	1.8
  @@ -66,8 +66,8 @@
   import java.util.Map;
   import java.util.Set;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.iterators.EntrySetMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   import org.apache.commons.collections.pairs.AbstractMapEntry;
   
   /**
  
  
  
  1.2       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestAMap.java
  
  Index: AbstractTestAMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestAMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractTestAMap.java	1 Dec 2003 22:34:54 -0000	1.1
  +++ AbstractTestAMap.java	1 Dec 2003 22:48:59 -0000	1.2
  @@ -63,8 +63,8 @@
   
   import org.apache.commons.collections.AMap;
   import org.apache.commons.collections.BulkTest;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.iterators.AbstractTestMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   
   /**
    * Abstract test class for {@link AMap} methods and contracts.
  
  
  
  1.3       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestFlat3Map.java
  
  Index: TestFlat3Map.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/TestFlat3Map.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestFlat3Map.java	1 Dec 2003 22:34:54 -0000	1.2
  +++ TestFlat3Map.java	1 Dec 2003 22:48:59 -0000	1.3
  @@ -63,8 +63,8 @@
   import junit.textui.TestRunner;
   
   import org.apache.commons.collections.BulkTest;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.iterators.AbstractTestMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   
   /**
    * JUnit tests.
  
  
  
  1.3       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java
  
  Index: AbstractTestOrderedMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTestOrderedMap.java	1 Dec 2003 22:34:54 -0000	1.2
  +++ AbstractTestOrderedMap.java	1 Dec 2003 22:48:59 -0000	1.3
  @@ -67,10 +67,10 @@
   import java.util.TreeMap;
   
   import org.apache.commons.collections.BulkTest;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedMap;
   import org.apache.commons.collections.comparators.NullComparator;
   import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   
   /**
    * Abstract test class for {@link OrderedMap} methods and contracts.
  
  
  
  1.4       +5 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
  
  Index: EntrySetMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EntrySetMapIterator.java	19 Nov 2003 23:58:11 -0000	1.3
  +++ EntrySetMapIterator.java	1 Dec 2003 22:48:59 -0000	1.4
  @@ -60,6 +60,9 @@
   import java.util.Iterator;
   import java.util.Map;
   
  +import org.apache.commons.collections.MapIterator;
  +import org.apache.commons.collections.ResettableIterator;
  +
   /**
    * Implements a <code>MapIterator</code> using a Map entrySet.
    * Reverse iteration is not supported.
  
  
  
  1.3       +3 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
  
  Index: UnmodifiableMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UnmodifiableMapIterator.java	8 Nov 2003 18:43:13 -0000	1.2
  +++ UnmodifiableMapIterator.java	1 Dec 2003 22:49:00 -0000	1.3
  @@ -57,6 +57,7 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.Unmodifiable;
   
   /** 
  
  
  
  1.2       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
  
  Index: AbstractOrderedMapIteratorDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractOrderedMapIteratorDecorator.java	20 Nov 2003 21:53:58 -0000	1.1
  +++ AbstractOrderedMapIteratorDecorator.java	1 Dec 2003 22:49:00 -0000	1.2
  @@ -57,6 +57,8 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import org.apache.commons.collections.OrderedMapIterator;
  +
   /**
    * Provides basic behaviour for decorating an ordered map iterator with extra functionality.
    * <p>
  
  
  
  1.2       +3 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
  
  Index: UnmodifiableOrderedMapIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnmodifiableOrderedMapIterator.java	20 Nov 2003 21:45:35 -0000	1.1
  +++ UnmodifiableOrderedMapIterator.java	1 Dec 2003 22:49:00 -0000	1.2
  @@ -57,6 +57,7 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import org.apache.commons.collections.OrderedMapIterator;
   import org.apache.commons.collections.Unmodifiable;
   
   /** 
  
  
  
  1.10      +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java
  
  Index: ArrayListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ArrayListIterator.java	14 Nov 2003 22:58:27 -0000	1.9
  +++ ArrayListIterator.java	1 Dec 2003 22:49:00 -0000	1.10
  @@ -61,6 +61,8 @@
   import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableListIterator;
  +
   /**
    * Implements a {@link ListIterator} over an array. 
    * <p>
  
  
  
  1.8       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java
  
  Index: ArrayIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ArrayIterator.java	14 Nov 2003 22:58:27 -0000	1.7
  +++ ArrayIterator.java	1 Dec 2003 22:49:00 -0000	1.8
  @@ -60,6 +60,8 @@
   import java.lang.reflect.Array;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableIterator;
  +
   /** 
    * Implements an {@link java.util.Iterator Iterator} over any array.
    * <p>
  
  
  
  1.7       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/LoopingIterator.java
  
  Index: LoopingIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/LoopingIterator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoopingIterator.java	14 Nov 2003 22:58:27 -0000	1.6
  +++ LoopingIterator.java	1 Dec 2003 22:49:00 -0000	1.7
  @@ -61,6 +61,8 @@
   import java.util.Iterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableIterator;
  +
   /**
    * An Iterator that restarts when it reaches the end.
    * <p>
  
  
  
  1.10      +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
  
  Index: ObjectArrayIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ObjectArrayIterator.java	14 Nov 2003 22:58:27 -0000	1.9
  +++ ObjectArrayIterator.java	1 Dec 2003 22:49:00 -0000	1.10
  @@ -60,6 +60,8 @@
   import java.util.Iterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableIterator;
  +
   /** 
    * An {@link Iterator} over an array of objects.
    * <p>
  
  
  
  1.11      +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
  
  Index: ObjectArrayListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ObjectArrayListIterator.java	14 Nov 2003 22:58:27 -0000	1.10
  +++ ObjectArrayListIterator.java	1 Dec 2003 22:49:00 -0000	1.11
  @@ -60,6 +60,8 @@
   import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableListIterator;
  +
   /**
    * Implements a {@link ListIterator} over an array of objects.
    * <p>
  
  
  
  1.4       +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
  
  Index: AbstractMapIteratorDecorator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMapIteratorDecorator.java	15 Nov 2003 23:50:46 -0000	1.3
  +++ AbstractMapIteratorDecorator.java	1 Dec 2003 22:49:00 -0000	1.4
  @@ -57,6 +57,8 @@
    */
   package org.apache.commons.collections.iterators;
   
  +import org.apache.commons.collections.MapIterator;
  +
   /**
    * Provides basic behaviour for decorating a map iterator with extra functionality.
    * <p>
  
  
  
  1.10      +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java
  
  Index: SingletonIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- SingletonIterator.java	14 Nov 2003 22:58:27 -0000	1.9
  +++ SingletonIterator.java	1 Dec 2003 22:49:00 -0000	1.10
  @@ -60,6 +60,8 @@
   import java.util.Iterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableIterator;
  +
   /** 
    * <code>SingletonIterator</code> is an {@link Iterator} over a single 
    * object instance.
  
  
  
  1.11      +4 -2      jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java
  
  Index: SingletonListIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SingletonListIterator.java	14 Nov 2003 22:58:27 -0000	1.10
  +++ SingletonListIterator.java	1 Dec 2003 22:49:00 -0000	1.11
  @@ -60,6 +60,8 @@
   import java.util.ListIterator;
   import java.util.NoSuchElementException;
   
  +import org.apache.commons.collections.ResettableListIterator;
  +
   /**
    * <code>SingletonIterator</code> is an {@link ListIterator} over a single 
    * object instance.
  
  
  
  1.3       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
  
  Index: AbstractDualBidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractDualBidiMap.java	1 Dec 2003 22:34:54 -0000	1.2
  +++ AbstractDualBidiMap.java	1 Dec 2003 22:49:00 -0000	1.3
  @@ -63,10 +63,10 @@
   import java.util.Set;
   
   import org.apache.commons.collections.BidiMap;
  +import org.apache.commons.collections.MapIterator;
  +import org.apache.commons.collections.ResettableIterator;
   import org.apache.commons.collections.collection.AbstractCollectionDecorator;
   import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
   import org.apache.commons.collections.pairs.AbstractMapEntryDecorator;
   
   /**
  
  
  
  1.5       +4 -4      jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
  
  Index: DualTreeBidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DualTreeBidiMap.java	1 Dec 2003 22:34:54 -0000	1.4
  +++ DualTreeBidiMap.java	1 Dec 2003 22:49:00 -0000	1.5
  @@ -72,9 +72,9 @@
   import org.apache.commons.collections.BidiMap;
   import org.apache.commons.collections.OrderedBidiMap;
   import org.apache.commons.collections.OrderedMap;
  +import org.apache.commons.collections.OrderedMapIterator;
  +import org.apache.commons.collections.ResettableIterator;
   import org.apache.commons.collections.SortedBidiMap;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
   import org.apache.commons.collections.map.AbstractSortedMapDecorator;
   
   /**
  
  
  
  1.4       +5 -5      jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
  
  Index: TreeBidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TreeBidiMap.java	1 Dec 2003 22:34:54 -0000	1.3
  +++ TreeBidiMap.java	1 Dec 2003 22:49:00 -0000	1.4
  @@ -67,10 +67,10 @@
   
   import org.apache.commons.collections.BidiMap;
   import org.apache.commons.collections.IteratorUtils;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedBidiMap;
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.OrderedIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  +import org.apache.commons.collections.OrderedIterator;
  +import org.apache.commons.collections.OrderedMapIterator;
   import org.apache.commons.collections.pairs.UnmodifiableMapEntry;
   
   /**
  
  
  
  1.4       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java
  
  Index: AbstractTestOrderedBidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractTestOrderedBidiMap.java	1 Dec 2003 22:34:54 -0000	1.3
  +++ AbstractTestOrderedBidiMap.java	1 Dec 2003 22:49:00 -0000	1.4
  @@ -65,9 +65,9 @@
   import java.util.NoSuchElementException;
   
   import org.apache.commons.collections.BulkTest;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.OrderedBidiMap;
   import org.apache.commons.collections.iterators.AbstractTestMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   
   /**
    * Abstract test class for {@link OrderedBidiMap} methods and contracts.
  
  
  
  1.5       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
  
  Index: AbstractTestBidiMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractTestBidiMap.java	1 Dec 2003 22:34:54 -0000	1.4
  +++ AbstractTestBidiMap.java	1 Dec 2003 22:49:00 -0000	1.5
  @@ -65,8 +65,8 @@
   
   import org.apache.commons.collections.BidiMap;
   import org.apache.commons.collections.BulkTest;
  +import org.apache.commons.collections.MapIterator;
   import org.apache.commons.collections.iterators.AbstractTestMapIterator;
  -import org.apache.commons.collections.iterators.MapIterator;
   import org.apache.commons.collections.map.AbstractTestMap;
   
   /**
  
  
  
  1.12      +2 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/TestIteratorUtils.java
  
  Index: TestIteratorUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestIteratorUtils.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TestIteratorUtils.java	14 Nov 2003 22:58:27 -0000	1.11
  +++ TestIteratorUtils.java	1 Dec 2003 22:49:00 -0000	1.12
  @@ -66,11 +66,6 @@
   
   import junit.framework.Test;
   
  -import org.apache.commons.collections.iterators.MapIterator;
  -import org.apache.commons.collections.iterators.OrderedIterator;
  -import org.apache.commons.collections.iterators.OrderedMapIterator;
  -import org.apache.commons.collections.iterators.ResettableIterator;
  -import org.apache.commons.collections.iterators.ResettableListIterator;
   
   /**
    * Tests for IteratorUtils.
  
  
  

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