rwaldhoff 2003/11/30 23:26:50
Modified: functor/src/test/org/apache/commons/functor/util
TestBinarySearch.java
functor/src/java/org/apache/commons/functor/util
BinarySearch.java
Log:
return int instead of Integer
Revision Changes Path
1.4 +3 -4
jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/util/TestBinarySearch.java
Index: TestBinarySearch.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/test/org/apache/commons/functor/util/TestBinarySearch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBinarySearch.java 1 Dec 2003 07:19:56 -0000 1.3
+++ TestBinarySearch.java 1 Dec 2003 07:26:50 -0000 1.4
@@ -97,11 +97,10 @@
position = (Integer)new BinarySearch(list, new Integer(86)).recurse();
assertEquals(new Integer(86), position);
- position = (Integer)new BinarySearch(list, new Integer(-1)).recurse();
+ position = (Integer)new BinarySearch(list, new Integer(101)).recurse();
assertEquals(new Integer(-1), position);
- position = BinarySearch.execute(list, new Integer(86));
- assertEquals(new Integer(86), position);
+ assertEquals(86, BinarySearch.execute(list, new Integer(86)));
position = (Integer)new BinarySearch(new ArrayList(), new
Integer(10)).recurse();
assertEquals(new Integer(-1), position);
1.3 +4 -5
jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/util/BinarySearch.java
Index: BinarySearch.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/functor/src/java/org/apache/commons/functor/util/BinarySearch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BinarySearch.java 1 Dec 2003 07:19:56 -0000 1.2
+++ BinarySearch.java 1 Dec 2003 07:26:50 -0000 1.3
@@ -71,9 +71,8 @@
* @author Jason Horman ([EMAIL PROTECTED])
* @author Rodney Waldhoff
*/
-
public class BinarySearch extends RecursiveFunction {
-
+// TODO: should have explict null strategy
/***************************************************
* Instance variables
***************************************************/
@@ -129,7 +128,7 @@
* Class methods
***************************************************/
- public static Integer execute(List list, Comparable item) {
- return (Integer)(new BinarySearch(list, item)).recurse();
+ public static int execute(List list, Comparable item) {
+ return ((Number)(new BinarySearch(list, item)).recurse()).intValue();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
