You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2004/05/26 23:58:02 UTC
cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/collection CompositeCollection.java
scolebourne 2004/05/26 14:58:02
Modified: collections/src/java/org/apache/commons/collections/iterators
IteratorChain.java
collections/src/java/org/apache/commons/collections/bidimap
TreeBidiMap.java
collections/src/java/org/apache/commons/collections/collection
CompositeCollection.java
Log:
Replace IteratorUtils calls with direct implementation calls
Revision Changes Path
1.13 +2 -3 jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java
Index: IteratorChain.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/IteratorChain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IteratorChain.java 18 Feb 2004 00:59:50 -0000 1.12
+++ IteratorChain.java 26 May 2004 21:58:02 -0000 1.13
@@ -20,7 +20,6 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.list.UnmodifiableList;
/**
@@ -222,7 +221,7 @@
protected void updateCurrentIterator() {
if (currentIterator == null) {
if (iteratorChain.isEmpty()) {
- currentIterator = IteratorUtils.EMPTY_ITERATOR;
+ currentIterator = EmptyIterator.INSTANCE;
} else {
currentIterator = (Iterator) iteratorChain.get(0);
}
1.14 +6 -6 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TreeBidiMap.java 15 May 2004 11:59:15 -0000 1.13
+++ TreeBidiMap.java 26 May 2004 21:58:02 -0000 1.14
@@ -24,12 +24,12 @@
import java.util.Set;
import org.apache.commons.collections.BidiMap;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.OrderedBidiMap;
import org.apache.commons.collections.OrderedIterator;
import org.apache.commons.collections.OrderedMapIterator;
+import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
import org.apache.commons.collections.keyvalue.UnmodifiableMapEntry;
/**
@@ -406,7 +406,7 @@
*/
public MapIterator mapIterator() {
if (isEmpty()) {
- return IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR;
+ return EmptyOrderedMapIterator.INSTANCE;
}
return new ViewMapIterator(this, KEY);
}
@@ -420,7 +420,7 @@
*/
public OrderedMapIterator orderedMapIterator() {
if (isEmpty()) {
- return IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR;
+ return EmptyOrderedMapIterator.INSTANCE;
}
return new ViewMapIterator(this, KEY);
}
@@ -2048,14 +2048,14 @@
public MapIterator mapIterator() {
if (isEmpty()) {
- return IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR;
+ return EmptyOrderedMapIterator.INSTANCE;
}
return new ViewMapIterator(main, VALUE);
}
public OrderedMapIterator orderedMapIterator() {
if (isEmpty()) {
- return IteratorUtils.EMPTY_ORDERED_MAP_ITERATOR;
+ return EmptyOrderedMapIterator.INSTANCE;
}
return new ViewMapIterator(main, VALUE);
}
1.7 +3 -3 jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java
Index: CompositeCollection.java
===================================================================
RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CompositeCollection.java 15 May 2004 12:39:13 -0000 1.6
+++ CompositeCollection.java 26 May 2004 21:58:02 -0000 1.7
@@ -21,7 +21,7 @@
import java.util.Collection;
import java.util.Iterator;
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.IteratorChain;
import org.apache.commons.collections.list.UnmodifiableList;
@@ -137,7 +137,7 @@
*/
public Iterator iterator() {
if (this.all.length == 0) {
- return IteratorUtils.EMPTY_ITERATOR;
+ return EmptyIterator.INSTANCE;
}
IteratorChain chain = new IteratorChain();
for (int i = 0; i < this.all.length; ++i) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org