Move iterator interfaces to main package

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131383 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stephen Colebourne 2003-12-01 22:49:00 +00:00
parent 4610c1a96c
commit b473a5d290
43 changed files with 150 additions and 134 deletions

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/AMap.java,v 1.1 2003/12/01 22:34:55 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/AMap.java,v 1.2 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -59,8 +59,6 @@ package org.apache.commons.collections;
import java.util.Map; 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. * Defines a map that can be iterated directly without needing to create an entry set.
* <p> * <p>
@ -77,7 +75,7 @@ import org.apache.commons.collections.iterators.MapIterator;
* </pre> * </pre>
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/12/01 22:34:55 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BidiMap.java,v 1.8 2003/12/01 22:34:55 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BidiMap.java,v 1.9 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,10 +57,6 @@
*/ */
package org.apache.commons.collections; 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. * Defines a map that allows bidirectional lookup between key and values.
* <p> * <p>
@ -74,11 +70,11 @@ import org.apache.commons.collections.iterators.MapIterator;
* a key to be looked up from a value with equal performance. * a key to be looked up from a value with equal performance.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.8 $ $Date: 2003/12/01 22:34:55 $ * @version $Revision: 1.9 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */
public interface BidiMap extends Map { public interface BidiMap extends AMap {
/** /**
* Obtains a <code>MapIterator</code> over the map. * Obtains a <code>MapIterator</code> over the map.

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/IteratorUtils.java,v 1.17 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/IteratorUtils.java,v 1.18 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -80,13 +80,8 @@ import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.commons.collections.iterators.IteratorEnumeration; import org.apache.commons.collections.iterators.IteratorEnumeration;
import org.apache.commons.collections.iterators.ListIteratorWrapper; import org.apache.commons.collections.iterators.ListIteratorWrapper;
import org.apache.commons.collections.iterators.LoopingIterator; 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.ObjectArrayIterator;
import org.apache.commons.collections.iterators.ObjectArrayListIterator; 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.SingletonIterator;
import org.apache.commons.collections.iterators.SingletonListIterator; import org.apache.commons.collections.iterators.SingletonListIterator;
import org.apache.commons.collections.iterators.TransformIterator; import org.apache.commons.collections.iterators.TransformIterator;
@ -100,7 +95,7 @@ import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
* {@link org.apache.commons.collections.iterators} subpackage. * {@link org.apache.commons.collections.iterators} subpackage.
* *
* @since Commons Collections 2.1 * @since Commons Collections 2.1
* @version $Revision: 1.17 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.18 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
* @author Phil Steitz * @author Phil Steitz

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/Attic/MapIterator.java,v 1.2 2003/11/08 18:43:13 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/MapIterator.java,v 1.3 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -55,7 +55,7 @@
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections;
import java.util.Iterator; import java.util.Iterator;
@ -82,7 +82,7 @@ import java.util.Iterator;
* </pre> * </pre>
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/11/08 18:43:13 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/Attic/OrderedIterator.java,v 1.1 2003/11/08 19:26:28 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/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 * The Apache Software License, Version 1.1
@ -55,7 +55,7 @@
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections;
import java.util.Iterator; import java.util.Iterator;
@ -65,7 +65,7 @@ import java.util.Iterator;
* This iterator allows both forward and reverse iteration through the collection. * This iterator allows both forward and reverse iteration through the collection.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/08 19:26:28 $ * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMap.java,v 1.1 2003/12/01 22:34:55 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/OrderedMap.java,v 1.2 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,14 +57,12 @@
*/ */
package org.apache.commons.collections; package org.apache.commons.collections;
import org.apache.commons.collections.iterators.OrderedMapIterator;
/** /**
* Defines a map that maintains order and allows both forward and backward * Defines a map that maintains order and allows both forward and backward
* iteration through that order. * iteration through that order.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/12/01 22:34:55 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/Attic/OrderedMapIterator.java,v 1.2 2003/11/08 19:26:28 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/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 * The Apache Software License, Version 1.1
@ -55,7 +55,7 @@
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections;
/** /**
* Defines an iterator that operates over an ordered <code>Map</code>. * Defines an iterator that operates over an ordered <code>Map</code>.
@ -63,7 +63,7 @@ package org.apache.commons.collections.iterators;
* This iterator allows both forward and reverse iteration through the map. * This iterator allows both forward and reverse iteration through the map.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/11/08 19:26:28 $ * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/Attic/ResettableIterator.java,v 1.1 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/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 * The Apache Software License, Version 1.1
@ -55,7 +55,7 @@
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections;
import java.util.Iterator; import java.util.Iterator;
@ -64,7 +64,7 @@ import java.util.Iterator;
* initial state. * initial state.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/Attic/ResettableListIterator.java,v 1.1 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/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 * The Apache Software License, Version 1.1
@ -55,7 +55,7 @@
* <http://www.apache.org/>. * <http://www.apache.org/>.
* *
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections;
import java.util.ListIterator; import java.util.ListIterator;
@ -64,7 +64,7 @@ import java.util.ListIterator;
* to an initial state. * to an initial state.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.1 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v 1.3 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,10 +63,10 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.BidiMap; 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.collection.AbstractCollectionDecorator;
import org.apache.commons.collections.iterators.AbstractIteratorDecorator; 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; import org.apache.commons.collections.pairs.AbstractMapEntryDecorator;
/** /**
@ -76,7 +76,7 @@ import org.apache.commons.collections.pairs.AbstractMapEntryDecorator;
* <code>createMap</code> method. * <code>createMap</code> method.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Id: AbstractDualBidiMap.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $ * @version $Id: AbstractDualBidiMap.java,v 1.3 2003/12/01 22:49:00 scolebourne Exp $
* *
* @author Matthew Hawthorne * @author Matthew Hawthorne
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java,v 1.4 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java,v 1.5 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -72,9 +72,9 @@ import java.util.TreeMap;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections.OrderedBidiMap;
import org.apache.commons.collections.OrderedMap; 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.SortedBidiMap;
import org.apache.commons.collections.iterators.OrderedMapIterator;
import org.apache.commons.collections.iterators.ResettableIterator;
import org.apache.commons.collections.map.AbstractSortedMapDecorator; import org.apache.commons.collections.map.AbstractSortedMapDecorator;
/** /**
@ -88,7 +88,7 @@ import org.apache.commons.collections.map.AbstractSortedMapDecorator;
* not store each object twice, which can save on memory use. * not store each object twice, which can save on memory use.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Id: DualTreeBidiMap.java,v 1.4 2003/12/01 22:34:54 scolebourne Exp $ * @version $Id: DualTreeBidiMap.java,v 1.5 2003/12/01 22:49:00 scolebourne Exp $
* *
* @author Matthew Hawthorne * @author Matthew Hawthorne
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v 1.3 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java,v 1.4 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -67,10 +67,10 @@ import java.util.Set;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.IteratorUtils; import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections.OrderedBidiMap;
import org.apache.commons.collections.iterators.MapIterator; import org.apache.commons.collections.OrderedIterator;
import org.apache.commons.collections.iterators.OrderedIterator; import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections.iterators.OrderedMapIterator;
import org.apache.commons.collections.pairs.UnmodifiableMapEntry; import org.apache.commons.collections.pairs.UnmodifiableMapEntry;
/** /**
@ -107,7 +107,7 @@ import org.apache.commons.collections.pairs.UnmodifiableMapEntry;
* UnsupportedOperationException on attempts to call that method. * UnsupportedOperationException on attempts to call that method.
* *
* @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0) * @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0)
* @version $Revision: 1.3 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Marc Johnson * @author Marc Johnson
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/decorators/Attic/OrderedMap.java,v 1.7 2003/11/16 00:39:37 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/decorators/Attic/OrderedMap.java,v 1.8 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -66,8 +66,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.iterators.EntrySetMapIterator; import org.apache.commons.collections.iterators.EntrySetMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
import org.apache.commons.collections.pairs.AbstractMapEntry; import org.apache.commons.collections.pairs.AbstractMapEntry;
/** /**
@ -80,7 +80,7 @@ import org.apache.commons.collections.pairs.AbstractMapEntry;
* original position in the iteration. * original position in the iteration.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.7 $ $Date: 2003/11/16 00:39:37 $ * @version $Revision: 1.8 $ $Date: 2003/12/01 22:48:59 $
* @deprecated TO BE REMOVED BEFORE v3.0 * @deprecated TO BE REMOVED BEFORE v3.0
* *
* @author Henri Yandell * @author Henri Yandell

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java,v 1.3 2003/11/15 23:50:46 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java,v 1.4 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,13 +57,15 @@
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections.iterators;
import org.apache.commons.collections.MapIterator;
/** /**
* Provides basic behaviour for decorating a map iterator with extra functionality. * Provides basic behaviour for decorating a map iterator with extra functionality.
* <p> * <p>
* All methods are forwarded to the decorated map iterator. * All methods are forwarded to the decorated map iterator.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/11/15 23:50:46 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java,v 1.1 2003/11/20 21:53:58 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java,v 1.2 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,13 +57,15 @@
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections.iterators;
import org.apache.commons.collections.OrderedMapIterator;
/** /**
* Provides basic behaviour for decorating an ordered map iterator with extra functionality. * Provides basic behaviour for decorating an ordered map iterator with extra functionality.
* <p> * <p>
* All methods are forwarded to the decorated map iterator. * All methods are forwarded to the decorated map iterator.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/20 21:53:58 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v 1.7 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayIterator.java,v 1.8 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,6 +60,8 @@ package org.apache.commons.collections.iterators;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableIterator;
/** /**
* Implements an {@link java.util.Iterator Iterator} over any array. * Implements an {@link java.util.Iterator Iterator} over any array.
* <p> * <p>
@ -72,7 +74,7 @@ import java.util.NoSuchElementException;
* the iterator back to the start if required. * the iterator back to the start if required.
* *
* @since Commons Collections 1.0 * @since Commons Collections 1.0
* @version $Revision: 1.7 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.8 $ $Date: 2003/12/01 22:49:00 $
* *
* @author James Strachan * @author James Strachan
* @author Mauricio S. Moura * @author Mauricio S. Moura

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v 1.9 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ArrayListIterator.java,v 1.10 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -61,6 +61,8 @@ import java.lang.reflect.Array;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableListIterator;
/** /**
* Implements a {@link ListIterator} over an array. * Implements a {@link ListIterator} over an array.
* <p> * <p>
@ -77,7 +79,7 @@ import java.util.NoSuchElementException;
* @see java.util.ListIterator * @see java.util.ListIterator
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.9 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.10 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Neil O'Toole * @author Neil O'Toole
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java,v 1.3 2003/11/19 23:58:11 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java,v 1.4 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,6 +60,9 @@ package org.apache.commons.collections.iterators;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; 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. * Implements a <code>MapIterator</code> using a Map entrySet.
* Reverse iteration is not supported. * Reverse iteration is not supported.
@ -73,7 +76,7 @@ import java.util.Map;
* </pre> * </pre>
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/11/19 23:58:11 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/LoopingIterator.java,v 1.6 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/LoopingIterator.java,v 1.7 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -61,6 +61,8 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableIterator;
/** /**
* An Iterator that restarts when it reaches the end. * An Iterator that restarts when it reaches the end.
* <p> * <p>
@ -72,7 +74,7 @@ import java.util.NoSuchElementException;
* implementations will throw a ConcurrentModificationException. * implementations will throw a ConcurrentModificationException.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.6 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.7 $ $Date: 2003/12/01 22:49:00 $
* *
* @author <a href="mailto:joncrlsn@users.sf.net">Jonathan Carlson</a> * @author <a href="mailto:joncrlsn@users.sf.net">Jonathan Carlson</a>
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v 1.9 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java,v 1.10 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,6 +60,8 @@ package org.apache.commons.collections.iterators;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableIterator;
/** /**
* An {@link Iterator} over an array of objects. * An {@link Iterator} over an array of objects.
* <p> * <p>
@ -70,7 +72,7 @@ import java.util.NoSuchElementException;
* back to the start if required. * back to the start if required.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.9 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.10 $ $Date: 2003/12/01 22:49:00 $
* *
* @author James Strachan * @author James Strachan
* @author Mauricio S. Moura * @author Mauricio S. Moura

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v 1.10 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java,v 1.11 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,6 +60,8 @@ package org.apache.commons.collections.iterators;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableListIterator;
/** /**
* Implements a {@link ListIterator} over an array of objects. * Implements a {@link ListIterator} over an array of objects.
* <p> * <p>
@ -74,7 +76,7 @@ import java.util.NoSuchElementException;
* @see java.util.ListIterator * @see java.util.ListIterator
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.10 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.11 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Neil O'Toole * @author Neil O'Toole
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v 1.9 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonIterator.java,v 1.10 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,12 +60,14 @@ package org.apache.commons.collections.iterators;
import java.util.Iterator; import java.util.Iterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableIterator;
/** /**
* <code>SingletonIterator</code> is an {@link Iterator} over a single * <code>SingletonIterator</code> is an {@link Iterator} over a single
* object instance. * object instance.
* *
* @since Commons Collections 2.0 * @since Commons Collections 2.0
* @version $Revision: 1.9 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.10 $ $Date: 2003/12/01 22:49:00 $
* *
* @author James Strachan * @author James Strachan
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v 1.10 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/SingletonListIterator.java,v 1.11 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -60,12 +60,14 @@ package org.apache.commons.collections.iterators;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.ResettableListIterator;
/** /**
* <code>SingletonIterator</code> is an {@link ListIterator} over a single * <code>SingletonIterator</code> is an {@link ListIterator} over a single
* object instance. * object instance.
* *
* @since Commons Collections 2.1 * @since Commons Collections 2.1
* @version $Revision: 1.10 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.11 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
* @author Rodney Waldhoff * @author Rodney Waldhoff

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java,v 1.2 2003/11/08 18:43:13 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java,v 1.3 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,13 +57,14 @@
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections.iterators;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
/** /**
* Decorates a map iterator such that it cannot be modified. * Decorates a map iterator such that it cannot be modified.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/11/08 18:43:13 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java,v 1.1 2003/11/20 21:45:35 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java,v 1.2 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,13 +57,14 @@
*/ */
package org.apache.commons.collections.iterators; package org.apache.commons.collections.iterators;
import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
/** /**
* Decorates an ordered map iterator such that it cannot be modified. * Decorates an ordered map iterator such that it cannot be modified.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/11/20 21:45:35 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java,v 1.2 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java,v 1.3 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -57,9 +57,9 @@
*/ */
package org.apache.commons.collections.map; package org.apache.commons.collections.map;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.iterators.MapIterator; import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections.iterators.OrderedMapIterator;
/** /**
* Provides a base decorator that enables additional functionality to be added * Provides a base decorator that enables additional functionality to be added
@ -74,7 +74,7 @@ import org.apache.commons.collections.iterators.OrderedMapIterator;
* But, you might want that loophole, so this class is kept simple. * But, you might want that loophole, so this class is kept simple.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v 1.3 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/Flat3Map.java,v 1.4 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -68,9 +68,9 @@ import java.util.Set;
import org.apache.commons.collections.AMap; import org.apache.commons.collections.AMap;
import org.apache.commons.collections.IteratorUtils; 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.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 * A <code>Map</code> implementation that stores data in simple fields until
@ -100,7 +100,7 @@ import org.apache.commons.collections.iterators.ResettableIterator;
* Do not use <code>Flat3Map</code> if the size is likely to grow beyond 3. * Do not use <code>Flat3Map</code> if the size is likely to grow beyond 3.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/HashedMap.java,v 1.1 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/HashedMap.java,v 1.2 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -72,7 +72,7 @@ import java.util.Set;
import org.apache.commons.collections.AMap; import org.apache.commons.collections.AMap;
import org.apache.commons.collections.IteratorUtils; 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 * A <code>Map</code> implementation that is a general purpose replacement
@ -86,7 +86,7 @@ import org.apache.commons.collections.iterators.MapIterator;
* methods exposed. * methods exposed.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.1 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:48:59 $
* *
* @author java util HashMap * @author java util HashMap
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v 1.4 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/ListOrderedMap.java,v 1.5 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -68,11 +68,11 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap; 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.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; import org.apache.commons.collections.pairs.AbstractMapEntry;
/** /**
@ -87,7 +87,7 @@ import org.apache.commons.collections.pairs.AbstractMapEntry;
* original position in the iteration. * original position in the iteration.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.4 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.5 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Henri Yandell * @author Henri Yandell
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/UnmodifiableMap.java,v 1.3 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/UnmodifiableMap.java,v 1.4 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -64,11 +64,11 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.AMap; import org.apache.commons.collections.AMap;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections.collection.UnmodifiableCollection;
import org.apache.commons.collections.iterators.AbstractIteratorDecorator; import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
import org.apache.commons.collections.iterators.EntrySetMapIterator; 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.iterators.UnmodifiableMapIterator;
import org.apache.commons.collections.pairs.AbstractMapEntryDecorator; import org.apache.commons.collections.pairs.AbstractMapEntryDecorator;
import org.apache.commons.collections.set.UnmodifiableSet; import org.apache.commons.collections.set.UnmodifiableSet;
@ -77,7 +77,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
* Decorates another <code>Map</code> to ensure it can't be altered. * Decorates another <code>Map</code> to ensure it can't be altered.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.3 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java,v 1.2 2003/12/01 22:34:53 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java,v 1.3 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -61,11 +61,11 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
import org.apache.commons.collections.collection.UnmodifiableCollection; 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.UnmodifiableMapIterator;
import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator; import org.apache.commons.collections.iterators.UnmodifiableOrderedMapIterator;
import org.apache.commons.collections.map.UnmodifiableMap.UnmodifiableEntrySet; import org.apache.commons.collections.map.UnmodifiableMap.UnmodifiableEntrySet;
@ -75,7 +75,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
* Decorates another <code>OrderedMap</code> to ensure it can't be altered. * Decorates another <code>OrderedMap</code> to ensure it can't be altered.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/12/01 22:34:53 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestIteratorUtils.java,v 1.11 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/TestIteratorUtils.java,v 1.12 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -66,16 +66,11 @@ import java.util.NoSuchElementException;
import junit.framework.Test; 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. * Tests for IteratorUtils.
* *
* @version $Revision: 1.11 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.12 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Unknown * @author Unknown
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v 1.4 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v 1.5 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -65,14 +65,14 @@ import java.util.Set;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.BulkTest; 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.AbstractTestMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
import org.apache.commons.collections.map.AbstractTestMap; import org.apache.commons.collections.map.AbstractTestMap;
/** /**
* Abstract test class for {@link BidiMap} methods and contracts. * Abstract test class for {@link BidiMap} methods and contracts.
* *
* @version $Revision: 1.4 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.5 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Matthew Hawthorne * @author Matthew Hawthorne
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java,v 1.3 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/bidimap/AbstractTestOrderedBidiMap.java,v 1.4 2003/12/01 22:49:00 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -65,14 +65,14 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.BulkTest;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedBidiMap; import org.apache.commons.collections.OrderedBidiMap;
import org.apache.commons.collections.iterators.AbstractTestMapIterator; import org.apache.commons.collections.iterators.AbstractTestMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
/** /**
* Abstract test class for {@link OrderedBidiMap} methods and contracts. * Abstract test class for {@link OrderedBidiMap} methods and contracts.
* *
* @version $Revision: 1.3 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.4 $ $Date: 2003/12/01 22:49:00 $
* *
* @author Matthew Hawthorne * @author Matthew Hawthorne
* @author Stephen Colebourne * @author Stephen Colebourne

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java,v 1.6 2003/11/20 00:31:42 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestMapIterator.java,v 1.7 2003/12/01 22:48:58 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,6 +63,8 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.MapIterator;
/** /**
* Abstract class for testing the MapIterator interface. * Abstract class for testing the MapIterator interface.
* <p> * <p>
@ -72,7 +74,7 @@ import java.util.Set;
* overriding the supportsXxx() methods if necessary. * overriding the supportsXxx() methods if necessary.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.6 $ $Date: 2003/11/20 00:31:42 $ * @version $Revision: 1.7 $ $Date: 2003/12/01 22:48:58 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java,v 1.2 2003/11/20 21:44:58 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/AbstractTestOrderedMapIterator.java,v 1.3 2003/12/01 22:48:58 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -65,6 +65,8 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import org.apache.commons.collections.OrderedMapIterator;
/** /**
* Abstract class for testing the OrderedMapIterator interface. * Abstract class for testing the OrderedMapIterator interface.
* <p> * <p>
@ -74,7 +76,7 @@ import java.util.Set;
* overriding the supportsXxx() methods if necessary. * overriding the supportsXxx() methods if necessary.
* *
* @since Commons Collections 3.0 * @since Commons Collections 3.0
* @version $Revision: 1.2 $ $Date: 2003/11/20 21:44:58 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:58 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v 1.8 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonIterator.java,v 1.9 2003/12/01 22:48:58 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,11 +63,13 @@ import java.util.NoSuchElementException;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.apache.commons.collections.ResettableIterator;
/** /**
* Tests the SingletonIterator to ensure that the next() method will actually * Tests the SingletonIterator to ensure that the next() method will actually
* perform the iteration rather than the hasNext() method. * perform the iteration rather than the hasNext() method.
* *
* @version $Revision: 1.8 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.9 $ $Date: 2003/12/01 22:48:58 $
* *
* @author James Strachan * @author James Strachan
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v 1.8 2003/11/14 22:58:27 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestSingletonListIterator.java,v 1.9 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,10 +63,12 @@ import java.util.NoSuchElementException;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.apache.commons.collections.ResettableListIterator;
/** /**
* Tests the SingletonListIterator. * Tests the SingletonListIterator.
* *
* @version $Revision: 1.8 $ $Date: 2003/11/14 22:58:27 $ * @version $Revision: 1.9 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java,v 1.5 2003/12/01 22:34:55 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java,v 1.6 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -64,13 +64,14 @@ import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap;
/** /**
* Tests the UnmodifiableMapIterator. * Tests the UnmodifiableMapIterator.
* *
* @version $Revision: 1.5 $ $Date: 2003/12/01 22:34:55 $ * @version $Revision: 1.6 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java,v 1.2 2003/12/01 22:34:55 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java,v 1.3 2003/12/01 22:48:58 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -64,14 +64,16 @@ import java.util.TreeMap;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.OrderedMapIterator;
import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.Unmodifiable;
import org.apache.commons.collections.map.ListOrderedMap; import org.apache.commons.collections.map.ListOrderedMap;
/** /**
* Tests the UnmodifiableOrderedMapIterator. * Tests the UnmodifiableOrderedMapIterator.
* *
* @version $Revision: 1.2 $ $Date: 2003/12/01 22:34:55 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:58 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/Attic/AbstractTestAMap.java,v 1.1 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/Attic/AbstractTestAMap.java,v 1.2 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,13 +63,13 @@ import java.util.Map;
import org.apache.commons.collections.AMap; import org.apache.commons.collections.AMap;
import org.apache.commons.collections.BulkTest; 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.AbstractTestMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
/** /**
* Abstract test class for {@link AMap} methods and contracts. * Abstract test class for {@link AMap} methods and contracts.
* *
* @version $Revision: 1.1 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.2 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/AbstractTestOrderedMap.java,v 1.3 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -67,15 +67,15 @@ import java.util.NoSuchElementException;
import java.util.TreeMap; import java.util.TreeMap;
import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.BulkTest;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedMap; import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.comparators.NullComparator; import org.apache.commons.collections.comparators.NullComparator;
import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator; import org.apache.commons.collections.iterators.AbstractTestOrderedMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
/** /**
* Abstract test class for {@link OrderedMap} methods and contracts. * Abstract test class for {@link OrderedMap} methods and contracts.
* *
* @version $Revision: 1.2 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */

View File

@ -1,5 +1,5 @@
/* /*
* $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFlat3Map.java,v 1.2 2003/12/01 22:34:54 scolebourne Exp $ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/map/TestFlat3Map.java,v 1.3 2003/12/01 22:48:59 scolebourne Exp $
* ==================================================================== * ====================================================================
* *
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
@ -63,13 +63,13 @@ import junit.framework.Test;
import junit.textui.TestRunner; import junit.textui.TestRunner;
import org.apache.commons.collections.BulkTest; 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.AbstractTestMapIterator;
import org.apache.commons.collections.iterators.MapIterator;
/** /**
* JUnit tests. * JUnit tests.
* *
* @version $Revision: 1.2 $ $Date: 2003/12/01 22:34:54 $ * @version $Revision: 1.3 $ $Date: 2003/12/01 22:48:59 $
* *
* @author Stephen Colebourne * @author Stephen Colebourne
*/ */