cvs commit: jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection TestTransformedIterator.java TestFilteredIterator.java TestAll.java TestPredicatedIterator.java
rwaldhoff2003/11/25 11:02:42
Modified:functor/src/test/org/apache/commons/functor/core/collection
TestAll.java
Added: 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
Removed: functor/src/java/org/apache/commons/functor/core/collection
PredicatedIterator.java
functor/src/test/org/apache/commons/functor/core/collection
TestPredicatedIterator.java
Log:
* rename PredicatedIterator to FilteredIterator
* add functions and teststo FilteredIterator
* add TransformedIterator and tests
Revision ChangesPath
1.1
jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/FilteredIterator.java
Index: FilteredIterator.java
===
/*
* $Header:
/home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/FilteredIterator.java,v
1.1 2003/11/25 19:02:42 rwaldhoff Exp $
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution,
*if any, must include the following acknowledgment:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself,
*if and wherever such third-party acknowledgments normally appear.
*
* 4. The names The Jakarta Project, Commons, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache,
*nor may Apache appear in their name, without prior written
*permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* http://www.apache.org/.
*
*/
package org.apache.commons.functor.core.collection;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.functor.UnaryPredicate;
/**
* @version $Revision: 1.1 $ $Date: 2003/11/25 19:02:42 $
* @author Rodney Waldhoff
*/
public final class FilteredIterator implements Iterator {
// constructor
//
public FilteredIterator(UnaryPredicate predicate, Iterator iterator) {
if(null == iterator || null == predicate) {
throw new NullPointerException();
} else {
this.predicate = predicate;
this.iterator = iterator;
}
}
// iterator methods
//
/**
* @see java.util.Iterator#hasNext()
cvs commit: jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection TestTransformedIterator.java TestFilteredIterator.java
rwaldhoff2003/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 ChangesPath
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 - 1.1
+++ FilteredIterator.java 25 Nov 2003 19:06:42 - 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 - 1.1
+++ TransformedIterator.java 25 Nov 2003 19:06:42 - 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 - 1.1
+++ TestTransformedIterator.java 25 Nov 2003 19:06:42 - 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();
-
