You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2008/04/03 22:43:37 UTC
svn commit: r644480 [2/3] - in /commons/sandbox/functor/trunk/src:
main/java/org/apache/commons/functor/
main/java/org/apache/commons/functor/adapter/
main/java/org/apache/commons/functor/core/
main/java/org/apache/commons/functor/core/collection/ main...
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java Thu Apr 3 13:43:29 2008
@@ -66,8 +66,8 @@
// predicate interface
// ------------------------------------------------------------------------
public boolean test(Object a, Object b) {
- for(Iterator iter = getBinaryPredicateIterator(); iter.hasNext();) {
- if(((BinaryPredicate)iter.next()).test(a,b)) {
+ for (Iterator iter = getBinaryPredicateIterator(); iter.hasNext();) {
+ if (((BinaryPredicate) iter.next()).test(a,b)) {
return true;
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof BinaryOr) {
- return equals((BinaryOr)that);
+ if (that instanceof BinaryOr) {
+ return equals((BinaryOr) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java Thu Apr 3 13:43:29 2008
@@ -67,14 +67,14 @@
// predicate interface
// ------------------------------------------------------------------------
public void run(Object left, Object right) {
- for(ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
- ((BinaryProcedure)iter.previous()).run(left,right);
+ for (ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
+ ((BinaryProcedure) iter.previous()).run(left,right);
}
}
public boolean equals(Object that) {
- if(that instanceof BinarySequence) {
- return equals((BinarySequence)that);
+ if (that instanceof BinarySequence) {
+ return equals((BinarySequence) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java Thu Apr 3 13:43:29 2008
@@ -77,15 +77,15 @@
// ------------------------------------------------------------------------
public Object evaluate(Object obj) {
Object result = obj;
- for(ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
- result = ((UnaryFunction)iter.previous()).evaluate(result);
+ for (ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
+ result = ((UnaryFunction) iter.previous()).evaluate(result);
}
return result;
}
public boolean equals(Object that) {
- if(that instanceof CompositeUnaryFunction) {
- return equals((CompositeUnaryFunction)that);
+ if (that instanceof CompositeUnaryFunction) {
+ return equals((CompositeUnaryFunction) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java Thu Apr 3 13:43:29 2008
@@ -49,14 +49,14 @@
// constructor
// ------------------------------------------------------------------------
public CompositeUnaryPredicate(UnaryPredicate p) {
- if(null == p) { throw new NullPointerException(); }
+ if (null == p) { throw new NullPointerException(); }
this.predicate = p;
this.function = new CompositeUnaryFunction();
}
public CompositeUnaryPredicate(UnaryPredicate p, UnaryFunction f) {
- if(null == p) { throw new NullPointerException(); }
- if(null == f) { throw new NullPointerException(); }
+ if (null == p) { throw new NullPointerException(); }
+ if (null == f) { throw new NullPointerException(); }
this.predicate = p;
this.function = new CompositeUnaryFunction(f);
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof CompositeUnaryPredicate) {
- return equals((CompositeUnaryPredicate)that);
+ if (that instanceof CompositeUnaryPredicate) {
+ return equals((CompositeUnaryPredicate) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java Thu Apr 3 13:43:29 2008
@@ -49,14 +49,14 @@
// constructor
// ------------------------------------------------------------------------
public CompositeUnaryProcedure(UnaryProcedure p) {
- if(null == p) { throw new NullPointerException(); }
+ if (null == p) { throw new NullPointerException(); }
this.procedure = p;
this.function = new CompositeUnaryFunction();
}
public CompositeUnaryProcedure(UnaryProcedure p, UnaryFunction f) {
- if(null == p) { throw new NullPointerException(); }
- if(null == f) { throw new NullPointerException(); }
+ if (null == p) { throw new NullPointerException(); }
+ if (null == f) { throw new NullPointerException(); }
this.procedure = p;
this.function = new CompositeUnaryFunction(f);
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof CompositeUnaryProcedure) {
- return equals((CompositeUnaryProcedure)that);
+ if (that instanceof CompositeUnaryProcedure) {
+ return equals((CompositeUnaryProcedure) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java Thu Apr 3 13:43:29 2008
@@ -59,8 +59,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalBinaryFunction) {
- return equals((ConditionalBinaryFunction)that);
+ if (that instanceof ConditionalBinaryFunction) {
+ return equals((ConditionalBinaryFunction) that);
} else {
return false;
}
@@ -75,15 +75,15 @@
public int hashCode() {
int hash = "ConditionalBinaryFunction".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenFunc) {
+ if (null != thenFunc) {
hash <<= 4;
hash ^= thenFunc.hashCode();
}
- if(null != elseFunc) {
+ if (null != elseFunc) {
hash <<= 4;
hash ^= elseFunc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java Thu Apr 3 13:43:29 2008
@@ -58,8 +58,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalBinaryPredicate) {
- return equals((ConditionalBinaryPredicate)that);
+ if (that instanceof ConditionalBinaryPredicate) {
+ return equals((ConditionalBinaryPredicate) that);
} else {
return false;
}
@@ -74,15 +74,15 @@
public int hashCode() {
int hash = "ConditionalBinaryPredicate".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenPred) {
+ if (null != thenPred) {
hash <<= 4;
hash ^= thenPred.hashCode();
}
- if(null != elsePred) {
+ if (null != elsePred) {
hash <<= 4;
hash ^= elsePred.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java Thu Apr 3 13:43:29 2008
@@ -28,7 +28,7 @@
* Given a {@link BinaryPredicate predicate}
* <i>p</i> and {@link BinaryProcedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
- * <code>if(p.test(x,y)) { q.run(x,y); } else { r.run(x,y); }</code>.
+ * <code>if (p.test(x,y)) { q.run(x,y); } else { r.run(x,y); }</code>.
* <p>
* Note that although this class implements
* {@link Serializable}, a given instance will
@@ -54,7 +54,7 @@
// predicate interface
// ------------------------------------------------------------------------
public void run(Object left, Object right) {
- if(ifPred.test(left,right)) {
+ if (ifPred.test(left,right)) {
thenProc.run(left,right);
} else {
elseProc.run(left,right);
@@ -62,8 +62,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalBinaryProcedure) {
- return equals((ConditionalBinaryProcedure)that);
+ if (that instanceof ConditionalBinaryProcedure) {
+ return equals((ConditionalBinaryProcedure) that);
} else {
return false;
}
@@ -78,15 +78,15 @@
public int hashCode() {
int hash = "ConditionalBinaryProcedure".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenProc) {
+ if (null != thenProc) {
hash <<= 4;
hash ^= thenProc.hashCode();
}
- if(null != elseProc) {
+ if (null != elseProc) {
hash <<= 4;
hash ^= elseProc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java Thu Apr 3 13:43:29 2008
@@ -59,8 +59,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalFunction) {
- return equals((ConditionalFunction)that);
+ if (that instanceof ConditionalFunction) {
+ return equals((ConditionalFunction) that);
} else {
return false;
}
@@ -75,15 +75,15 @@
public int hashCode() {
int hash = "ConditionalFunction".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenFunc) {
+ if (null != thenFunc) {
hash <<= 4;
hash ^= thenFunc.hashCode();
}
- if(null != elseFunc) {
+ if (null != elseFunc) {
hash <<= 4;
hash ^= elseFunc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java Thu Apr 3 13:43:29 2008
@@ -58,8 +58,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalPredicate) {
- return equals((ConditionalPredicate)that);
+ if (that instanceof ConditionalPredicate) {
+ return equals((ConditionalPredicate) that);
} else {
return false;
}
@@ -74,15 +74,15 @@
public int hashCode() {
int hash = "ConditionalPredicate".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenPred) {
+ if (null != thenPred) {
hash <<= 4;
hash ^= thenPred.hashCode();
}
- if(null != elsePred) {
+ if (null != elsePred) {
hash <<= 4;
hash ^= elsePred.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java Thu Apr 3 13:43:29 2008
@@ -28,7 +28,7 @@
* Given a {@link Predicate predicate}
* <i>p</i> and {@link Procedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
- * <code>if(p.test()) { q.run(); } else { r.run(); }</code>.
+ * <code>if (p.test()) { q.run(); } else { r.run(); }</code>.
* <p>
* Note that although this class implements
* {@link Serializable}, a given instance will
@@ -54,7 +54,7 @@
// predicate interface
// ------------------------------------------------------------------------
public void run() {
- if(ifPred.test()) {
+ if (ifPred.test()) {
thenProc.run();
} else {
elseProc.run();
@@ -62,8 +62,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalProcedure) {
- return equals((ConditionalProcedure)that);
+ if (that instanceof ConditionalProcedure) {
+ return equals((ConditionalProcedure) that);
} else {
return false;
}
@@ -78,15 +78,15 @@
public int hashCode() {
int hash = "ConditionalProcedure".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenProc) {
+ if (null != thenProc) {
hash <<= 4;
hash ^= thenProc.hashCode();
}
- if(null != elseProc) {
+ if (null != elseProc) {
hash <<= 4;
hash ^= elseProc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java Thu Apr 3 13:43:29 2008
@@ -59,8 +59,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalUnaryFunction) {
- return equals((ConditionalUnaryFunction)that);
+ if (that instanceof ConditionalUnaryFunction) {
+ return equals((ConditionalUnaryFunction) that);
} else {
return false;
}
@@ -75,15 +75,15 @@
public int hashCode() {
int hash = "ConditionalUnaryFunction".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenFunc) {
+ if (null != thenFunc) {
hash <<= 4;
hash ^= thenFunc.hashCode();
}
- if(null != elseFunc) {
+ if (null != elseFunc) {
hash <<= 4;
hash ^= elseFunc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java Thu Apr 3 13:43:29 2008
@@ -58,8 +58,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalUnaryPredicate) {
- return equals((ConditionalUnaryPredicate)that);
+ if (that instanceof ConditionalUnaryPredicate) {
+ return equals((ConditionalUnaryPredicate) that);
} else {
return false;
}
@@ -74,15 +74,15 @@
public int hashCode() {
int hash = "ConditionalUnaryPredicate".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenPred) {
+ if (null != thenPred) {
hash <<= 4;
hash ^= thenPred.hashCode();
}
- if(null != elsePred) {
+ if (null != elsePred) {
hash <<= 4;
hash ^= elsePred.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java Thu Apr 3 13:43:29 2008
@@ -28,7 +28,7 @@
* Given a {@link UnaryPredicate predicate}
* <i>p</i> and {@link UnaryProcedure procedures}
* <i>q</i> and <i>r</i>, {@link #run runs}
- * <code>if(p.test(x)) { q.run(x); } else { r.run(x); }</code>.
+ * <code>if (p.test(x)) { q.run(x); } else { r.run(x); }</code>.
* <p>
* Note that although this class implements
* {@link Serializable}, a given instance will
@@ -54,7 +54,7 @@
// predicate interface
// ------------------------------------------------------------------------
public void run(Object obj) {
- if(ifPred.test(obj)) {
+ if (ifPred.test(obj)) {
thenProc.run(obj);
} else {
elseProc.run(obj);
@@ -62,8 +62,8 @@
}
public boolean equals(Object that) {
- if(that instanceof ConditionalUnaryProcedure) {
- return equals((ConditionalUnaryProcedure)that);
+ if (that instanceof ConditionalUnaryProcedure) {
+ return equals((ConditionalUnaryProcedure) that);
} else {
return false;
}
@@ -78,15 +78,15 @@
public int hashCode() {
int hash = "ConditionalUnaryProcedure".hashCode();
- if(null != ifPred) {
+ if (null != ifPred) {
hash <<= 4;
hash ^= ifPred.hashCode();
}
- if(null != thenProc) {
+ if (null != thenProc) {
hash <<= 4;
hash ^= thenProc.hashCode();
}
- if(null != elseProc) {
+ if (null != elseProc) {
hash <<= 4;
hash ^= elseProc.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java Thu Apr 3 13:43:29 2008
@@ -50,8 +50,8 @@
}
public boolean equals(Object that) {
- if(that instanceof Not) {
- return equals((Not)that);
+ if (that instanceof Not) {
+ return equals((Not) that);
} else {
return false;
}
@@ -63,7 +63,7 @@
public int hashCode() {
int hash = "Not".hashCode();
- if(null != predicate) {
+ if (null != predicate) {
hash ^= predicate.hashCode();
}
return hash;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java Thu Apr 3 13:43:29 2008
@@ -66,8 +66,8 @@
// predicate interface
// ------------------------------------------------------------------------
public boolean test() {
- for(Iterator iter = getPredicateIterator(); iter.hasNext();) {
- if(((Predicate)iter.next()).test()) {
+ for (Iterator iter = getPredicateIterator(); iter.hasNext();) {
+ if (((Predicate) iter.next()).test()) {
return true;
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof Or) {
- return equals((Or)that);
+ if (that instanceof Or) {
+ return equals((Or) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java Thu Apr 3 13:43:29 2008
@@ -66,14 +66,14 @@
// predicate interface
// ------------------------------------------------------------------------
public void run() {
- for(ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
- ((Procedure)iter.previous()).run();
+ for (ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
+ ((Procedure) iter.previous()).run();
}
}
public boolean equals(Object that) {
- if(that instanceof Sequence) {
- return equals((Sequence)that);
+ if (that instanceof Sequence) {
+ return equals((Sequence) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java Thu Apr 3 13:43:29 2008
@@ -54,8 +54,8 @@
}
public boolean equals(Object that) {
- if(that instanceof TransposedFunction) {
- return equals((TransposedFunction)that);
+ if (that instanceof TransposedFunction) {
+ return equals((TransposedFunction) that);
} else {
return false;
}
@@ -67,7 +67,7 @@
public int hashCode() {
int hash = "TransposedFunction".hashCode();
- if(null != function) {
+ if (null != function) {
hash ^= function.hashCode();
}
return hash;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java Thu Apr 3 13:43:29 2008
@@ -54,8 +54,8 @@
}
public boolean equals(Object that) {
- if(that instanceof TransposedPredicate) {
- return equals((TransposedPredicate)that);
+ if (that instanceof TransposedPredicate) {
+ return equals((TransposedPredicate) that);
} else {
return false;
}
@@ -67,7 +67,7 @@
public int hashCode() {
int hash = "TransposedPredicate".hashCode();
- if(null != predicate) {
+ if (null != predicate) {
hash ^= predicate.hashCode();
}
return hash;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java Thu Apr 3 13:43:29 2008
@@ -54,8 +54,8 @@
}
public boolean equals(Object that) {
- if(that instanceof TransposedProcedure) {
- return equals((TransposedProcedure)that);
+ if (that instanceof TransposedProcedure) {
+ return equals((TransposedProcedure) that);
} else {
return false;
}
@@ -67,7 +67,7 @@
public int hashCode() {
int hash = "TransposedProcedure".hashCode();
- if(null != procedure) {
+ if (null != procedure) {
hash ^= procedure.hashCode();
}
return hash;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java Thu Apr 3 13:43:29 2008
@@ -66,8 +66,8 @@
// predicate interface
// ------------------------------------------------------------------------
public boolean test(Object obj) {
- for(Iterator iter = getUnaryPredicateIterator(); iter.hasNext();) {
- if(!((UnaryPredicate)iter.next()).test(obj)) {
+ for (Iterator iter = getUnaryPredicateIterator(); iter.hasNext();) {
+ if (!((UnaryPredicate) iter.next()).test(obj)) {
return false;
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof UnaryAnd) {
- return equals((UnaryAnd)that);
+ if (that instanceof UnaryAnd) {
+ return equals((UnaryAnd) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java Thu Apr 3 13:43:29 2008
@@ -55,8 +55,8 @@
}
public boolean equals(Object that) {
- if(that instanceof UnaryCompositeBinaryFunction) {
- return equals((UnaryCompositeBinaryFunction)that);
+ if (that instanceof UnaryCompositeBinaryFunction) {
+ return equals((UnaryCompositeBinaryFunction) that);
} else {
return false;
}
@@ -71,15 +71,15 @@
public int hashCode() {
int hash = "UnaryCompositeBinaryFunction".hashCode();
- if(null != binary) {
+ if (null != binary) {
hash <<= 4;
hash ^= binary.hashCode();
}
- if(null != leftUnary) {
+ if (null != leftUnary) {
hash <<= 4;
hash ^= leftUnary.hashCode();
}
- if(null != rightUnary) {
+ if (null != rightUnary) {
hash <<= 4;
hash ^= rightUnary.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java Thu Apr 3 13:43:29 2008
@@ -55,8 +55,8 @@
}
public boolean equals(Object that) {
- if(that instanceof UnaryCompositeBinaryPredicate) {
- return equals((UnaryCompositeBinaryPredicate)that);
+ if (that instanceof UnaryCompositeBinaryPredicate) {
+ return equals((UnaryCompositeBinaryPredicate) that);
} else {
return false;
}
@@ -71,15 +71,15 @@
public int hashCode() {
int hash = "UnaryCompositeBinaryPredicate".hashCode();
- if(null != binary) {
+ if (null != binary) {
hash <<= 4;
hash ^= binary.hashCode();
}
- if(null != leftUnary) {
+ if (null != leftUnary) {
hash <<= 4;
hash ^= leftUnary.hashCode();
}
- if(null != rightUnary) {
+ if (null != rightUnary) {
hash <<= 4;
hash ^= rightUnary.hashCode();
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java Thu Apr 3 13:43:29 2008
@@ -50,8 +50,8 @@
}
public boolean equals(Object that) {
- if(that instanceof UnaryNot) {
- return equals((UnaryNot)that);
+ if (that instanceof UnaryNot) {
+ return equals((UnaryNot) that);
} else {
return false;
}
@@ -63,7 +63,7 @@
public int hashCode() {
int hash = "UnaryNot".hashCode();
- if(null != predicate) {
+ if (null != predicate) {
hash ^= predicate.hashCode();
}
return hash;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java Thu Apr 3 13:43:29 2008
@@ -66,8 +66,8 @@
// predicate interface
// ------------------------------------------------------------------------
public boolean test(Object a) {
- for(Iterator iter = getUnaryPredicateIterator(); iter.hasNext();) {
- if(((UnaryPredicate)iter.next()).test(a)) {
+ for (Iterator iter = getUnaryPredicateIterator(); iter.hasNext();) {
+ if (((UnaryPredicate) iter.next()).test(a)) {
return true;
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object that) {
- if(that instanceof UnaryOr) {
- return equals((UnaryOr)that);
+ if (that instanceof UnaryOr) {
+ return equals((UnaryOr) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java Thu Apr 3 13:43:29 2008
@@ -66,14 +66,14 @@
// predicate interface
// ------------------------------------------------------------------------
public void run(Object obj) {
- for(ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
- ((UnaryProcedure)iter.previous()).run(obj);
+ for (ListIterator iter = list.listIterator(list.size()); iter.hasPrevious();) {
+ ((UnaryProcedure) iter.previous()).run(obj);
}
}
public boolean equals(Object that) {
- if(that instanceof UnarySequence) {
- return equals((UnarySequence)that);
+ if (that instanceof UnarySequence) {
+ return equals((UnarySequence) that);
} else {
return false;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/BaseGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/BaseGenerator.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/BaseGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/BaseGenerator.java Thu Apr 3 13:43:29 2008
@@ -135,11 +135,11 @@
/** Same as to(new CollectionTransformer(collection)). */
public final Collection to(Collection collection) {
- return (Collection)to(new CollectionTransformer(collection));
+ return (Collection) to(new CollectionTransformer(collection));
}
/** Same as to(new CollectionTransformer()). */
public final Collection toCollection() {
- return (Collection)to(new CollectionTransformer());
+ return (Collection) to(new CollectionTransformer());
}
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java Thu Apr 3 13:43:29 2008
@@ -34,7 +34,7 @@
//-----------------------------------------------------
public IteratorToGeneratorAdapter(Iterator iter) {
- if(null == iter) {
+ if (null == iter) {
throw new NullPointerException();
} else {
this.iter = iter;
@@ -52,8 +52,8 @@
}
public boolean equals(Object obj) {
- if(obj instanceof IteratorToGeneratorAdapter) {
- IteratorToGeneratorAdapter that = (IteratorToGeneratorAdapter)obj;
+ if (obj instanceof IteratorToGeneratorAdapter) {
+ IteratorToGeneratorAdapter that = (IteratorToGeneratorAdapter) obj;
return this.iter.equals(that.iter);
} else {
return false;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/CollectionTransformer.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/CollectionTransformer.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/CollectionTransformer.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/CollectionTransformer.java Thu Apr 3 13:43:29 2008
@@ -51,7 +51,7 @@
// instance methods
//---------------------------------------------------
public Object evaluate(Object obj) {
- return evaluate((Generator)obj);
+ return evaluate((Generator) obj);
}
public Object evaluate(Generator generator) {
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/EachElement.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/EachElement.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/EachElement.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/EachElement.java Thu Apr 3 13:43:29 2008
@@ -34,7 +34,7 @@
public final class EachElement {
public static final Generator from(Collection collection) {
- if(null == collection) {
+ if (null == collection) {
return null;
} else {
return EachElement.from(collection.iterator());
@@ -42,7 +42,7 @@
}
public static final Generator from(Map map) {
- if(null == map) {
+ if (null == map) {
return null;
} else {
return EachElement.from(map.entrySet().iterator());
@@ -50,7 +50,7 @@
}
public static final Generator from(Object[] array) {
- if(null == array) {
+ if (null == array) {
return null;
} else {
return EachElement.from(Arrays.asList(array).iterator());
@@ -58,7 +58,7 @@
}
public static final Generator from(Iterator iter) {
- if(null == iter) {
+ if (null == iter) {
return null;
} else {
return new IteratorToGeneratorAdapter(iter);
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java Thu Apr 3 13:43:29 2008
@@ -46,7 +46,7 @@
}
public IntegerRange(int from, int to, int step) {
- if(from != to && signOf(step) != signOf(to-from)) {
+ if (from != to && signOf(step) != signOf(to-from)) {
throw new IllegalArgumentException("Will never reach " + to + " from " + from + " using step " + step);
} else {
this.from = from;
@@ -59,12 +59,12 @@
//---------------------------------------------------------------
public void run(UnaryProcedure proc) {
- if(signOf(step) == -1) {
- for(int i=from; i > to; i += step) {
+ if (signOf(step) == -1) {
+ for (int i=from; i > to; i += step) {
proc.run(new Integer(i));
}
} else {
- for(int i=from; i < to; i += step) {
+ for (int i=from; i < to; i += step) {
proc.run(new Integer(i));
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object obj) {
- if(obj instanceof IntegerRange) {
- IntegerRange that = (IntegerRange)obj;
+ if (obj instanceof IntegerRange) {
+ IntegerRange that = (IntegerRange) obj;
return this.from == that.from && this.to == that.to && this.step == that.step;
} else {
return false;
@@ -98,9 +98,9 @@
//---------------------------------------------------------------
private static int signOf(int value) {
- if(value < 0) {
+ if (value < 0) {
return -1;
- } else if(value > 0) {
+ } else if (value > 0) {
return 1;
} else {
return 0;
@@ -108,7 +108,7 @@
}
private static int defaultStep(int from, int to) {
- if(from > to) {
+ if (from > to) {
return -1;
} else {
return 1;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java Thu Apr 3 13:43:29 2008
@@ -46,7 +46,7 @@
}
public LongRange(long from, long to, long step) {
- if(from != to && signOf(step) != signOf(to-from)) {
+ if (from != to && signOf(step) != signOf(to-from)) {
throw new IllegalArgumentException("Will never reach " + to + " from " + from + " using step " + step);
} else {
this.from = from;
@@ -59,12 +59,12 @@
//---------------------------------------------------------------
public void run(UnaryProcedure proc) {
- if(signOf(step) == -1L) {
- for(long i=from; i > to; i += step) {
+ if (signOf(step) == -1L) {
+ for (long i=from; i > to; i += step) {
proc.run(new Long(i));
}
} else {
- for(long i=from; i < to; i += step) {
+ for (long i=from; i < to; i += step) {
proc.run(new Long(i));
}
}
@@ -75,8 +75,8 @@
}
public boolean equals(Object obj) {
- if(obj instanceof LongRange) {
- LongRange that = (LongRange)obj;
+ if (obj instanceof LongRange) {
+ LongRange that = (LongRange) obj;
return this.from == that.from && this.to == that.to && this.step == that.step;
} else {
return false;
@@ -98,9 +98,9 @@
//---------------------------------------------------------------
private static long signOf(long value) {
- if(value < 0) {
+ if (value < 0) {
return -1;
- } else if(value > 0) {
+ } else if (value > 0) {
return 1;
} else {
return 0;
@@ -108,7 +108,7 @@
}
private static long defaultStep(long from, long to) {
- if(from > to) {
+ if (from > to) {
return -1L;
} else {
return 1L;
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/BaseFunctorTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/BaseFunctorTest.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/BaseFunctorTest.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/BaseFunctorTest.java Thu Apr 3 13:43:29 2008
@@ -63,7 +63,7 @@
assertTrue(! obj.equals(null) ); // should be able to compare to null
Object obj2 = makeFunctor();
- if(obj.equals(obj2)) {
+ if (obj.equals(obj2)) {
assertEquals("equals implies hash equals",obj.hashCode(),obj2.hashCode());
assertEquals("equals must be symmetric",obj2,obj);
} else {
@@ -73,7 +73,7 @@
public final void testSerializeDeserializeThenCompare() throws Exception {
Object obj = makeFunctor();
- if(obj instanceof Serializable) {
+ if (obj instanceof Serializable) {
ByteArrayOutputStream buffer = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(buffer);
out.writeObject(obj);
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/TestAlgorithms.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/TestAlgorithms.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/TestAlgorithms.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/TestAlgorithms.java Thu Apr 3 13:43:29 2008
@@ -64,13 +64,13 @@
doubled = new ArrayList();
listWithDuplicates = new ArrayList();
sum = 0;
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
list.add(new Integer(i));
doubled.add(new Integer(i*2));
listWithDuplicates.add(new Integer(i));
listWithDuplicates.add(new Integer(i));
sum += i;
- if(i%2 == 0) {
+ if (i%2 == 0) {
evens.add(new Integer(i));
}
}
@@ -98,7 +98,7 @@
Set set = new HashSet();
assertSame(set,Algorithms.collect(list.iterator(),set));
assertEquals(list.size(),set.size());
- for(Iterator iter = list.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = list.iterator(); iter.hasNext(); ) {
assertTrue(set.contains(iter.next()));
}
}
@@ -107,7 +107,7 @@
Set set = new HashSet();
assertSame(set,Algorithms.collect(listWithDuplicates.iterator(),set));
assertTrue(listWithDuplicates.size() > set.size());
- for(Iterator iter = listWithDuplicates.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = listWithDuplicates.iterator(); iter.hasNext(); ) {
assertTrue(set.contains(iter.next()));
}
}
@@ -172,7 +172,7 @@
list.listIterator(),
new UnaryFunction() {
public Object evaluate(Object obj) {
- return new Integer(((Number)obj).intValue()*2);
+ return new Integer(((Number) obj).intValue()*2);
}
}
);
@@ -203,7 +203,7 @@
Set set = new HashSet();
assertSame(set,IteratorToGeneratorAdapter.adapt(Algorithms.apply(list.iterator(),Identity.instance())).to(set));
assertEquals(list.size(),set.size());
- for(Iterator iter = list.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = list.iterator(); iter.hasNext(); ) {
assertTrue(set.contains(iter.next()));
}
}
@@ -212,7 +212,7 @@
Set set = new HashSet();
assertSame(set,IteratorToGeneratorAdapter.adapt(Algorithms.apply(listWithDuplicates.iterator(),Identity.instance())).to(set));
assertTrue(listWithDuplicates.size() > set.size());
- for(Iterator iter = listWithDuplicates.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = listWithDuplicates.iterator(); iter.hasNext(); ) {
assertTrue(set.contains(iter.next()));
}
}
@@ -228,7 +228,7 @@
new Integer(0),
new BinaryFunction() {
public Object evaluate(Object a, Object b) {
- return new Integer(((Number)a).intValue() + ((Number)b).intValue());
+ return new Integer(((Number) a).intValue() + ((Number) b).intValue());
}
});
assertEquals(new Integer(sum),result);
@@ -240,7 +240,7 @@
}
public void testDoUntil() {
- for(int i=0;i<3;i++){
+ for (int i=0;i<3;i++){
Counter counter = new Counter();
Algorithms.dountil(counter,new Offset(i));
assertEquals(i+1,counter.count);
@@ -248,7 +248,7 @@
}
public void testDoWhile() {
- for(int i=0;i<3;i++){
+ for (int i=0;i<3;i++){
Counter counter = new Counter();
Algorithms.dowhile(counter,new Limit(i));
assertEquals(i+1,counter.count);
@@ -256,7 +256,7 @@
}
public void testUntilDo() {
- for(int i=0;i<3;i++){
+ for (int i=0;i<3;i++){
Counter counter = new Counter();
Algorithms.untildo(new Offset(i),counter);
assertEquals(i,counter.count);
@@ -264,7 +264,7 @@
}
public void testWhileDo() {
- for(int i=0;i<3;i++){
+ for (int i=0;i<3;i++){
Counter counter = new Counter();
Algorithms.whiledo(new Limit(i),counter);
assertEquals(i,counter.count);
@@ -275,7 +275,7 @@
// this version will return a function. since it is not the same type
// as RecFunc recursion will end.
- Function func = (Function)Algorithms.recurse(new RecFunc(0, true));
+ Function func = (Function) Algorithms.recurse(new RecFunc(0, true));
assertEquals(new Integer(5), func.evaluate());
}
@@ -316,12 +316,12 @@
private UnaryPredicate equalsTwentyThree = LeftBoundPredicate.bind(IsEqual.instance(),new Integer(23));
private UnaryPredicate isEven = new UnaryPredicate() {
public boolean test(Object obj) {
- return ((Number)obj).intValue() % 2 == 0;
+ return ((Number) obj).intValue() % 2 == 0;
}
};
private UnaryPredicate isOdd = new UnaryPredicate() {
public boolean test(Object obj) {
- return ((Number)obj).intValue() % 2 != 0;
+ return ((Number) obj).intValue() % 2 != 0;
}
};
@@ -337,14 +337,14 @@
static class Summer implements UnaryProcedure {
public void run(Object that) {
- sum += ((Number)that).intValue();
+ sum += ((Number) that).intValue();
}
public int sum = 0;
}
static class Doubler implements UnaryFunction {
public Object evaluate(Object obj) {
- return new Integer(2*((Number)obj).intValue());
+ return new Integer(2*((Number) obj).intValue());
}
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestFilteredIterator.java Thu Apr 3 13:43:29 2008
@@ -59,9 +59,9 @@
super.setUp();
list = new ArrayList();
evens = new ArrayList();
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
list.add(new Integer(i));
- if(i%2 == 0) {
+ if (i%2 == 0) {
evens.add(new Integer(i));
}
}
@@ -177,7 +177,7 @@
testing.next();
testing.remove();
}
- for(Iterator iter = list.iterator(); iter.hasNext();) {
+ for (Iterator iter = list.iterator(); iter.hasNext();) {
assertTrue(! isEven.test(iter.next()) );
}
}
@@ -193,7 +193,7 @@
public void testRemoveWithoutHasNext() {
Iterator testing = new FilteredIterator(list.iterator(),Constant.truePredicate());
- for(int i=0,m = list.size();i<m;i++) {
+ for (int i=0,m = list.size();i<m;i++) {
testing.next();
testing.remove();
}
@@ -237,7 +237,7 @@
private List evens = null;
private UnaryPredicate isEven = new UnaryPredicate() {
public boolean test(Object obj) {
- return ((Number)obj).intValue() % 2 == 0;
+ return ((Number) obj).intValue() % 2 == 0;
}
};
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestSize.java Thu Apr 3 13:43:29 2008
@@ -73,7 +73,7 @@
{
List list = new ArrayList();
assertEquals(new Integer(0),Size.instance().evaluate(list));
- for(int i=0;i<2;i++) {
+ for (int i=0;i<2;i++) {
assertEquals(new Integer(i),Size.instance().evaluate(list));
list.add(new Integer(i));
assertEquals(new Integer(i+1),Size.instance().evaluate(list));
@@ -82,7 +82,7 @@
{
Set set = new HashSet();
assertEquals(new Integer(0),Size.instance().evaluate(set));
- for(int i=0;i<2;i++) {
+ for (int i=0;i<2;i++) {
assertEquals(new Integer(i),Size.instance().evaluate(set));
set.add(new Integer(i));
assertEquals(new Integer(i+1),Size.instance().evaluate(set));
@@ -124,7 +124,7 @@
assertObjectsAreEqual(f,Size.instance());
assertSame(Size.instance(),Size.instance());
assertObjectsAreNotEqual(f,new Constant(null));
- assertTrue(! f.equals((Size)null) );
+ assertTrue(! f.equals((Size) null) );
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java Thu Apr 3 13:43:29 2008
@@ -59,7 +59,7 @@
super.setUp();
list = new ArrayList();
negatives = new ArrayList();
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
list.add(new Integer(i));
negatives.add(new Integer(i*-1));
}
@@ -155,7 +155,7 @@
public void testRemoveWithoutHasNext() {
Iterator testing = new TransformedIterator(list.iterator(),negate);
- for(int i=0,m = list.size();i<m;i++) {
+ for (int i=0,m = list.size();i<m;i++) {
testing.next();
testing.remove();
}
@@ -199,7 +199,7 @@
private List negatives = null;
private UnaryFunction negate = new UnaryFunction() {
public Object evaluate(Object obj) {
- return new Integer(((Number)obj).intValue() * -1);
+ return new Integer(((Number) obj).intValue() * -1);
}
};
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestAnd.java Thu Apr 3 13:43:29 2008
@@ -69,14 +69,14 @@
And p = new And(new Constant(true));
assertTrue(p.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(true));
assertTrue(p.test());
}
And q = new And(new Constant(true));
assertTrue(q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test());
}
@@ -92,14 +92,14 @@
And p = new And(new Constant(false));
assertTrue(!p.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(false));
assertTrue(!p.test());
}
And q = new And(new Constant(true));
assertTrue(q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test());
}
@@ -112,7 +112,7 @@
Predicate p = new Constant(true);
And q = new And(p,p);
assertTrue(q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(p);
assertTrue(q.test());
}
@@ -124,7 +124,7 @@
And q = new And();
assertObjectsAreEqual(p,q);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.and(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.and(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryAnd.java Thu Apr 3 13:43:29 2008
@@ -69,14 +69,14 @@
BinaryAnd p = new BinaryAnd(new Constant(true));
assertTrue(p.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(true));
assertTrue(p.test("xyzzy",new Integer(3)));
}
BinaryAnd q = new BinaryAnd(new Constant(true));
assertTrue(q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test("xyzzy",new Integer(3)));
}
@@ -92,14 +92,14 @@
BinaryAnd p = new BinaryAnd(new Constant(false));
assertTrue(!p.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(false));
assertTrue(!p.test("xyzzy",new Integer(3)));
}
BinaryAnd q = new BinaryAnd(new Constant(true));
assertTrue(q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test("xyzzy",new Integer(3)));
}
@@ -112,7 +112,7 @@
BinaryPredicate p = new Constant(true);
BinaryAnd q = new BinaryAnd(p,p);
assertTrue(q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(p);
assertTrue(q.test("xyzzy",new Integer(3)));
}
@@ -126,7 +126,7 @@
BinaryOr r = new BinaryOr();
assertObjectsAreNotEqual(p,r);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.and(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.and(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinaryOr.java Thu Apr 3 13:43:29 2008
@@ -68,14 +68,14 @@
BinaryOr p = new BinaryOr(new Constant(true));
assertTrue(p.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(i%2==0));
assertTrue(p.test("xyzzy",new Integer(3)));
}
BinaryOr q = new BinaryOr(new Constant(true));
assertTrue(q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(i%2==0));
assertTrue(q.test("xyzzy",new Integer(3)));
}
@@ -92,14 +92,14 @@
BinaryOr p = new BinaryOr(new Constant(false));
assertTrue(!p.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(false));
assertTrue(!p.test("xyzzy",new Integer(3)));
}
BinaryOr q = new BinaryOr(new Constant(false));
assertTrue(!q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(false));
assertTrue(!q.test("xyzzy",new Integer(3)));
}
@@ -112,7 +112,7 @@
BinaryPredicate p = new Constant(true);
BinaryOr q = new BinaryOr(p,p);
assertTrue(q.test("xyzzy",new Integer(3)));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(p);
assertTrue(q.test("xyzzy",new Integer(3)));
}
@@ -128,7 +128,7 @@
BinaryAnd r = new BinaryAnd();
assertObjectsAreNotEqual(p,r);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.or(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.or(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestBinarySequence.java Thu Apr 3 13:43:29 2008
@@ -97,12 +97,12 @@
List list = new ArrayList();
BinarySequence seq = new BinarySequence();
seq.run(null,null);
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
RunCounter counter = new RunCounter();
seq.then(counter);
list.add(counter);
seq.run("xyzzy","xyzzy");
- for(int j=0;j<list.size();j++) {
+ for (int j=0;j<list.size();j++) {
assertEquals(list.size()-j,(((RunCounter)(list.get(j))).count));
}
}
@@ -114,7 +114,7 @@
BinarySequence q = new BinarySequence();
assertObjectsAreEqual(p,q);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.then(new NoOp());
assertObjectsAreNotEqual(p,q);
q.then(new NoOp());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryFunction.java Thu Apr 3 13:43:29 2008
@@ -76,11 +76,11 @@
public void testOf() throws Exception {
CompositeUnaryFunction f = new CompositeUnaryFunction();
assertNull(f.evaluate(null));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
f.of(new UnaryFunction() {
public Object evaluate(Object obj) {
- if(obj instanceof Integer) {
- return new Integer((((Integer)obj).intValue())+1);
+ if (obj instanceof Integer) {
+ return new Integer((((Integer) obj).intValue())+1);
} else {
return new Integer(1);
}
@@ -96,7 +96,7 @@
CompositeUnaryFunction g = new CompositeUnaryFunction();
assertObjectsAreEqual(f,g);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
f.of(new Constant("x"));
assertObjectsAreNotEqual(f,g);
g.of(new Constant("x"));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryPredicate.java Thu Apr 3 13:43:29 2008
@@ -91,7 +91,7 @@
public void testOf() throws Exception {
CompositeUnaryPredicate f = new CompositeUnaryPredicate(new Constant(true));
assertTrue(f.test(null));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
f.of(new Constant(false));
assertEquals(true,f.test(null));
}
@@ -103,7 +103,7 @@
CompositeUnaryPredicate g = new CompositeUnaryPredicate(new Constant(true));
assertObjectsAreEqual(f,g);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
f.of(new Constant("x"));
assertObjectsAreNotEqual(f,g);
g.of(new Constant("x"));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestCompositeUnaryProcedure.java Thu Apr 3 13:43:29 2008
@@ -96,7 +96,7 @@
CompositeUnaryProcedure g = new CompositeUnaryProcedure(new NoOp());
assertObjectsAreEqual(f,g);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
f.of(new Constant("x"));
assertObjectsAreNotEqual(f,g);
g.of(new Constant("x"));
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestOr.java Thu Apr 3 13:43:29 2008
@@ -68,14 +68,14 @@
Or p = new Or(new Constant(true));
assertTrue(p.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(i%2==0));
assertTrue(p.test());
}
Or q = new Or(new Constant(true));
assertTrue(q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(i%2==0));
assertTrue(q.test());
}
@@ -92,14 +92,14 @@
Or p = new Or(new Constant(false));
assertTrue(!p.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(false));
assertTrue(!p.test());
}
Or q = new Or(new Constant(false));
assertTrue(!q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(false));
assertTrue(!q.test());
}
@@ -112,7 +112,7 @@
Predicate p = new Constant(true);
Or q = new Or(p,p);
assertTrue(q.test());
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(p);
assertTrue(q.test());
}
@@ -128,7 +128,7 @@
And r = new And();
assertObjectsAreNotEqual(p,r);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.or(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.or(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestSequence.java Thu Apr 3 13:43:29 2008
@@ -91,12 +91,12 @@
List list = new ArrayList();
Sequence seq = new Sequence();
seq.run();
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
RunCounter counter = new RunCounter();
seq.then(counter);
list.add(counter);
seq.run();
- for(int j=0;j<list.size();j++) {
+ for (int j=0;j<list.size();j++) {
assertEquals(list.size()-j,(((RunCounter)(list.get(j))).count));
}
}
@@ -108,7 +108,7 @@
Sequence q = new Sequence();
assertObjectsAreEqual(p,q);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.then(new NoOp());
assertObjectsAreNotEqual(p,q);
q.then(new NoOp());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestTransposedProcedure.java Thu Apr 3 13:43:29 2008
@@ -94,7 +94,7 @@
static class LeftNotNullCounter implements BinaryProcedure {
public void run(Object a, Object b) {
- if(null != a) {
+ if (null != a) {
count++;
}
}
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryAnd.java Thu Apr 3 13:43:29 2008
@@ -69,14 +69,14 @@
UnaryAnd p = new UnaryAnd(new Constant(true));
assertTrue(p.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(true));
assertTrue(p.test("xyzzy"));
}
UnaryAnd q = new UnaryAnd(new Constant(true));
assertTrue(q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test("xyzzy"));
}
@@ -92,14 +92,14 @@
UnaryAnd p = new UnaryAnd(new Constant(false));
assertTrue(!p.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.and(new Constant(false));
assertTrue(!p.test("xyzzy"));
}
UnaryAnd q = new UnaryAnd(new Constant(true));
assertTrue(q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(new Constant(true));
assertTrue(q.test("xyzzy"));
}
@@ -112,7 +112,7 @@
UnaryPredicate p = new Constant(true);
UnaryAnd q = new UnaryAnd(p,p);
assertTrue(q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.and(p);
assertTrue(q.test("xyzzy"));
}
@@ -124,7 +124,7 @@
UnaryAnd q = new UnaryAnd();
assertObjectsAreEqual(p,q);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.and(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.and(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnaryOr.java Thu Apr 3 13:43:29 2008
@@ -68,14 +68,14 @@
UnaryOr p = new UnaryOr(new Constant(true));
assertTrue(p.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(i%2==0));
assertTrue(p.test("xyzzy"));
}
UnaryOr q = new UnaryOr(new Constant(true));
assertTrue(q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(i%2==0));
assertTrue(q.test("xyzzy"));
}
@@ -92,14 +92,14 @@
UnaryOr p = new UnaryOr(new Constant(false));
assertTrue(!p.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
p.or(new Constant(false));
assertTrue(!p.test("xyzzy"));
}
UnaryOr q = new UnaryOr(new Constant(false));
assertTrue(!q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(new Constant(false));
assertTrue(!q.test("xyzzy"));
}
@@ -112,7 +112,7 @@
UnaryPredicate p = new Constant(true);
UnaryOr q = new UnaryOr(p,p);
assertTrue(q.test("xyzzy"));
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
q.or(p);
assertTrue(q.test("xyzzy"));
}
@@ -128,7 +128,7 @@
UnaryAnd r = new UnaryAnd();
assertObjectsAreNotEqual(p,r);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.or(Constant.truePredicate());
assertObjectsAreNotEqual(p,q);
q.or(Constant.truePredicate());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/composite/TestUnarySequence.java Thu Apr 3 13:43:29 2008
@@ -97,12 +97,12 @@
List list = new ArrayList();
UnarySequence seq = new UnarySequence();
seq.run(null);
- for(int i=0;i<10;i++) {
+ for (int i=0;i<10;i++) {
RunCounter counter = new RunCounter();
seq.then(counter);
list.add(counter);
seq.run("xyzzy");
- for(int j=0;j<list.size();j++) {
+ for (int j=0;j<list.size();j++) {
assertEquals(list.size()-j,(((RunCounter)(list.get(j))).count));
}
}
@@ -114,7 +114,7 @@
UnarySequence q = new UnarySequence();
assertObjectsAreEqual(p,q);
- for(int i=0;i<3;i++) {
+ for (int i=0;i<3;i++) {
p.then(new NoOp());
assertObjectsAreNotEqual(p,q);
q.then(new NoOp());
Modified: commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java?rev=644480&r1=644479&r2=644480&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java (original)
+++ commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java Thu Apr 3 13:43:29 2008
@@ -487,10 +487,10 @@
new BinaryFunction() {
public Object evaluate(Object oldval, Object newval) {
List list = null;
- if(null == oldval) {
+ if (null == oldval) {
list = new ArrayList();
} else {
- list = (List)oldval;
+ list = (List) oldval;
}
list.add(newval);
return list;
@@ -512,10 +512,10 @@
new BinaryFunction() {
public Object evaluate(Object oldval, Object newval) {
StringBuffer buf = null;
- if(null == oldval) {
+ if (null == oldval) {
buf = new StringBuffer();
} else {
- buf = (StringBuffer)oldval;
+ buf = (StringBuffer) oldval;
buf.append(", ");
}
buf.append(newval);
@@ -528,10 +528,10 @@
*/
new BinaryFunction() {
public Object evaluate(Object key, Object val) {
- if(null == val) {
+ if (null == val) {
return null;
} else {
- return ((StringBuffer)val).toString();
+ return ((StringBuffer) val).toString();
}
}
}