svn commit: r661062 - in /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite: ConditionalBinaryProcedure.java ConditionalProcedure.java ConditionalUnaryProcedure.java

[mbenson]

Author: mbenson
Date: Wed May 28 12:58:51 2008
New Revision: 661062

URL: http://svn.apache.org/viewvc?rev=661062&view=rev
Log:
add constructor

Modified:
    
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
    
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java
    
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java

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=661062&r1=661061&r2=661062&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
 Wed May 28 12:58:51 2008
@@ -20,6 +20,7 @@
 
 import org.apache.commons.functor.BinaryPredicate;
 import org.apache.commons.functor.BinaryProcedure;
+import org.apache.commons.functor.core.NoOp;
 
 /**
  * A [EMAIL PROTECTED] BinaryProcedure BinaryProcedure}
@@ -54,13 +55,22 @@
     /**
      * Create a new ConditionalBinaryProcedure.
      * @param ifPred to evaluate
-     * @param thenPred if <code>ifPred</code> yields <code>true</code>
-     * @param elsePred if <code>ifPred</code> yields <code>false</code>
+     * @param thenProc if <code>ifPred</code> yields <code>true</code>
      */
-    public ConditionalBinaryProcedure(BinaryPredicate ifPred, BinaryProcedure 
thenPred, BinaryProcedure elsePred) {
+    public ConditionalBinaryProcedure(BinaryPredicate ifPred, BinaryProcedure 
thenProc) {
+        this(ifPred, thenProc, NoOp.instance());
+    }
+    
+    /**
+     * Create a new ConditionalBinaryProcedure.
+     * @param ifPred to evaluate
+     * @param thenProc if <code>ifPred</code> yields <code>true</code>
+     * @param elseProc if <code>ifPred</code> yields <code>false</code>
+     */
+    public ConditionalBinaryProcedure(BinaryPredicate ifPred, BinaryProcedure 
thenProc, BinaryProcedure elseProc) {
         this.ifPred = ifPred;
-        this.thenProc = thenPred;
-        this.elseProc = elsePred;
+        this.thenProc = thenProc;
+        this.elseProc = elseProc;
     }
 
     // predicate interface

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=661062&r1=661061&r2=661062&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
 Wed May 28 12:58:51 2008
@@ -20,6 +20,7 @@
 
 import org.apache.commons.functor.Predicate;
 import org.apache.commons.functor.Procedure;
+import org.apache.commons.functor.core.NoOp;
 
 /**
  * A [EMAIL PROTECTED] Procedure Procedure}
@@ -53,6 +54,15 @@
      * Create a new ConditionalProcedure.
      * @param ifPred if
      * @param thenProc then
+     */
+    public ConditionalProcedure(Predicate ifPred, Procedure thenProc) {
+        this(ifPred, thenProc, NoOp.instance());
+    }
+
+    /**
+     * Create a new ConditionalProcedure.
+     * @param ifPred if
+     * @param thenProc then
      * @param elseProc else
      */
     public ConditionalProcedure(Predicate ifPred, Procedure thenProc, 
Procedure elseProc) {

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=661062&r1=661061&r2=661062&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
 Wed May 28 12:58:51 2008
@@ -20,6 +20,7 @@
 
 import org.apache.commons.functor.UnaryPredicate;
 import org.apache.commons.functor.UnaryProcedure;
+import org.apache.commons.functor.core.NoOp;
 
 /**
  * A [EMAIL PROTECTED] UnaryProcedure UnaryProcedure}
@@ -53,6 +54,15 @@
      * Create a new ConditionalUnaryProcedure.
      * @param ifPred if
      * @param thenProc then
+     */
+    public ConditionalUnaryProcedure(UnaryPredicate ifPred, UnaryProcedure 
thenProc) {
+       this(ifPred, thenProc, NoOp.instance());
+       }
+
+    /**
+     * Create a new ConditionalUnaryProcedure.
+     * @param ifPred if
+     * @param thenProc then
      * @param elseProc else
      */
     public ConditionalUnaryProcedure(UnaryPredicate ifPred, UnaryProcedure 
thenProc, UnaryProcedure elseProc) {