You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/08/10 21:44:56 UTC
svn commit: r1156337 - in
/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor:
adapter/ core/ core/algorithm/ core/composite/
Author: simonetripodi
Date: Wed Aug 10 19:44:54 2011
New Revision: 1156337
URL: http://svn.apache.org/viewvc?rev=1156337&view=rev
Log:
fixed checkstyle violation: Line is longer than 120 characters
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
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/Composite.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
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/ConditionalBinaryPredicate.java
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/ConditionalUnaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java Wed Aug 10 19:44:54 2011
@@ -69,8 +69,8 @@ public final class BinaryProcedureBinary
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof BinaryProcedureBinaryFunction<?, ?, ?> && equals((BinaryProcedureBinaryFunction<?, ?, ?>) that));
+ return that == this || (that instanceof BinaryProcedureBinaryFunction<?, ?, ?>
+ && equals((BinaryProcedureBinaryFunction<?, ?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java Wed Aug 10 19:44:54 2011
@@ -68,7 +68,8 @@ public final class IgnoreRightFunction<L
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightFunction<?, ?, ?> && equals((IgnoreRightFunction<?, ?, ?>) that));
+ return that == this || (that instanceof IgnoreRightFunction<?, ?, ?>
+ && equals((IgnoreRightFunction<?, ?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java Wed Aug 10 19:44:54 2011
@@ -68,7 +68,8 @@ public final class IgnoreRightPredicate<
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightPredicate<?, ?> && equals((IgnoreRightPredicate<?, ?>) that));
+ return that == this || (that instanceof IgnoreRightPredicate<?, ?>
+ && equals((IgnoreRightPredicate<?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java Wed Aug 10 19:44:54 2011
@@ -68,7 +68,8 @@ public final class IgnoreRightProcedure<
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightProcedure<?, ?> && equals((IgnoreRightProcedure<?, ?>) that));
+ return that == this || (that instanceof IgnoreRightProcedure<?, ?>
+ && equals((IgnoreRightProcedure<?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java Wed Aug 10 19:44:54 2011
@@ -68,7 +68,8 @@ public final class PredicateUnaryPredica
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof PredicateUnaryPredicate<?> && equals((PredicateUnaryPredicate<?>) that));
+ return that == this || (that instanceof PredicateUnaryPredicate<?>
+ && equals((PredicateUnaryPredicate<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java Wed Aug 10 19:44:54 2011
@@ -68,7 +68,8 @@ public final class ProcedureUnaryProcedu
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof ProcedureUnaryProcedure<?> && equals((ProcedureUnaryProcedure<?>) that));
+ return that == this || (that instanceof ProcedureUnaryProcedure<?>
+ && equals((ProcedureUnaryProcedure<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java Wed Aug 10 19:44:54 2011
@@ -115,7 +115,8 @@ public final class RightBoundFunction<A,
* @param arg Object that will always be used for the right side of the BinaryFunction delegate.
* @return RightBoundFunction
*/
- public static <L, R, T> RightBoundFunction<L, T> bind(BinaryFunction<? super L, ? super R, ? extends T> function, R arg) {
+ public static <L, R, T> RightBoundFunction<L, T> bind(BinaryFunction<? super L, ? super R, ? extends T> function,
+ R arg) {
return null == function ? null : new RightBoundFunction<L, T>(function, arg);
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java Wed Aug 10 19:44:54 2011
@@ -69,8 +69,8 @@ public final class UnaryProcedureUnaryFu
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof UnaryProcedureUnaryFunction<?, ?> && equals((UnaryProcedureUnaryFunction<?, ?>) that));
+ return that == this || (that instanceof UnaryProcedureUnaryFunction<?, ?>
+ && equals((UnaryProcedureUnaryFunction<?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/RightIdentity.java Wed Aug 10 19:44:54 2011
@@ -41,7 +41,8 @@ public final class RightIdentity {
/**
* Right-identity predicate.
*/
- public static final BinaryPredicate<Object, Boolean> PREDICATE = BinaryFunctionBinaryPredicate.adapt(IgnoreLeftFunction.adapt(new Identity<Boolean>()));
+ public static final BinaryPredicate<Object, Boolean> PREDICATE =
+ BinaryFunctionBinaryPredicate.adapt(IgnoreLeftFunction.adapt(new Identity<Boolean>()));
// constructor
// ------------------------------------------------------------------------
@@ -70,6 +71,7 @@ public final class RightIdentity {
* @return BinaryPredicate<L, Boolean>
*/
public static <L> BinaryPredicate<L, Boolean> predicate() {
- return BinaryFunctionBinaryPredicate.adapt(IgnoreLeftFunction.<L, Boolean, Boolean>adapt(new Identity<Boolean>()));
+ return BinaryFunctionBinaryPredicate.adapt(
+ IgnoreLeftFunction.<L, Boolean, Boolean>adapt(new Identity<Boolean>()));
}
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java Wed Aug 10 19:44:54 2011
@@ -29,7 +29,8 @@ import org.apache.commons.functor.genera
*
* @version $Revision$ $Date$
*/
-public final class FindWithinGenerator<E> implements BinaryFunction<Generator<? extends E>, UnaryPredicate<? super E>, E>, Serializable {
+public final class FindWithinGenerator<E>
+ implements BinaryFunction<Generator<? extends E>, UnaryPredicate<? super E>, E>, Serializable {
/**
* serialVersionUID declaration.
*/
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/InPlaceTransform.java Wed Aug 10 19:44:54 2011
@@ -27,7 +27,8 @@ import org.apache.commons.functor.UnaryF
*
* @version $Revision$ $Date$
*/
-public final class InPlaceTransform<T> implements BinaryProcedure<ListIterator<T>, UnaryFunction<? super T, ? extends T>>, Serializable {
+public final class InPlaceTransform<T>
+ implements BinaryProcedure<ListIterator<T>, UnaryFunction<? super T, ? extends T>>, Serializable {
/**
* serialVersionUID declaration.
*/
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/IndexOfInGenerator.java Wed Aug 10 19:44:54 2011
@@ -28,7 +28,8 @@ import org.apache.commons.functor.genera
*
* @version $Revision$ $Date$
*/
-public final class IndexOfInGenerator<T> implements BinaryFunction<Generator<? extends T>, UnaryPredicate<? super T>, Number>, Serializable {
+public final class IndexOfInGenerator<T>
+ implements BinaryFunction<Generator<? extends T>, UnaryPredicate<? super T>, Number>, Serializable {
/**
* serialVersionUID declaration.
*/
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java Wed Aug 10 19:44:54 2011
@@ -27,7 +27,8 @@ import org.apache.commons.functor.UnaryP
*
* @version $Revision$ $Date$
*/
-public final class RemoveMatching<T> implements BinaryProcedure<Iterator<? extends T>, UnaryPredicate<? super T>>, Serializable {
+public final class RemoveMatching<T>
+ implements BinaryProcedure<Iterator<? extends T>, UnaryPredicate<? super T>>, Serializable {
/**
* serialVersionUID declaration.
*/
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java Wed Aug 10 19:44:54 2011
@@ -28,7 +28,8 @@ import org.apache.commons.functor.core.c
*
* @version $Revision$ $Date$
*/
-public final class RetainMatching<T> implements BinaryProcedure<Iterator<? extends T>, UnaryPredicate<? super T>>, Serializable {
+public final class RetainMatching<T>
+ implements BinaryProcedure<Iterator<? extends T>, UnaryPredicate<? super T>>, Serializable {
/**
* serialVersionUID declaration.
*/
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java Wed Aug 10 19:44:54 2011
@@ -44,7 +44,8 @@ abstract class BaseBinaryPredicateList<L
private static final long serialVersionUID = -8218822378485819939L;
// attributes
// ------------------------------------------------------------------------
- private final List<BinaryPredicate<? super L, ? super R>> list = new ArrayList<BinaryPredicate<? super L, ? super R>>();
+ private final List<BinaryPredicate<? super L, ? super R>> list =
+ new ArrayList<BinaryPredicate<? super L, ? super R>>();
// constructor
// ------------------------------------------------------------------------
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java Wed Aug 10 19:44:54 2011
@@ -51,7 +51,7 @@ public class BinaryCompositeBinaryFuncti
*/
private static class Helper<G, H, L, R, T> implements BinaryFunction<L, R, T>, Serializable {
/**
- *
+ * serialVersionUID declaration.
*/
private static final long serialVersionUID = 6013646799505641592L;
private BinaryFunction<? super G, ? super H, ? extends T> f;
@@ -65,7 +65,8 @@ public class BinaryCompositeBinaryFuncti
* @param h right preceding BinaryFunction
*/
public Helper(BinaryFunction<? super G, ? super H, ? extends T> f,
- BinaryFunction<? super L, ? super R, ? extends G> g, BinaryFunction<? super L, ? super R, ? extends H> h) {
+ BinaryFunction<? super L, ? super R, ? extends G> g,
+ BinaryFunction<? super L, ? super R, ? extends H> h) {
this.f = f;
this.g = g;
this.h = h;
@@ -110,8 +111,8 @@ public class BinaryCompositeBinaryFuncti
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof BinaryCompositeBinaryFunction<?, ?, ?> && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that));
+ return that == this || (that instanceof BinaryCompositeBinaryFunction<?, ?, ?>
+ && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -48,7 +48,8 @@ public class BinarySequence<L, R> implem
private static final long serialVersionUID = 1371075584406178258L;
// attributes
// ------------------------------------------------------------------------
- private final List<BinaryProcedure<? super L, ? super R>> list = new ArrayList<BinaryProcedure<? super L, ? super R>>();
+ private final List<BinaryProcedure<? super L, ? super R>> list =
+ new ArrayList<BinaryProcedure<? super L, ? super R>>();
// constructor
// ------------------------------------------------------------------------
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java Wed Aug 10 19:44:54 2011
@@ -108,7 +108,8 @@ public final class Composite {
* @param g UnaryFunction to apply first
* @return UnaryFunction
*/
- public static final <A, X, T> CompositeUnaryFunction<A, T> function(UnaryFunction<? super X, ? extends T> f, UnaryFunction<? super A, ? extends X> g) {
+ public static final <A, X, T> CompositeUnaryFunction<A, T> function(UnaryFunction<? super X, ? extends T> f,
+ UnaryFunction<? super A, ? extends X> g) {
return new CompositeUnaryFunction<X, T>(f).of(g);
}
@@ -122,7 +123,9 @@ public final class Composite {
// * @param g BinaryFunction to apply first
// * @return BinaryFunction<L, R, T>
// */
-// public static final <L, R, X, T> BinaryFunction<L, R, T> function(UnaryFunction<? super X, ? extends T> f, BinaryFunction<? super L, ? super R, ? extends X> g) {
+// public static final <L, R, X, T> BinaryFunction<L, R, T> function(UnaryFunction<? super X, ? extends T> f,
+// BinaryFunction<? super L,
+// ? super R, ? extends X> g) {
// return new CompositeUnaryFunction<X, T>(f).of(g);
// }
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -63,7 +63,7 @@ public class CompositeUnaryFunction<A, T
*/
private static class Helper<X, A, T> implements UnaryFunction<A, T>, Serializable {
/**
- *
+ * serialVersionUID declaration.
*/
private static final long serialVersionUID = 8167255331321876718L;
private UnaryFunction<? super X, ? extends T> following;
@@ -74,7 +74,8 @@ public class CompositeUnaryFunction<A, T
* @param following UnaryFunction<X, Y>
* @param preceding UnaryFunction<Y, Z>
*/
- public Helper(UnaryFunction<? super X, ? extends T> following, UnaryFunction<? super A, ? extends X> preceding) {
+ public Helper(UnaryFunction<? super X, ? extends T> following,
+ UnaryFunction<? super A, ? extends X> preceding) {
this.following = following;
this.preceding = preceding;
}
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -99,7 +99,8 @@ public final class CompositeUnaryPredica
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof CompositeUnaryPredicate<?> && equals((CompositeUnaryPredicate<?>) that));
+ return that == this || (that instanceof CompositeUnaryPredicate<?>
+ && equals((CompositeUnaryPredicate<?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -95,7 +95,8 @@ public final class CompositeUnaryProcedu
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof CompositeUnaryProcedure<?> && equals((CompositeUnaryProcedure<?>) that));
+ return that == this || (that instanceof CompositeUnaryProcedure<?>
+ && equals((CompositeUnaryProcedure<?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -91,7 +91,8 @@ public final class ConditionalBinaryFunc
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof ConditionalBinaryFunction<?, ?, ?> && equals((ConditionalBinaryFunction<?, ?, ?>) that));
+ return that == this || (that instanceof ConditionalBinaryFunction<?, ?, ?>
+ && equals((ConditionalBinaryFunction<?, ?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -82,8 +82,8 @@ public final class ConditionalBinaryPred
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof ConditionalBinaryPredicate<?, ?> && equals((ConditionalBinaryPredicate<?, ?>) that));
+ return that == this || (that instanceof ConditionalBinaryPredicate<?, ?>
+ && equals((ConditionalBinaryPredicate<?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Aug 10 19:44:54 2011
@@ -103,8 +103,8 @@ public final class ConditionalBinaryProc
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof ConditionalBinaryProcedure<?, ?> && equals((ConditionalBinaryProcedure<?, ?>) that));
+ return that == this || (that instanceof ConditionalBinaryProcedure<?, ?>
+ && equals((ConditionalBinaryProcedure<?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -90,7 +90,8 @@ public final class ConditionalUnaryFunct
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof ConditionalUnaryFunction<?, ?> && equals((ConditionalUnaryFunction<?, ?>) that));
+ return that == this || (that instanceof ConditionalUnaryFunction<?, ?>
+ && equals((ConditionalUnaryFunction<?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -82,7 +82,8 @@ public final class ConditionalUnaryPredi
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof ConditionalUnaryPredicate<?> && equals((ConditionalUnaryPredicate<?>) that));
+ return that == this || (that instanceof ConditionalUnaryPredicate<?>
+ && equals((ConditionalUnaryPredicate<?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Aug 10 19:44:54 2011
@@ -69,7 +69,9 @@ public final class ConditionalUnaryProce
* @param thenProc then
* @param elseProc else
*/
- public ConditionalUnaryProcedure(UnaryPredicate<? super A> ifPred, UnaryProcedure<? super A> thenProc, UnaryProcedure<? super A> elseProc) {
+ public ConditionalUnaryProcedure(UnaryPredicate<? super A> ifPred,
+ UnaryProcedure<? super A> thenProc,
+ UnaryProcedure<? super A> elseProc) {
if (ifPred == null) {
throw new IllegalArgumentException("UnaryPredicate argument was null");
}
@@ -98,7 +100,8 @@ public final class ConditionalUnaryProce
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof ConditionalUnaryProcedure<?> && equals((ConditionalUnaryProcedure<?>) that));
+ return that == this || (that instanceof ConditionalUnaryProcedure<?>
+ && equals((ConditionalUnaryProcedure<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java Wed Aug 10 19:44:54 2011
@@ -49,7 +49,8 @@ public class TransformedBinaryFunction<L
* @param preceding BinaryFunction
* @param following UnaryFunction
*/
- private Helper(BinaryFunction<? super L, ? super R, ? extends X> preceding, UnaryFunction<? super X, ? extends T> following) {
+ private Helper(BinaryFunction<? super L, ? super R, ? extends X> preceding,
+ UnaryFunction<? super X, ? extends T> following) {
this.preceding = preceding;
this.following = following;
}
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java?rev=1156337&r1=1156336&r2=1156337&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java Wed Aug 10 19:44:54 2011
@@ -50,7 +50,8 @@ public class TransformedBinaryProcedure<
* @param function BinaryFunction
* @param procedure UnaryFunction
*/
- private Helper(BinaryFunction<? super L, ? super R, ? extends X> function, UnaryProcedure<? super X> procedure) {
+ private Helper(BinaryFunction<? super L, ? super R, ? extends X> function,
+ UnaryProcedure<? super X> procedure) {
this.function = function;
this.procedure = procedure;
}
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -74,7 +74,8 @@ public class TransposedFunction<L, R, T>
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof TransposedFunction<?, ?, ?> && equals((TransposedFunction<?, ?, ?>) that));
+ return that == this || (that instanceof TransposedFunction<?, ?, ?>
+ && equals((TransposedFunction<?, ?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -109,8 +109,8 @@ public class UnaryCompositeBinaryFunctio
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof UnaryCompositeBinaryFunction<?, ?, ?> && equals((UnaryCompositeBinaryFunction<?, ?, ?>) that));
+ return that == this || (that instanceof UnaryCompositeBinaryFunction<?, ?, ?>
+ && equals((UnaryCompositeBinaryFunction<?, ?, ?>) that));
}
/**
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=1156337&r1=1156336&r2=1156337&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 Wed Aug 10 19:44:54 2011
@@ -110,8 +110,8 @@ public class UnaryCompositeBinaryPredica
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this
- || (that instanceof UnaryCompositeBinaryPredicate<?, ?> && equals((UnaryCompositeBinaryPredicate<?, ?>) that));
+ return that == this || (that instanceof UnaryCompositeBinaryPredicate<?, ?>
+ && equals((UnaryCompositeBinaryPredicate<?, ?>) that));
}
/**