Author: niallp
Date: Sat Jan 17 16:23:41 2009
New Revision: 735363
URL: http://svn.apache.org/viewvc?rev=735363&view=rev
Log:
Fix SANDBOX-275 - Functor doesn't compile under JDK 1.6
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java
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=735363&r1=735362&r2=735363&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
Sat Jan 17 16:23:41 2009
@@ -76,7 +76,11 @@
* {...@inheritdoc}
*/
public T evaluate(L left, R right) {
- return ifPred.test(left, right) ? thenFunc.evaluate(left, right) :
elseFunc.evaluate(left, right);
+ if (ifPred.test(left, right)) {
+ return thenFunc.evaluate(left, right);
+ } else {
+ return elseFunc.evaluate(left, right);
+ }
}
/**
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=735363&r1=735362&r2=735363&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
Sat Jan 17 16:23:41 2009
@@ -74,7 +74,11 @@
* {...@inheritdoc}
*/
public T evaluate() {
- return ifPred.test() ? thenFunc.evaluate() : elseFunc.evaluate();
+ if (ifPred.test()) {
+ return thenFunc.evaluate();
+ } else {
+ return elseFunc.evaluate();
+ }
}
/**
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=735363&r1=735362&r2=735363&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
Sat Jan 17 16:23:41 2009
@@ -75,7 +75,11 @@
* {...@inheritdoc}
*/
public T evaluate(A obj) {
- return ifPred.test(obj) ? thenFunc.evaluate(obj) :
elseFunc.evaluate(obj);
+ if (ifPred.test(obj)) {
+ return thenFunc.evaluate(obj);
+ } else {
+ return elseFunc.evaluate(obj);
+ }
}
/**
