Author: mbenson
Date: Mon Apr 25 16:42:38 2011
New Revision: 1096511
URL: http://svn.apache.org/viewvc?rev=1096511&view=rev
Log:
replace one/two arg constructors of *Sequence with varargs/Iterable variants
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java
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=1096511&r1=1096510&r2=1096511&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
Mon Apr 25 16:42:38 2011
@@ -52,24 +52,35 @@ public class BinarySequence<L, R> implem
* Create a new BinarySequence.
*/
public BinarySequence() {
+ super();
}
/**
- * Create a new BinarySequence.
- * @param p BinaryProcedure to add
+ * Create a new BinarySequence instance.
+ *
+ * @param procedures to run sequentially
*/
- public BinarySequence(BinaryProcedure<? super L, ? super R> p) {
- then(p);
+ public BinarySequence(BinaryProcedure<? super L, ? super R>... procedures)
{
+ this();
+ if (procedures != null) {
+ for (BinaryProcedure<? super L, ? super R> p : procedures) {
+ then(p);
+ }
+ }
}
/**
- * Create a new BinarySequence.
- * @param p BinaryProcedure to add
- * @param q BinaryProcedure to add
- */
- public BinarySequence(BinaryProcedure<? super L, ? super R> p,
BinaryProcedure<? super L, ? super R> q) {
- then(p);
- then(q);
+ * Create a new BinarySequence instance.
+ *
+ * @param procedures to run sequentially
+ */
+ public BinarySequence(Iterable<BinaryProcedure<? super L, ? super R>>
procedures) {
+ this();
+ if (procedures != null) {
+ for (BinaryProcedure<? super L, ? super R> p : procedures) {
+ then(p);
+ }
+ }
}
/**
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=1096511&r1=1096510&r2=1096511&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
Mon Apr 25 16:42:38 2011
@@ -52,24 +52,35 @@ public class Sequence implements Procedu
* Create a new Sequence.
*/
public Sequence() {
+ super();
}
/**
- * Create a new Sequence.
- * @param p Procedure to add
+ * Create a new Sequence instance.
+ *
+ * @param procedures to run sequentially
*/
- public Sequence(Procedure p) {
- then(p);
+ public Sequence(Procedure... procedures) {
+ this();
+ if (procedures != null) {
+ for (Procedure p : procedures) {
+ then(p);
+ }
+ }
}
/**
- * Create a new Sequence.
- * @param p Procedure to add
- * @param q Procedure to add
- */
- public Sequence(Procedure p, Procedure q) {
- then(p);
- then(q);
+ * Create a new Sequence instance.
+ *
+ * @param procedures to run sequentially
+ */
+ public Sequence(Iterable<Procedure> procedures) {
+ this();
+ if (procedures != null) {
+ for (Procedure p : procedures) {
+ then(p);
+ }
+ }
}
// modifiers
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=1096511&r1=1096510&r2=1096511&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
Mon Apr 25 16:42:38 2011
@@ -52,24 +52,35 @@ public class UnarySequence<A> implements
* Create a new UnarySequence.
*/
public UnarySequence() {
+ super();
}
/**
- * Create a new UnarySequence.
- * @param p UnaryProcedure to add
+ * Create a new UnarySequence instance.
+ *
+ * @param procedures to run sequentially
*/
- public UnarySequence(UnaryProcedure<? super A> p) {
- then(p);
+ public UnarySequence(UnaryProcedure<? super A>... procedures) {
+ this();
+ if (procedures != null) {
+ for (UnaryProcedure<? super A> p : procedures) {
+ then(p);
+ }
+ }
}
/**
- * Create a new UnarySequence.
- * @param p UnaryProcedure to add
- * @param q UnaryProcedure to add
- */
- public UnarySequence(UnaryProcedure<? super A> p, UnaryProcedure<? super
A> q) {
- then(p);
- then(q);
+ * Create a new UnarySequence instance.
+ *
+ * @param procedures to run sequentially
+ */
+ public UnarySequence(Iterable<UnaryProcedure<? super A>> procedures) {
+ this();
+ if (procedures != null) {
+ for (UnaryProcedure<? super A> p : procedures) {
+ then(p);
+ }
+ }
}
// modifiers
