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=646506&r1=646505&r2=646506&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 Apr 9 12:56:50 2008 @@ -67,11 +67,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof TransposedFunction) { - return equals((TransposedFunction) that); - } else { - return false; - } + return that == this || (that instanceof TransposedFunction && equals((TransposedFunction) that)); } /**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java Wed Apr 9 12:56:50 2008 @@ -67,11 +67,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof TransposedPredicate) { - return equals((TransposedPredicate) that); - } else { - return false; - } + return that == this || (that instanceof TransposedPredicate && equals((TransposedPredicate) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java Wed Apr 9 12:56:50 2008 @@ -67,11 +67,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof TransposedProcedure) { - return equals((TransposedProcedure) that); - } else { - return false; - } + return that == this || (that instanceof TransposedProcedure && equals((TransposedProcedure) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java Wed Apr 9 12:56:50 2008 @@ -104,11 +104,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnaryAnd) { - return equals((UnaryAnd) that); - } else { - return false; - } + return that == this || (that instanceof UnaryAnd && equals((UnaryAnd) 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=646506&r1=646505&r2=646506&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 Apr 9 12:56:50 2008 @@ -72,11 +72,8 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnaryCompositeBinaryFunction) { - return equals((UnaryCompositeBinaryFunction) that); - } else { - return false; - } + 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=646506&r1=646505&r2=646506&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 Apr 9 12:56:50 2008 @@ -72,11 +72,8 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnaryCompositeBinaryPredicate) { - return equals((UnaryCompositeBinaryPredicate) that); - } else { - return false; - } + return that == this + || (that instanceof UnaryCompositeBinaryPredicate && equals((UnaryCompositeBinaryPredicate) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java Wed Apr 9 12:56:50 2008 @@ -62,11 +62,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnaryNot) { - return equals((UnaryNot) that); - } else { - return false; - } + return that == this || (that instanceof UnaryNot && equals((UnaryNot) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java Wed Apr 9 12:56:50 2008 @@ -104,11 +104,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnaryOr) { - return equals((UnaryOr) that); - } else { - return false; - } + return that == this || (that instanceof UnaryOr && equals((UnaryOr) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java Wed Apr 9 12:56:50 2008 @@ -99,11 +99,7 @@ * [EMAIL PROTECTED] */ public boolean equals(Object that) { - if (that instanceof UnarySequence) { - return equals((UnarySequence) that); - } else { - return false; - } + return that == this || (that instanceof UnarySequence && equals((UnarySequence) that)); } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java Wed Apr 9 12:56:50 2008 @@ -58,24 +58,6 @@ /** * [EMAIL PROTECTED] */ - public boolean equals(Object object) { - if (object instanceof WhileDoProcedure) { - return super.equals(object); - } else { - return false; - } - } - - /** - * [EMAIL PROTECTED] - */ - public int hashCode() { - return super.hashCode("WhileDoProcedure".hashCode()); - } - - /** - * [EMAIL PROTECTED] - */ public String toString() { return "WhileDoProcedure<while(" + getCondition() + ") do(" + getAction() + ")>"; } Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java Wed Apr 9 12:56:50 2008 @@ -108,12 +108,14 @@ * [EMAIL PROTECTED] */ public boolean equals(Object obj) { - if (obj instanceof IntegerRange) { - IntegerRange that = (IntegerRange) obj; - return this.from == that.from && this.to == that.to && this.step == that.step; - } else { + if (obj == this) { + return true; + } + if (obj instanceof IntegerRange == false) { return false; } + IntegerRange that = (IntegerRange) obj; + return this.from == that.from && this.to == that.to && this.step == that.step; } /** Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java?rev=646506&r1=646505&r2=646506&view=diff ============================================================================== --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/LongRange.java Wed Apr 9 12:56:50 2008 @@ -107,12 +107,14 @@ * [EMAIL PROTECTED] */ public boolean equals(Object obj) { - if (obj instanceof LongRange) { - LongRange that = (LongRange) obj; - return this.from == that.from && this.to == that.to && this.step == that.step; - } else { + if (obj == this) { + return true; + } + if (obj instanceof LongRange == false) { return false; } + LongRange that = (LongRange) obj; + return this.from == that.from && this.to == that.to && this.step == that.step; } /**
