scolebourne 2004/05/03 04:38:49
Modified: collections/src/java/org/apache/commons/collections/iterators
ObjectGraphIterator.java
Log:
Remove dependency on functor subpackage
Revision Changes Path
1.2 +11 -7
jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
Index: ObjectGraphIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectGraphIterator.java 20 Mar 2004 00:21:08 -0000 1.1
+++ ObjectGraphIterator.java 3 May 2004 11:38:49 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.commons.collections.ArrayStack;
import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.TransformerUtils;
/**
* An Iterator that can traverse multiple iterators down an object graph.
@@ -110,7 +109,7 @@
} else {
this.root = root;
}
- this.transformer = (transformer == null ? TransformerUtils.nopTransformer()
: transformer);
+ this.transformer = transformer;
}
/**
@@ -126,7 +125,7 @@
public ObjectGraphIterator(Iterator rootIterator) {
super();
this.currentIterator = rootIterator;
- this.transformer = TransformerUtils.nopTransformer();
+ this.transformer = null;
}
//-----------------------------------------------------------------------
@@ -141,8 +140,11 @@
if (root == null) {
// do nothing, hasNext will be false
} else {
- Object value = transformer.transform(root);
- findNext(value);
+ if (transformer == null) {
+ findNext(root);
+ } else {
+ findNext(transformer.transform(root));
+ }
root = null;
}
} else {
@@ -167,7 +169,9 @@
while (currentIterator.hasNext() && hasNext == false) {
Object next = currentIterator.next();
- next = transformer.transform(next);
+ if (transformer != null) {
+ next = transformer.transform(next);
+ }
findNext(next);
}
if (hasNext) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
