You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2013/10/26 19:55:29 UTC
svn commit: r1536009 [1/2] - in
/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor:
adapter/ core/ core/comparator/ core/composite/
Author: kinow
Date: Sat Oct 26 17:55:27 2013
New Revision: 1536009
URL: http://svn.apache.org/r1536009
Log:
FUNCTOR-11 Reduce API clutter by removing extra equals methods
Modified:
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicatePredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/And.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/CompositeBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/CompositeBinaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/CompositeFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/CompositePredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/CompositeProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalNullaryPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalNullaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/Not.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/NullaryAnd.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/NullaryNot.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/NullaryOr.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/NullarySequence.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/Or.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransformedNullaryFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransformedNullaryProcedure.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java
commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java Sat Oct 26 17:55:27 2013
@@ -69,19 +69,15 @@ public final class BinaryFunctionBinaryP
* {@inheritDoc}
*/
@Override
- public boolean equals(final Object that) {
- return that == this
- || (that instanceof BinaryFunctionBinaryPredicate<?, ?>
- && equals((BinaryFunctionBinaryPredicate<?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryFunctionBinaryPredicate is equal to this.
- * @param that BinaryFunctionBinaryPredicate to test
- * @return boolean
- */
- public boolean equals(final BinaryFunctionBinaryPredicate<?, ?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryFunctionBinaryPredicate<?, ?>)) {
+ return false;
+ }
+ BinaryFunctionBinaryPredicate<?, ?> that = (BinaryFunctionBinaryPredicate<?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java Sat Oct 26 17:55:27 2013
@@ -70,19 +70,15 @@ public final class BinaryFunctionBinaryP
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this
- || (that instanceof BinaryFunctionBinaryProcedure<?, ?>
- && equals((BinaryFunctionBinaryProcedure<?, ?>) that));
- }
-
- /**
- * Learn whether a given BinaryFunctionBinaryPredicate is equal to this.
- * @param that BinaryFunctionBinaryPredicate to compare
- * @return boolean
- */
- public boolean equals(BinaryFunctionBinaryProcedure<?, ?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryFunctionBinaryProcedure<?, ?>)) {
+ return false;
+ }
+ BinaryFunctionBinaryProcedure<?, ?> that = (BinaryFunctionBinaryProcedure<?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionFunction.java Sat Oct 26 17:55:27 2013
@@ -53,17 +53,14 @@ public final class BinaryFunctionFunctio
*/
@Override
public boolean equals(Object obj) {
- return obj == this || obj instanceof BinaryFunctionFunction<?, ?>
- && equals((BinaryFunctionFunction<?, ?>) obj);
- }
-
- /**
- * Learn whether another BinaryFunctionFunction is equal to <code>this</code>.
- * @param that BinaryFunctionFunction to check
- * @return whether equal
- */
- public boolean equals(BinaryFunctionFunction<?, ?> that) {
- return that != null && that.function.equals(this.function);
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryFunctionFunction<?, ?>)) {
+ return false;
+ }
+ BinaryFunctionFunction<?, ?> that = (BinaryFunctionFunction<?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java Sat Oct 26 17:55:27 2013
@@ -70,19 +70,15 @@ public final class BinaryPredicateBinary
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this
- || (that instanceof BinaryPredicateBinaryFunction<?, ?>
- && equals((BinaryPredicateBinaryFunction<?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryPredicateBinaryFunction is equal to this.
- * @param that BinaryPredicateBinaryFunction to test
- * @return boolean
- */
- public boolean equals(BinaryPredicateBinaryFunction<?, ?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryPredicateBinaryFunction<?, ?>)) {
+ return false;
+ }
+ BinaryPredicateBinaryFunction<?, ?> that = (BinaryPredicateBinaryFunction<?, ?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicatePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicatePredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicatePredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryPredicatePredicate.java Sat Oct 26 17:55:27 2013
@@ -51,20 +51,14 @@ public final class BinaryPredicatePredic
*/
@Override
public boolean equals(Object obj) {
- return obj == this || obj instanceof BinaryPredicatePredicate<?>
- && equals((BinaryPredicatePredicate<?>) obj);
- }
-
- /**
- * Learn whether another BinaryPredicatePredicate is equal to
- * <code>this</code>.
- *
- * @param that BinaryPredicatePredicate to check
- *
- * @return whether equal
- */
- public boolean equals(BinaryPredicatePredicate<?> that) {
- return that != null && that.predicate.equals(this.predicate);
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryPredicatePredicate<?>)) {
+ return false;
+ }
+ BinaryPredicatePredicate<?> that = (BinaryPredicatePredicate<?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java Sat Oct 26 17:55:27 2013
@@ -69,18 +69,15 @@ public final class BinaryProcedureBinary
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BinaryProcedureBinaryFunction<?, ?, ?>
- && equals((BinaryProcedureBinaryFunction<?, ?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryProcedureBinaryFunction is equal to this.
- * @param that the BinaryProcedureBinaryFunction to test
- * @return boolean
- */
- public boolean equals(BinaryProcedureBinaryFunction<?, ?, ?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryProcedureBinaryFunction<?, ?, ?>)) {
+ return false;
+ }
+ BinaryProcedureBinaryFunction<?, ?, ?> that = (BinaryProcedureBinaryFunction<?, ?, ?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureProcedure.java Sat Oct 26 17:55:27 2013
@@ -51,20 +51,14 @@ public final class BinaryProcedureProced
*/
@Override
public boolean equals(Object obj) {
- return obj == this || obj instanceof BinaryProcedureProcedure<?>
- && equals((BinaryProcedureProcedure<?>) obj);
- }
-
- /**
- * Learn whether another BinaryProcedureProcedure is equal to
- * <code>this</code>.
- *
- * @param that BinaryProcedureProcedure to check
- *
- * @return whether equal
- */
- public boolean equals(BinaryProcedureProcedure<?> that) {
- return that != null && that.procedure.equals(this.procedure);
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryProcedureProcedure<?>)) {
+ return false;
+ }
+ BinaryProcedureProcedure<?> that = (BinaryProcedureProcedure<?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryFunction.java Sat Oct 26 17:55:27 2013
@@ -74,19 +74,14 @@ public final class BoundNullaryFunction<
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BoundNullaryFunction<?> && equals((BoundNullaryFunction<?>) that));
- }
-
- /**
- * Learn whether another BoundNullaryFunction is equal to this.
- * @param that BoundNullaryFunction to test
- * @return boolean
- */
- public boolean equals(BoundNullaryFunction<?> that) {
- if (that == null) {
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BoundNullaryFunction<?>)) {
return false;
}
+ BoundNullaryFunction<?> that = (BoundNullaryFunction<?>) obj;
if (!(that.function.equals(this.function))) {
return false;
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryPredicate.java Sat Oct 26 17:55:27 2013
@@ -73,20 +73,16 @@ public final class BoundNullaryPredicate
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BoundNullaryPredicate && equals((BoundNullaryPredicate) that));
- }
-
- /**
- * Learn whether another BoundNullaryPredicate is equal to this.
- * @param that BoundNullaryPredicate to test
- * @return boolean
- */
- public boolean equals(BoundNullaryPredicate that) {
- return null != that
- && predicate.equals(that.predicate)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BoundNullaryPredicate)) {
+ return false;
+ }
+ BoundNullaryPredicate that = (BoundNullaryPredicate) obj;
+ return predicate.equals(that.predicate)
&& (null == param ? null == that.param : param.equals(that.param));
-
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/BoundNullaryProcedure.java Sat Oct 26 17:55:27 2013
@@ -73,18 +73,15 @@ public final class BoundNullaryProcedure
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BoundNullaryProcedure && equals((BoundNullaryProcedure) that));
- }
-
- /**
- * Learn whether a given BoundNullaryProcedure is equal to this.
- * @param that the BoundNullaryProcedure to test
- * @return boolean
- */
- public boolean equals(BoundNullaryProcedure that) {
- return null != that
- && procedure.equals(that.procedure)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BoundNullaryProcedure)) {
+ return false;
+ }
+ BoundNullaryProcedure that = (BoundNullaryProcedure) obj;
+ return procedure.equals(that.procedure)
&& (null == param ? null == that.param : param.equals(that.param));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryFunction.java Sat Oct 26 17:55:27 2013
@@ -81,18 +81,15 @@ public final class FullyBoundNullaryFunc
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof FullyBoundNullaryFunction<?>
- && equals((FullyBoundNullaryFunction<?>) that));
- }
-
- /**
- * Learn whether another FullyBoundNullaryFunction is equal to this.
- * @param that FullyBoundNullaryFunction to test
- * @return boolean
- */
- public boolean equals(FullyBoundNullaryFunction<?> that) {
- return null != that && function.equals(that.function)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof FullyBoundNullaryFunction<?>)) {
+ return false;
+ }
+ FullyBoundNullaryFunction<?> that = (FullyBoundNullaryFunction<?>) obj;
+ return function.equals(that.function)
&& (null == left ? null == that.left : left.equals(that.left))
&& (null == right ? null == that.right : right.equals(that.right));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryPredicate.java Sat Oct 26 17:55:27 2013
@@ -79,18 +79,15 @@ public final class FullyBoundNullaryPred
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof FullyBoundNullaryPredicate
- && equals((FullyBoundNullaryPredicate) that));
- }
-
- /**
- * Learn whether another FullyBoundNullaryPredicate is equal to this.
- * @param that FullyBoundNullaryPredicate to test
- * @return boolean
- */
- public boolean equals(FullyBoundNullaryPredicate that) {
- return null != that && predicate.equals(that.predicate)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof FullyBoundNullaryPredicate)) {
+ return false;
+ }
+ FullyBoundNullaryPredicate that = (FullyBoundNullaryPredicate) obj;
+ return predicate.equals(that.predicate)
&& (null == left ? null == that.left : left.equals(that.left))
&& (null == right ? null == that.right : right.equals(that.right));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FullyBoundNullaryProcedure.java Sat Oct 26 17:55:27 2013
@@ -78,18 +78,15 @@ public final class FullyBoundNullaryProc
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof FullyBoundNullaryProcedure
- && equals((FullyBoundNullaryProcedure) that));
- }
-
- /**
- * Learn whether another FullyBoundNullaryProcedure is equal to this.
- * @param that FullyBoundNullaryProcedure to test
- * @return boolean
- */
- public boolean equals(FullyBoundNullaryProcedure that) {
- return null != that && procedure.equals(that.procedure)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof FullyBoundNullaryProcedure)) {
+ return false;
+ }
+ FullyBoundNullaryProcedure that = (FullyBoundNullaryProcedure) obj;
+ return procedure.equals(that.procedure)
&& (null == left ? null == that.left : left.equals(that.left))
&& (null == right ? null == that.right : right.equals(that.right));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionPredicate.java Sat Oct 26 17:55:27 2013
@@ -69,18 +69,15 @@ public final class FunctionPredicate<A>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this
- || (that instanceof FunctionPredicate<?> && equals((FunctionPredicate<?>) that));
- }
-
- /**
- * Learn whether another FunctionPredicate is equal to this.
- * @param that FunctionPredicate to test
- * @return boolean
- */
- public boolean equals(FunctionPredicate<?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof FunctionPredicate<?>)) {
+ return false;
+ }
+ FunctionPredicate<?> that = (FunctionPredicate<?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/FunctionProcedure.java Sat Oct 26 17:55:27 2013
@@ -69,18 +69,15 @@ public final class FunctionProcedure<A>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this
- || (that instanceof FunctionProcedure<?> && equals((FunctionProcedure<?>) that));
- }
-
- /**
- * Learn whether a specified FunctionPredicate is equal to this.
- * @param that the FunctionPredicate to test
- * @return boolean
- */
- public boolean equals(FunctionProcedure<?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof FunctionProcedure<?>)) {
+ return false;
+ }
+ FunctionProcedure<?> that = (FunctionProcedure<?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java Sat Oct 26 17:55:27 2013
@@ -68,18 +68,15 @@ public final class IgnoreLeftFunction<L,
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreLeftFunction<?, ?, ?>
- && equals((IgnoreLeftFunction<?, ?, ?>) that));
- }
-
- /**
- * Learn whether another IgnoreLeftFunction is equal to this.
- * @param that IgnoreLeftFunction to test
- * @return boolean
- */
- public boolean equals(IgnoreLeftFunction<?, ?, ?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreLeftFunction<?, ?, ?>)) {
+ return false;
+ }
+ IgnoreLeftFunction<?, ?, ?> that = (IgnoreLeftFunction<?, ?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java Sat Oct 26 17:55:27 2013
@@ -67,17 +67,15 @@ public final class IgnoreLeftPredicate<L
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreLeftPredicate<?, ?> && equals((IgnoreLeftPredicate<?, ?>) that));
- }
-
- /**
- * Learn whether another IgnoreLeftPredicate is equal to this.
- * @param that the IgnoreLeftPredicate to test
- * @return boolean
- */
- public boolean equals(IgnoreLeftPredicate<?, ?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreLeftPredicate<?, ?>)) {
+ return false;
+ }
+ IgnoreLeftPredicate<?, ?> that = (IgnoreLeftPredicate<?, ?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java Sat Oct 26 17:55:27 2013
@@ -67,17 +67,15 @@ public final class IgnoreLeftProcedure<L
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreLeftProcedure<?, ?> && equals((IgnoreLeftProcedure<?, ?>) that));
- }
-
- /**
- * Learn whether another IgnoreLeftProcedure is equal to this.
- * @param that IgnoreLeftProcedure to test
- * @return boolean
- */
- public boolean equals(IgnoreLeftProcedure<?, ?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreLeftProcedure<?, ?>)) {
+ return false;
+ }
+ IgnoreLeftProcedure<?, ?> that = (IgnoreLeftProcedure<?, ?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java Sat Oct 26 17:55:27 2013
@@ -68,18 +68,15 @@ public final class IgnoreRightFunction<L
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightFunction<?, ?, ?>
- && equals((IgnoreRightFunction<?, ?, ?>) that));
- }
-
- /**
- * Learn whether another IgnoreRightFunction is equal to this.
- * @param that IgnoreRightFunction to test
- * @return boolean
- */
- public boolean equals(IgnoreRightFunction<?, ?, ?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreRightFunction<?, ?, ?>)) {
+ return false;
+ }
+ IgnoreRightFunction<?, ?, ?> that = (IgnoreRightFunction<?, ?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class IgnoreRightPredicate<
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightPredicate<?, ?>
- && equals((IgnoreRightPredicate<?, ?>) that));
- }
-
- /**
- * Learn whether a given IgnoreRightPredicate is equal to this.
- * @param that IgnoreRightPredicate to test
- * @return boolean
- */
- public boolean equals(IgnoreRightPredicate<?, ?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreRightPredicate<?, ?>)) {
+ return false;
+ }
+ IgnoreRightPredicate<?, ?> that = (IgnoreRightPredicate<?, ?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class IgnoreRightProcedure<
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IgnoreRightProcedure<?, ?>
- && equals((IgnoreRightProcedure<?, ?>) that));
- }
-
- /**
- * Learn whether another IgnoreRightProcedure is equal to this.
- * @param that IgnoreRightProcedure to test
- * @return boolean
- */
- public boolean equals(IgnoreRightProcedure<?, ?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IgnoreRightProcedure<?, ?>)) {
+ return false;
+ }
+ IgnoreRightProcedure<?, ?> that = (IgnoreRightProcedure<?, ?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundFunction.java Sat Oct 26 17:55:27 2013
@@ -75,19 +75,16 @@ public final class LeftBoundFunction<A,
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof LeftBoundFunction<?, ?> && equals((LeftBoundFunction<?, ?>) that));
- }
-
- /**
- * Learn whether another LeftBoundFunction is equal to this.
- * @param that LeftBoundFunction to test
- * @return boolean
- */
- public boolean equals(LeftBoundFunction<?, ?> that) {
- return null != that
- && function.equals(that.function)
- && (null == param ? null == that.param : param.equals(that.param));
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof LeftBoundFunction<?, ?>)) {
+ return false;
+ }
+ LeftBoundFunction<?, ?> that = (LeftBoundFunction<?, ?>) obj;
+ return this.function.equals(that.function)
+ && (null == this.param ? null == that.param : this.param.equals(that.param));
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundPredicate.java Sat Oct 26 17:55:27 2013
@@ -75,18 +75,15 @@ public final class LeftBoundPredicate<A>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof LeftBoundPredicate<?> && equals((LeftBoundPredicate<?>) that));
- }
-
- /**
- * Learn whether another LeftBoundPredicate is equal to this.
- * @param that LeftBoundPredicate to test
- * @return boolean
- */
- public boolean equals(LeftBoundPredicate<?> that) {
- return null != that
- && predicate.equals(that.predicate)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof LeftBoundPredicate<?>)) {
+ return false;
+ }
+ LeftBoundPredicate<?> that = (LeftBoundPredicate<?>) obj;
+ return predicate.equals(that.predicate)
&& (null == param ? null == that.param : param.equals(that.param));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/LeftBoundProcedure.java Sat Oct 26 17:55:27 2013
@@ -74,18 +74,15 @@ public final class LeftBoundProcedure<A>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof LeftBoundProcedure<?> && equals((LeftBoundProcedure<?>) that));
- }
-
- /**
- * Learn whether another LeftBoundProcedure is equal to this.
- * @param that LeftBoundProcedure to test
- * @return boolean
- */
- public boolean equals(LeftBoundProcedure<?> that) {
- return null != that
- && procedure.equals(that.procedure)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof LeftBoundProcedure<?>)) {
+ return false;
+ }
+ LeftBoundProcedure<?> that = (LeftBoundProcedure<?>) obj;
+ return procedure.equals(that.procedure)
&& (null == param ? null == that.param : param.equals(that.param));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionFunction.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class NullaryFunctionFuncti
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryFunctionFunction<?, ?>
- && equals((NullaryFunctionFunction<?, ?>) that));
- }
-
- /**
- * Learn whether another NullaryFunctionFunction is equal to this.
- * @param that NullaryFunctionFunction to test
- * @return boolean
- */
- public boolean equals(NullaryFunctionFunction<?, ?> that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryFunctionFunction<?, ?>)) {
+ return false;
+ }
+ NullaryFunctionFunction<?, ?> that = (NullaryFunctionFunction<?, ?>) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryPredicate.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class NullaryFunctionNullar
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryFunctionNullaryPredicate
- && equals((NullaryFunctionNullaryPredicate) that));
- }
-
- /**
- * Learn whether another NullaryFunctionNullaryPredicate is equal to this.
- * @param that NullaryFunctionNullaryPredicate to test
- * @return boolean
- */
- public boolean equals(NullaryFunctionNullaryPredicate that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryFunctionNullaryPredicate)) {
+ return false;
+ }
+ NullaryFunctionNullaryPredicate that = (NullaryFunctionNullaryPredicate) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryFunctionNullaryProcedure.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class NullaryFunctionNullar
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryFunctionNullaryProcedure
- && equals((NullaryFunctionNullaryProcedure) that));
- }
-
- /**
- * Learn whether another NullaryFunctionNullaryProcedure is equal to this.
- * @param that NullaryFunctionNullaryProcedure to test
- * @return boolean
- */
- public boolean equals(NullaryFunctionNullaryProcedure that) {
- return null != that && function.equals(that.function);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryFunctionNullaryProcedure)) {
+ return false;
+ }
+ NullaryFunctionNullaryProcedure that = (NullaryFunctionNullaryProcedure) obj;
+ return this.function.equals(that.function);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicateNullaryFunction.java Sat Oct 26 17:55:27 2013
@@ -69,18 +69,15 @@ public final class NullaryPredicateNulla
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryPredicateNullaryFunction
- && equals((NullaryPredicateNullaryFunction) that));
- }
-
- /**
- * Learn whether another NullaryPredicateNullaryFunction is equal to this.
- * @param that NullaryPredicateNullaryFunction to test
- * @return boolean
- */
- public boolean equals(NullaryPredicateNullaryFunction that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryPredicateNullaryFunction)) {
+ return false;
+ }
+ NullaryPredicateNullaryFunction that = (NullaryPredicateNullaryFunction) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryPredicatePredicate.java Sat Oct 26 17:55:27 2013
@@ -66,18 +66,15 @@ public final class NullaryPredicatePredi
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryPredicatePredicate<?>
- && equals((NullaryPredicatePredicate<?>) that));
- }
-
- /**
- * Learn whether a given NullaryPredicatePredicate is equal to this.
- * @param that NullaryPredicatePredicate to test
- * @return boolean
- */
- public boolean equals(NullaryPredicatePredicate<?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryPredicatePredicate<?>)) {
+ return false;
+ }
+ NullaryPredicatePredicate<?> that = (NullaryPredicatePredicate<?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureNullaryFunction.java Sat Oct 26 17:55:27 2013
@@ -67,18 +67,15 @@ public final class NullaryProcedureNulla
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryProcedureNullaryFunction<?>
- && equals((NullaryProcedureNullaryFunction<?>) that));
- }
-
- /**
- * Learn whether another NullaryProcedureNullaryFunction is equal to this.
- * @param that NullaryProcedureNullaryFunction to test
- * @return boolean
- */
- public boolean equals(NullaryProcedureNullaryFunction<?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryProcedureNullaryFunction<?>)) {
+ return false;
+ }
+ NullaryProcedureNullaryFunction<?> that = (NullaryProcedureNullaryFunction<?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/NullaryProcedureProcedure.java Sat Oct 26 17:55:27 2013
@@ -66,18 +66,15 @@ public final class NullaryProcedureProce
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof NullaryProcedureProcedure<?>
- && equals((NullaryProcedureProcedure<?>) that));
- }
-
- /**
- * Learn whether another NullaryProcedureProcedure is equal to this.
- * @param that NullaryProcedureProcedure to test
- * @return boolean
- */
- public boolean equals(NullaryProcedureProcedure<?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof NullaryProcedureProcedure<?>)) {
+ return false;
+ }
+ NullaryProcedureProcedure<?> that = (NullaryProcedureProcedure<?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/PredicateFunction.java Sat Oct 26 17:55:27 2013
@@ -70,18 +70,15 @@ public final class PredicateFunction<A>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this
- || (that instanceof PredicateFunction<?> && equals((PredicateFunction<?>) that));
- }
-
- /**
- * Learn whether another PredicateFunction is equal to this.
- * @param that PredicateFunction to test
- * @return boolean
- */
- public boolean equals(PredicateFunction<?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof PredicateFunction<?>)) {
+ return false;
+ }
+ PredicateFunction<?> that = (PredicateFunction<?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java Sat Oct 26 17:55:27 2013
@@ -68,18 +68,15 @@ public final class ProcedureFunction<A,
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof ProcedureFunction<?, ?>
- && equals((ProcedureFunction<?, ?>) that));
- }
-
- /**
- * Learn whether a given ProcedureFunction is equal to this.
- * @param that ProcedureFunction to test
- * @return boolean
- */
- public boolean equals(ProcedureFunction<?, ?> that) {
- return null != that && procedure.equals(that.procedure);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof ProcedureFunction<?, ?>)) {
+ return false;
+ }
+ ProcedureFunction<?, ?> that = (ProcedureFunction<?, ?>) obj;
+ return this.procedure.equals(that.procedure);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundFunction.java Sat Oct 26 17:55:27 2013
@@ -74,18 +74,15 @@ public final class RightBoundFunction<A,
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof RightBoundFunction<?, ?> && equals((RightBoundFunction<?, ?>) that));
- }
-
- /**
- * Learn whether another RightBoundFunction is equal to this.
- * @param that RightBoundFunction to test
- * @return boolean
- */
- public boolean equals(RightBoundFunction<?, ?> that) {
- return null != that
- && function.equals(that.function)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof RightBoundFunction<?, ?>)) {
+ return false;
+ }
+ RightBoundFunction<?, ?> that = (RightBoundFunction<?, ?>) obj;
+ return function.equals(that.function)
&& (null == param ? null == that.param : param.equals(that.param));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundPredicate.java Sat Oct 26 17:55:27 2013
@@ -74,19 +74,16 @@ public final class RightBoundPredicate<A
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof RightBoundPredicate<?> && equals((RightBoundPredicate<?>) that));
- }
-
- /**
- * Learn whether another RightBoundPredicate is equal to this.
- * @param that RightBoundPredicate to test
- * @return boolean
- */
- public boolean equals(RightBoundPredicate<?> that) {
- return null != that
- && predicate.equals(that.predicate)
- && (null == param ? null == that.param : param.equals(that.param));
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof RightBoundPredicate<?>)) {
+ return false;
+ }
+ RightBoundPredicate<?> that = (RightBoundPredicate<?>) obj;
+ return this.predicate.equals(that.predicate)
+ && (null == this.param ? null == that.param : this.param.equals(that.param));
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/adapter/RightBoundProcedure.java Sat Oct 26 17:55:27 2013
@@ -74,18 +74,15 @@ public final class RightBoundProcedure<A
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof RightBoundProcedure<?> && equals((RightBoundProcedure<?>) that));
- }
-
- /**
- * Learn whether another RightBoundProcedure is equal to this.
- * @param that RightBoundProcedure to test
- * @return boolean
- */
- public boolean equals(RightBoundProcedure<?> that) {
- return null != that
- && procedure.equals(that.procedure)
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof RightBoundProcedure<?>)) {
+ return false;
+ }
+ RightBoundProcedure<?> that = (RightBoundProcedure<?>) obj;
+ return this.procedure.equals(that.procedure)
&& (null == param ? null == that.param : param.equals(that.param));
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/Constant.java Sat Oct 26 17:55:27 2013
@@ -127,17 +127,15 @@ public final class Constant<T> implement
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof Constant<?> && equals((Constant<?>) that));
- }
-
- /**
- * Learn whether another Constant is equal to this.
- * @param that Constant to test
- * @return boolean
- */
- public boolean equals(Constant<?> that) {
- return (null != that && (null == this.value ? null == that.value : this.value.equals(that.value)));
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Constant<?>)) {
+ return false;
+ }
+ Constant<?> that = (Constant<?>) obj;
+ return null == this.value ? null == that.value : this.value.equals(that.value);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java Sat Oct 26 17:55:27 2013
@@ -65,17 +65,15 @@ public final class ComparatorFunction<T>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof ComparatorFunction<?> && equals((ComparatorFunction<?>) that));
- }
-
- /**
- * Learn whether a specified ComparatorFunction is equal to this.
- * @param that the ComparatorFunction to test
- * @return boolean
- */
- public boolean equals(ComparatorFunction<?> that) {
- return null != that && comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof ComparatorFunction<?>)) {
+ return false;
+ }
+ ComparatorFunction<?> that = (ComparatorFunction<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java Sat Oct 26 17:55:27 2013
@@ -86,20 +86,15 @@ public final class IsEquivalent<T> imple
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsEquivalent<?> && equals((IsEquivalent<?>) that));
- }
-
- /**
- * Learn whether a given IsEquivalent is equal to this.
- * @param that IsEquivalent to test
- * @return boolean
- */
- public boolean equals(IsEquivalent<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsEquivalent<?>)) {
+ return false;
}
- return false;
+ IsEquivalent<?> that = (IsEquivalent<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java Sat Oct 26 17:55:27 2013
@@ -86,20 +86,15 @@ public final class IsGreaterThan<T> impl
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsGreaterThan<?> && equals((IsGreaterThan<?>) that));
- }
-
- /**
- * Learn whether a given IsGreaterThan is equal to this.
- * @param that the IsGreaterThan to test
- * @return boolean
- */
- public boolean equals(IsGreaterThan<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsGreaterThan<?>)) {
+ return false;
}
- return false;
+ IsGreaterThan<?> that = (IsGreaterThan<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java Sat Oct 26 17:55:27 2013
@@ -87,20 +87,15 @@ public final class IsGreaterThanOrEqual<
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsGreaterThanOrEqual<?> && equals((IsGreaterThanOrEqual<?>) that));
- }
-
- /**
- * Learn whether another IsGreaterThanOrEqual is equal to this.
- * @param that IsGreaterThanOrEqual to test
- * @return boolean
- */
- public boolean equals(IsGreaterThanOrEqual<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsGreaterThanOrEqual<?>)) {
+ return false;
}
- return false;
+ IsGreaterThanOrEqual<?> that = (IsGreaterThanOrEqual<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java Sat Oct 26 17:55:27 2013
@@ -86,20 +86,15 @@ public final class IsLessThan<T> impleme
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsLessThan<?> && equals((IsLessThan<?>) that));
- }
-
- /**
- * Learn whether a given IsLessThan is equal to this.
- * @param that IsLessThan to test
- * @return boolean
- */
- public boolean equals(IsLessThan<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsLessThan<?>)) {
+ return false;
}
- return false;
+ IsLessThan<?> that = (IsLessThan<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java Sat Oct 26 17:55:27 2013
@@ -86,20 +86,15 @@ public final class IsLessThanOrEqual<T>
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsLessThanOrEqual<?> && equals((IsLessThanOrEqual<?>) that));
- }
-
- /**
- * Learn whether another IsLessThanOrEqual is equal to this.
- * @param that the IsLessThanOrEqual to test.
- * @return boolean
- */
- public boolean equals(IsLessThanOrEqual<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsLessThanOrEqual<?>)) {
+ return false;
}
- return false;
+ IsLessThanOrEqual<?> that = (IsLessThanOrEqual<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java Sat Oct 26 17:55:27 2013
@@ -86,20 +86,15 @@ public final class IsNotEquivalent<T> im
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof IsNotEquivalent<?> && equals((IsNotEquivalent<?>) that));
- }
-
- /**
- * Learn whether another IsNotEquivalent is equal to this.
- * @param that IsNotEquivalent to test
- * @return boolean
- */
- public boolean equals(IsNotEquivalent<?> that) {
- if (null != that) {
- return comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof IsNotEquivalent<?>)) {
+ return false;
}
- return false;
+ IsNotEquivalent<?> that = (IsNotEquivalent<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Max.java Sat Oct 26 17:55:27 2013
@@ -75,17 +75,15 @@ public final class Max<T> implements Bin
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof Max<?> && equals((Max<?>) that));
- }
-
- /**
- * Learn whether another Max is equal to this.
- * @param that Max to test
- * @return boolean
- */
- public boolean equals(Max<?> that) {
- return null != that && comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Max<?>)) {
+ return false;
+ }
+ Max<?> that = (Max<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/comparator/Min.java Sat Oct 26 17:55:27 2013
@@ -75,17 +75,15 @@ public final class Min<T> implements Bin
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof Min<?> && equals((Min<?>) that));
- }
-
- /**
- * Learn whether another Min is equal to this.
- * @param that Min to test
- * @return boolean
- */
- public boolean equals(Min<?> that) {
- return null != that && comparator.equals(that.comparator);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof Min<?>)) {
+ return false;
+ }
+ Min<?> that = (Min<?>) obj;
+ return this.comparator.equals(that.comparator);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/And.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/And.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/And.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/And.java Sat Oct 26 17:55:27 2013
@@ -98,16 +98,14 @@ public final class And<A> extends BasePr
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof And<?> && equals((And<?>) that));
- }
-
- /**
- * Learn whether another And is equal to this.
- * @param that And to test
- * @return boolean
- */
- public boolean equals(And<?> that) {
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof And<?>)) {
+ return false;
+ }
+ And<?> that = (And<?>) obj;
return getPredicateListEquals(that);
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java Sat Oct 26 17:55:27 2013
@@ -99,16 +99,14 @@ public final class BinaryAnd<L, R> exten
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BinaryAnd<?, ?> && equals((BinaryAnd<?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryAnd is equal to this.
- * @param that the BinaryAnd to test
- * @return boolean
- */
- public boolean equals(BinaryAnd<?, ?> that) {
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryAnd<?, ?>)) {
+ return false;
+ }
+ BinaryAnd<?, ?> that = (BinaryAnd<?, ?>) obj;
return getBinaryPredicateListEquals(that);
}
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java Sat Oct 26 17:55:27 2013
@@ -133,21 +133,17 @@ public class BinaryCompositeBinaryFuncti
* {@inheritDoc}
*/
@Override
- public final boolean equals(Object that) {
- return that == this || (that instanceof BinaryCompositeBinaryFunction<?, ?, ?>
- && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryCompositeBinaryFunction is equal to this.
- * @param that BinaryCompositeBinaryFunction to test
- * @return boolean
- */
- public final boolean equals(BinaryCompositeBinaryFunction<?, ?, ?> that) {
- return null != that
- && helper.f.equals(that.helper.f)
- && helper.g.equals(that.helper.g)
- && helper.h.equals(that.helper.h);
+ public final boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryCompositeBinaryFunction<?, ?, ?>)) {
+ return false;
+ }
+ BinaryCompositeBinaryFunction<?, ?, ?> that = (BinaryCompositeBinaryFunction<?, ?, ?>) obj;
+ return this.helper.f.equals(that.helper.f)
+ && this.helper.g.equals(that.helper.g)
+ && this.helper.h.equals(that.helper.h);
}
/**
Modified: commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java
URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java?rev=1536009&r1=1536008&r2=1536009&view=diff
==============================================================================
--- commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java (original)
+++ commons/proper/functor/trunk/core/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java Sat Oct 26 17:55:27 2013
@@ -71,17 +71,15 @@ public final class BinaryNot<L, R> imple
* {@inheritDoc}
*/
@Override
- public boolean equals(Object that) {
- return that == this || (that instanceof BinaryNot<?, ?> && equals((BinaryNot<?, ?>) that));
- }
-
- /**
- * Learn whether another BinaryNot is equal to this.
- * @param that BinaryNot to test
- * @return boolean
- */
- public boolean equals(BinaryNot<?, ?> that) {
- return null != that && predicate.equals(that.predicate);
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BinaryNot<?, ?>)) {
+ return false;
+ }
+ BinaryNot<?, ?> that = (BinaryNot<?, ?>) obj;
+ return this.predicate.equals(that.predicate);
}
/**