scolebourne 2004/05/26 14:53:46
Modified: collections/src/java/org/apache/commons/collections
IteratorUtils.java
Log:
Ensure empty iterator implementation is as per v3.0
Revision Changes Path
1.27 +11 -10
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- IteratorUtils.java 22 May 2004 09:46:39 -0000 1.26
+++ IteratorUtils.java 26 May 2004 21:53:46 -0000 1.27
@@ -33,6 +33,7 @@
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.EmptyListIterator;
import org.apache.commons.collections.iterators.EmptyMapIterator;
+import org.apache.commons.collections.iterators.EmptyOrderedIterator;
import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
import org.apache.commons.collections.iterators.EnumerationIterator;
import org.apache.commons.collections.iterators.FilterIterator;
@@ -75,21 +76,21 @@
/**
* An iterator over no elements.
* <p>
- * WARNING: This constant is binary incompatible with Commons Collections 2.1.
+ * WARNING: This constant is binary incompatible with Commons Collections 2.1
and 2.1.1.
* Use <code>EmptyIterator.INSTANCE</code> for compatability with Commons
Collections 2.1.1.
*/
public static final ResettableIterator EMPTY_ITERATOR =
EmptyIterator.RESETTABLE_INSTANCE;
/**
* A list iterator over no elements.
* <p>
- * WARNING: This constant is binary incompatible with Commons Collections 2.1.
+ * WARNING: This constant is binary incompatible with Commons Collections 2.1
and 2.1.1.
* Use <code>EmptyListIterator.INSTANCE</code> for compatability with Commons
Collections 2.1.1.
*/
public static final ResettableListIterator EMPTY_LIST_ITERATOR =
EmptyListIterator.RESETTABLE_INSTANCE;
/**
* An ordered iterator over no elements.
*/
- public static final OrderedIterator EMPTY_ORDERED_ITERATOR =
EmptyListIterator.ORDERED_INSTANCE;
+ public static final OrderedIterator EMPTY_ORDERED_ITERATOR =
EmptyOrderedIterator.INSTANCE;
/**
* A map iterator over no elements.
*/
@@ -113,7 +114,7 @@
* This iterator is a valid iterator object that will iterate over
* nothing.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>EmptyIterator.INSTANCE</code> for compatability with Commons
Collections 2.1.1.
*
* @return an iterator over nothing
@@ -128,7 +129,7 @@
* This iterator is a valid list iterator object that will iterate
* over nothing.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>EmptyListIterator.INSTANCE</code> for compatability with Commons
Collections 2.1.1.
*
* @return a list iterator over nothing
@@ -181,7 +182,7 @@
* This iterator is a valid iterator object that will iterate over
* the specified object.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>new SingletonIterator(object)</code> for compatability.
*
* @param object the single object over which to iterate
@@ -209,7 +210,7 @@
/**
* Gets an iterator over an object array.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>new ArrayIterator(array)</code> for compatability.
*
* @param array the array over which to iterate
@@ -238,7 +239,7 @@
/**
* Gets an iterator over the end part of an object array.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>new ArrayIterator(array,start)</code> for compatability.
*
* @param array the array over which to iterate
@@ -273,7 +274,7 @@
/**
* Gets an iterator over part of an object array.
* <p>
- * WARNING: This method is binary incompatible with Commons Collections 2.1.
+ * WARNING: This method is binary incompatible with Commons Collections 2.1 and
2.1.1.
* Use <code>new ArrayIterator(array,start,end)</code> for compatability.
*
* @param array the array over which to iterate
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
