rwaldhoff 2003/11/25 11:06:42
Modified: functor/src/java/org/apache/commons/functor/core/collection
FilteredIterator.java TransformedIterator.java
functor/src/test/org/apache/commons/functor/core/collection
TestTransformedIterator.java
TestFilteredIterator.java
Log:
swap order of parameters to match those used in Algorithms
Revision Changes Path
1.2 +6 -6
jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/FilteredIterator.java
Index: FilteredIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/FilteredIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilteredIterator.java 25 Nov 2003 19:02:42 -0000 1.1
+++ FilteredIterator.java 25 Nov 2003 19:06:42 -0000 1.2
@@ -70,7 +70,7 @@
// constructor
// ------------------------------------------------------------------------
- public FilteredIterator(UnaryPredicate predicate, Iterator iterator) {
+ public FilteredIterator(Iterator iterator, UnaryPredicate predicate) {
if(null == iterator || null == predicate) {
throw new NullPointerException();
} else {
@@ -136,14 +136,14 @@
}
public String toString() {
- return "FilteredIterator<" + predicate + "," + iterator + ">";
+ return "FilteredIterator<" + iterator + "," + predicate + ">";
}
// class methods
// ------------------------------------------------------------------------
- public static Iterator filter(UnaryPredicate pred, Iterator iter) {
- return null == pred ? iter : (null == iter ? null : new
FilteredIterator(pred,iter));
+ public static Iterator filter(Iterator iter, UnaryPredicate pred) {
+ return null == pred ? iter : (null == iter ? null : new
FilteredIterator(iter,pred));
}
// private
1.2 +6 -6
jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/TransformedIterator.java
Index: TransformedIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/TransformedIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransformedIterator.java 25 Nov 2003 19:02:42 -0000 1.1
+++ TransformedIterator.java 25 Nov 2003 19:06:42 -0000 1.2
@@ -69,7 +69,7 @@
// constructor
// ------------------------------------------------------------------------
- public TransformedIterator(UnaryFunction function, Iterator iterator) {
+ public TransformedIterator(Iterator iterator, UnaryFunction function) {
if(null == iterator || null == function) {
throw new NullPointerException();
} else {
@@ -121,14 +121,14 @@
}
public String toString() {
- return "TransformedIterator<" + function + "," + iterator + ">";
+ return "TransformedIterator<" + iterator + "," + function + ">";
}
// class methods
// ------------------------------------------------------------------------
- public static Iterator transform(UnaryFunction func, Iterator iter) {
- return null == func ? iter : (null == iter ? null : new
TransformedIterator(func,iter));
+ public static Iterator transform(Iterator iter, UnaryFunction func) {
+ return null == func ? iter : (null == iter ? null : new
TransformedIterator(iter,func));
}
1.2 +16 -16
jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestTransformedIterator.java
Index: TestTransformedIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestTransformedIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTransformedIterator.java 25 Nov 2003 19:02:42 -0000 1.1
+++ TestTransformedIterator.java 25 Nov 2003 19:06:42 -0000 1.2
@@ -89,7 +89,7 @@
public Object makeFunctor() {
List list = new ArrayList();
list.add("xyzzy");
- return
TransformedIterator.transform(IdentityFunction.instance(),list.iterator());
+ return
TransformedIterator.transform(list.iterator(),IdentityFunction.instance());
}
// Lifecycle
@@ -116,7 +116,7 @@
public void testBasicTransform() {
Iterator expected = negatives.iterator();
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
while(expected.hasNext()) {
assertTrue(testing.hasNext());
assertEquals(expected.next(),testing.next());
@@ -125,12 +125,12 @@
}
public void testEmptyList() {
- Iterator testing = new
TransformedIterator(negate,Collections.EMPTY_LIST.iterator());
+ Iterator testing = new
TransformedIterator(Collections.EMPTY_LIST.iterator(),negate);
assertTrue(!testing.hasNext());
}
public void testNextWithoutHasNext() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
Iterator expected = negatives.iterator();
while(expected.hasNext()) {
assertEquals(expected.next(),testing.next());
@@ -139,7 +139,7 @@
}
public void testNextAfterEndOfList() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
Iterator expected = negatives.iterator();
while(expected.hasNext()) {
assertEquals(expected.next(),testing.next());
@@ -153,7 +153,7 @@
}
public void testNextOnEmptyList() {
- Iterator testing = new
TransformedIterator(negate,Collections.EMPTY_LIST.iterator());
+ Iterator testing = new
TransformedIterator(Collections.EMPTY_LIST.iterator(),negate);
try {
testing.next();
fail("ExpectedNoSuchElementException");
@@ -163,7 +163,7 @@
}
public void testRemoveBeforeNext() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
try {
testing.remove();
fail("IllegalStateException");
@@ -173,7 +173,7 @@
}
public void testRemoveAfterNext() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
testing.next();
testing.remove();
try {
@@ -185,7 +185,7 @@
}
public void testRemoveAll() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
while(testing.hasNext()) {
testing.next();
testing.remove();
@@ -194,7 +194,7 @@
}
public void testRemoveWithoutHasNext() {
- Iterator testing = new TransformedIterator(negate,list.iterator());
+ Iterator testing = new TransformedIterator(list.iterator(),negate);
for(int i=0,m = list.size();i<m;i++) {
testing.next();
testing.remove();
@@ -203,12 +203,12 @@
}
public void testTransformWithNullIteratorReturnsNull() {
- assertNull(TransformedIterator.transform(negate,null));
+ assertNull(TransformedIterator.transform(null,negate));
}
public void testTransformWithNullPredicateReturnsIdentity() {
Iterator iter = list.iterator();
- assertSame(iter,TransformedIterator.transform(null,iter));
+ assertSame(iter,TransformedIterator.transform(iter,null));
}
public void testConstructorProhibitsNull() {
@@ -219,13 +219,13 @@
// expected
}
try {
- new TransformedIterator(negate,null);
+ new TransformedIterator(null,negate);
fail("ExpectedNullPointerException");
} catch(NullPointerException e) {
// expected
}
try {
- new TransformedIterator(null,list.iterator());
+ new TransformedIterator(list.iterator(),null);
fail("ExpectedNullPointerException");
} catch(NullPointerException e) {
// expected
1.2 +20 -20
jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestFilteredIterator.java
Index: TestFilteredIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestFilteredIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestFilteredIterator.java 25 Nov 2003 19:02:42 -0000 1.1
+++ TestFilteredIterator.java 25 Nov 2003 19:06:42 -0000 1.2
@@ -89,7 +89,7 @@
public Object makeFunctor() {
List list = new ArrayList();
list.add("xyzzy");
- return
FilteredIterator.filter(ConstantPredicate.trueInstance(),list.iterator());
+ return
FilteredIterator.filter(list.iterator(),ConstantPredicate.trueInstance());
}
// Lifecycle
@@ -118,7 +118,7 @@
public void testSomePass() {
Iterator expected = evens.iterator();
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
while(expected.hasNext()) {
assertTrue(testing.hasNext());
assertEquals(expected.next(),testing.next());
@@ -128,7 +128,7 @@
public void testAllPass() {
Iterator expected = evens.iterator();
- Iterator testing = new FilteredIterator(isEven,evens.iterator());
+ Iterator testing = new FilteredIterator(evens.iterator(),isEven);
while(expected.hasNext()) {
assertTrue(testing.hasNext());
assertEquals(expected.next(),testing.next());
@@ -138,7 +138,7 @@
public void testAllPass2() {
Iterator expected = list.iterator();
- Iterator testing = new
FilteredIterator(ConstantPredicate.trueInstance(),list.iterator());
+ Iterator testing = new
FilteredIterator(list.iterator(),ConstantPredicate.trueInstance());
while(expected.hasNext()) {
assertTrue(testing.hasNext());
assertEquals(expected.next(),testing.next());
@@ -147,17 +147,17 @@
}
public void testEmptyList() {
- Iterator testing = new
FilteredIterator(isEven,Collections.EMPTY_LIST.iterator());
+ Iterator testing = new
FilteredIterator(Collections.EMPTY_LIST.iterator(),isEven);
assertTrue(!testing.hasNext());
}
public void testNonePass() {
- Iterator testing = new
FilteredIterator(ConstantPredicate.falseInstance(),Collections.EMPTY_LIST.iterator());
+ Iterator testing = new
FilteredIterator(Collections.EMPTY_LIST.iterator(),ConstantPredicate.falseInstance());
assertTrue(!testing.hasNext());
}
public void testNextWithoutHasNext() {
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
Iterator expected = evens.iterator();
while(expected.hasNext()) {
assertEquals(expected.next(),testing.next());
@@ -166,7 +166,7 @@
}
public void testNextAfterEndOfList() {
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
Iterator expected = evens.iterator();
while(expected.hasNext()) {
assertEquals(expected.next(),testing.next());
@@ -180,7 +180,7 @@
}
public void testNextOnEmptyList() {
- Iterator testing = new
FilteredIterator(isEven,Collections.EMPTY_LIST.iterator());
+ Iterator testing = new
FilteredIterator(Collections.EMPTY_LIST.iterator(),isEven);
try {
testing.next();
fail("ExpectedNoSuchElementException");
@@ -190,7 +190,7 @@
}
public void testRemoveBeforeNext() {
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
try {
testing.remove();
fail("IllegalStateException");
@@ -200,7 +200,7 @@
}
public void testRemoveAfterNext() {
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
testing.next();
testing.remove();
try {
@@ -212,7 +212,7 @@
}
public void testRemoveSome() {
- Iterator testing = new FilteredIterator(isEven,list.iterator());
+ Iterator testing = new FilteredIterator(list.iterator(),isEven);
while(testing.hasNext()) {
testing.next();
testing.remove();
@@ -223,7 +223,7 @@
}
public void testRemoveAll() {
- Iterator testing = new
FilteredIterator(ConstantPredicate.trueInstance(),list.iterator());
+ Iterator testing = new
FilteredIterator(list.iterator(),ConstantPredicate.trueInstance());
while(testing.hasNext()) {
testing.next();
testing.remove();
@@ -232,7 +232,7 @@
}
public void testRemoveWithoutHasNext() {
- Iterator testing = new
FilteredIterator(ConstantPredicate.trueInstance(),list.iterator());
+ Iterator testing = new
FilteredIterator(list.iterator(),ConstantPredicate.trueInstance());
for(int i=0,m = list.size();i<m;i++) {
testing.next();
testing.remove();
@@ -241,12 +241,12 @@
}
public void testFilterWithNullIteratorReturnsNull() {
- assertNull(FilteredIterator.filter(ConstantPredicate.trueInstance(),null));
+ assertNull(FilteredIterator.filter(null,ConstantPredicate.trueInstance()));
}
public void testFilterWithNullPredicateReturnsIdentity() {
Iterator iter = list.iterator();
- assertSame(iter,FilteredIterator.filter(null,iter));
+ assertSame(iter,FilteredIterator.filter(iter,null));
}
public void testConstructorProhibitsNull() {
@@ -257,13 +257,13 @@
// expected
}
try {
- new FilteredIterator(ConstantPredicate.trueInstance(),null);
+ new FilteredIterator(null,ConstantPredicate.trueInstance());
fail("ExpectedNullPointerException");
} catch(NullPointerException e) {
// expected
}
try {
- new FilteredIterator(null,list.iterator());
+ new FilteredIterator(list.iterator(),null);
fail("ExpectedNullPointerException");
} catch(NullPointerException e) {
// expected
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
