You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2017/07/11 17:52:55 UTC
[05/22] commons-collections git commit: Add EmptyIterator to solve
binary incompatibility on IteratorUtils
Add EmptyIterator to solve binary incompatibility on IteratorUtils
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/branches/COLLECTIONS_2_1_BRANCH@131738 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/commit/4cf2858b
Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/tree/4cf2858b
Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/diff/4cf2858b
Branch: refs/heads/COLLECTIONS_2_1_BRANCH
Commit: 4cf2858b20192055e3f698f31b3deb8a9bb993c0
Parents: ac138ae
Author: Stephen Colebourne <sc...@apache.org>
Authored: Sat May 22 11:15:22 2004 +0000
Committer: Stephen Colebourne <sc...@apache.org>
Committed: Sat May 22 11:15:22 2004 +0000
----------------------------------------------------------------------
.../iterators/AbstractEmptyIterator.java | 22 +++--------------
.../collections/iterators/EmptyIterator.java | 19 +++++----------
.../iterators/EmptyListIterator.java | 25 +++++---------------
3 files changed, 15 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/4cf2858b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
index 18aaa5f..c848137 100644
--- a/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
@@ -20,12 +20,12 @@ import java.util.NoSuchElementException;
/**
* Provides an implementation of an empty iterator.
*
- * @since Commons Collections 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @since Commons Collections 2.1.1 and 3.0.1
+ * @version $Revision: 1.1.2.1 $ $Date: 2004/05/22 11:15:22 $
*
* @author Stephen Colebourne
*/
-public abstract class AbstractEmptyIterator {
+abstract class AbstractEmptyIterator {
/**
* Constructor.
@@ -70,20 +70,4 @@ public abstract class AbstractEmptyIterator {
throw new IllegalStateException("Iterator contains no elements");
}
- public Object getKey() {
- throw new IllegalStateException("Iterator contains no elements");
- }
-
- public Object getValue() {
- throw new IllegalStateException("Iterator contains no elements");
- }
-
- public Object setValue(Object value) {
- throw new IllegalStateException("Iterator contains no elements");
- }
-
- public void reset() {
- // do nothing
- }
-
}
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/4cf2858b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
index d8b5eb1..a95491a 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -17,32 +17,25 @@ package org.apache.commons.collections.iterators;
import java.util.Iterator;
-import org.apache.commons.collections.ResettableIterator;
-
/**
* Provides an implementation of an empty iterator.
* <p>
* This class provides an implementation of an empty iterator.
* This class provides for binary compatability between Commons Collections
- * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
+ * 2.1.1 and 3.0.1 due to issues with <code>IteratorUtils</code>.
*
- * @since Commons Collections 2.1.1 and 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @since Commons Collections 2.1.1 and 3.0.1
+ * @version $Revision: 1.1.2.1 $ $Date: 2004/05/22 11:15:22 $
*
* @author Stephen Colebourne
*/
-public class EmptyIterator extends AbstractEmptyIterator implements ResettableIterator {
+public final class EmptyIterator extends AbstractEmptyIterator implements Iterator {
/**
* Singleton instance of the iterator.
- * @since Commons Collections 3.1
- */
- public static final ResettableIterator RESETTABLE_INSTANCE = new EmptyIterator();
- /**
- * Singleton instance of the iterator.
- * @since Commons Collections 2.1.1 and 3.1
+ * @since Commons Collections 2.1.1 and 3.0.1
*/
- public static final Iterator INSTANCE = RESETTABLE_INSTANCE;
+ public static final Iterator INSTANCE = new EmptyIterator();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/commons-collections/blob/4cf2858b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index 53e4dd5..7747278 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -17,38 +17,25 @@ package org.apache.commons.collections.iterators;
import java.util.ListIterator;
-import org.apache.commons.collections.OrderedIterator;
-import org.apache.commons.collections.ResettableListIterator;
-
/**
* Provides an implementation of an empty list iterator.
* <p>
* This class provides an implementation of an empty list iterator.
* This class provides for binary compatability between Commons Collections
- * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
+ * 2.1.1 and 3.0.1 due to issues with <code>IteratorUtils</code>.
*
- * @since Commons Collections 2.1.1 and 3.1
- * @version $Revision: 1.1 $ $Date: 2004/05/22 09:46:39 $
+ * @since Commons Collections 2.1.1 and 3.0.1
+ * @version $Revision: 1.1.2.1 $ $Date: 2004/05/22 11:15:22 $
*
* @author Stephen Colebourne
*/
-public class EmptyListIterator extends AbstractEmptyIterator implements ResettableListIterator, OrderedIterator {
+public final class EmptyListIterator extends AbstractEmptyIterator implements ListIterator {
/**
* Singleton instance of the iterator.
- * @since Commons Collections 3.1
- */
- public static final ResettableListIterator RESETTABLE_INSTANCE = new EmptyListIterator();
- /**
- * Singleton instance of the iterator.
- * @since Commons Collections 2.1.1 and 3.1
- */
- public static final ListIterator INSTANCE = RESETTABLE_INSTANCE;
- /**
- * Singleton instance of the iterator.
- * @since Commons Collections 3.1
+ * @since Commons Collections 2.1.1 and 3.0.1
*/
- public static final OrderedIterator ORDERED_INSTANCE = (OrderedIterator) RESETTABLE_INSTANCE;
+ public static final ListIterator INSTANCE = new EmptyListIterator();
/**
* Constructor.