rwaldhoff 2003/11/24 15:09:13
Modified: functor/src/test/org/apache/commons/functor/core/collection
TestCollectionAlgorithms.java
functor/src/test/org/apache/commons/functor/example
QuicksortExample.java
functor/src/java/org/apache/commons/functor/core/collection
CollectionAlgorithms.java
Log:
undeprecate CollectionAlgorithms for now, Algorithms and CollectionAlgorithms are
less compatiable than I thought
Revision Changes Path
1.8 +2 -3
jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestCollectionAlgorithms.java
Index: TestCollectionAlgorithms.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/core/collection/TestCollectionAlgorithms.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestCollectionAlgorithms.java 24 Nov 2003 21:59:30 -0000 1.7
+++ TestCollectionAlgorithms.java 24 Nov 2003 23:09:13 -0000 1.8
@@ -78,7 +78,6 @@
/**
* @version $Revision$ $Date$
- * @deprecated The CollectionAlgorithms class has been deprecated
* @author Rodney Waldhoff
*/
public class TestCollectionAlgorithms extends TestCase {
1.6 +5 -5
jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/example/QuicksortExample.java
Index: QuicksortExample.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/example/QuicksortExample.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QuicksortExample.java 24 Nov 2003 21:59:30 -0000 1.5
+++ QuicksortExample.java 24 Nov 2003 23:09:13 -0000 1.6
@@ -69,7 +69,7 @@
import org.apache.commons.functor.UnaryFunction;
import org.apache.commons.functor.adapter.RightBoundPredicate;
import org.apache.commons.functor.core.ConstantFunction;
-import org.apache.commons.functor.Algorithms;
+import org.apache.commons.functor.core.collection.CollectionAlgorithms;
import org.apache.commons.functor.core.collection.IsEmpty;
import org.apache.commons.functor.core.comparator.IsGreaterThanOrEqual;
import org.apache.commons.functor.core.comparator.IsLessThan;
@@ -501,7 +501,7 @@
*/
private BinaryFunction lesserTail = new ObjectListFunction() {
public Object evaluate(Object head, List tail) {
- return Algorithms.select(
+ return CollectionAlgorithms.select(
tail.iterator(),
RightBoundPredicate.bind(
IsLessThan.getIsLessThan(),
@@ -516,7 +516,7 @@
*/
private BinaryFunction greaterTail = new BinaryFunction() {
public Object evaluate(Object head, Object tail) {
- return Algorithms.select(
+ return CollectionAlgorithms.select(
((List)tail).iterator(),
RightBoundPredicate.bind(
IsGreaterThanOrEqual.instance(),
1.5 +2 -3
jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/CollectionAlgorithms.java
Index: CollectionAlgorithms.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/core/collection/CollectionAlgorithms.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CollectionAlgorithms.java 24 Nov 2003 21:59:30 -0000 1.4
+++ CollectionAlgorithms.java 24 Nov 2003 23:09:13 -0000 1.5
@@ -71,7 +71,6 @@
* Utility methods and algorithms for applying functors
* to [EMAIL PROTECTED] Collection Collections}.
*
- * @deprecated Replaced by, or to be replaced by
org.apache.commons.functor.Algorithms
* @version $Revision$ $Date$
* @author Rodney Waldhoff
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
