Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java Sat Oct 22 01:16:16 2011 @@ -62,6 +62,7 @@ public abstract class AbstractLoopProced /** * {@inheritDoc} */ + @Override public final boolean equals(Object object) { if (object == this) { return true; @@ -77,6 +78,7 @@ public abstract class AbstractLoopProced /** * {@inheritDoc} */ + @Override public int hashCode() { return hashCode("AbstractLoopProcedure".hashCode()); } @@ -84,6 +86,7 @@ public abstract class AbstractLoopProced /** * {@inheritDoc} */ + @Override public String toString() { return getClass().getName() + "<" + getCondition() + "," + getAction() + ">"; }
Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/And.java Sat Oct 22 01:16:16 2011 @@ -98,6 +98,7 @@ public final class And extends BasePredi /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof And && equals((And) that)); } @@ -114,6 +115,7 @@ public final class And extends BasePredi /** * {@inheritDoc} */ + @Override public int hashCode() { return "And".hashCode() ^ getPredicateListHashCode(); } @@ -121,6 +123,7 @@ public final class And extends BasePredi /** * {@inheritDoc} */ + @Override public String toString() { return "And<" + getPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseBinaryPredicateList.java Sat Oct 22 01:16:16 2011 @@ -94,16 +94,19 @@ abstract class BaseBinaryPredicateList<L /** * {@inheritDoc} */ + @Override public abstract boolean equals(Object that); /** * {@inheritDoc} */ + @Override public abstract int hashCode(); /** * {@inheritDoc} */ + @Override public abstract String toString(); // modifiers Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BasePredicateList.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BasePredicateList.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BasePredicateList.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BasePredicateList.java Sat Oct 22 01:16:16 2011 @@ -90,16 +90,19 @@ abstract class BasePredicateList impleme /** * {@inheritDoc} */ + @Override public abstract boolean equals(Object that); /** * {@inheritDoc} */ + @Override public abstract int hashCode(); /** * {@inheritDoc} */ + @Override public abstract String toString(); // modifiers Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseUnaryPredicateList.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseUnaryPredicateList.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseUnaryPredicateList.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BaseUnaryPredicateList.java Sat Oct 22 01:16:16 2011 @@ -92,16 +92,19 @@ abstract class BaseUnaryPredicateList<A> /** * {@inheritDoc} */ + @Override public abstract boolean equals(Object that); /** * {@inheritDoc} */ + @Override public abstract int hashCode(); /** * {@inheritDoc} */ + @Override public abstract String toString(); // modifiers Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java Sat Oct 22 01:16:16 2011 @@ -99,6 +99,7 @@ public final class BinaryAnd<L, R> exten /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof BinaryAnd<?, ?> && equals((BinaryAnd<?, ?>) that)); } @@ -115,6 +116,7 @@ public final class BinaryAnd<L, R> exten /** * {@inheritDoc} */ + @Override public int hashCode() { return "BinaryAnd".hashCode() ^ getBinaryPredicateListHashCode(); } @@ -122,6 +124,7 @@ public final class BinaryAnd<L, R> exten /** * {@inheritDoc} */ + @Override public String toString() { return "BinaryAnd<" + getBinaryPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java Sat Oct 22 01:16:16 2011 @@ -131,6 +131,7 @@ public class BinaryCompositeBinaryFuncti /** * {@inheritDoc} */ + @Override public final boolean equals(Object that) { return that == this || (that instanceof BinaryCompositeBinaryFunction<?, ?, ?> && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that)); @@ -151,6 +152,7 @@ public class BinaryCompositeBinaryFuncti /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "BinaryCompositeBinaryFunction".hashCode(); hash <<= HASH_SHIFT; @@ -165,6 +167,7 @@ public class BinaryCompositeBinaryFuncti /** * {@inheritDoc} */ + @Override public String toString() { return "BinaryCompositeBinaryFunction<" + helper.f + ";" + helper.g + ";" + helper.h + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java Sat Oct 22 01:16:16 2011 @@ -73,6 +73,7 @@ public final class BinaryNot<L, R> imple /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof BinaryNot<?, ?> && equals((BinaryNot<?, ?>) that)); } @@ -89,6 +90,7 @@ public final class BinaryNot<L, R> imple /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "BinaryNot".hashCode(); if (null != predicate) { @@ -100,6 +102,7 @@ public final class BinaryNot<L, R> imple /** * {@inheritDoc} */ + @Override public String toString() { return "BinaryNot<" + predicate + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java Sat Oct 22 01:16:16 2011 @@ -99,6 +99,7 @@ public final class BinaryOr<L, R> extend /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof BinaryOr<?, ?> && equals((BinaryOr<?, ?>) that)); } @@ -115,6 +116,7 @@ public final class BinaryOr<L, R> extend /** * {@inheritDoc} */ + @Override public int hashCode() { return "BinaryOr".hashCode() ^ getBinaryPredicateListHashCode(); } @@ -122,6 +124,7 @@ public final class BinaryOr<L, R> extend /** * {@inheritDoc} */ + @Override public String toString() { return "BinaryOr<" + getBinaryPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java Sat Oct 22 01:16:16 2011 @@ -117,6 +117,7 @@ public class BinarySequence<L, R> implem /** * {@inheritDoc} */ + @Override public final boolean equals(Object that) { return that == this || (that instanceof BinarySequence<?, ?> && equals((BinarySequence<?, ?>) that)); } @@ -134,6 +135,7 @@ public class BinarySequence<L, R> implem /** * {@inheritDoc} */ + @Override public int hashCode() { // by construction, list is never null return "BinarySequence".hashCode() ^ list.hashCode(); @@ -142,6 +144,7 @@ public class BinarySequence<L, R> implem /** * {@inheritDoc} */ + @Override public String toString() { return "BinarySequence<" + list + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java Sat Oct 22 01:16:16 2011 @@ -189,6 +189,7 @@ public class CompositeUnaryFunction<A, T /** * {@inheritDoc} */ + @Override public final boolean equals(Object that) { return that == this || (that instanceof CompositeUnaryFunction<?, ?> && equals((CompositeUnaryFunction<?, ?>) that)); @@ -207,6 +208,7 @@ public class CompositeUnaryFunction<A, T /** * {@inheritDoc} */ + @Override public int hashCode() { // by construction, list is never null return ("CompositeUnaryFunction".hashCode() << HASH_SHIFT) ^ function.hashCode(); @@ -215,6 +217,7 @@ public class CompositeUnaryFunction<A, T /** * {@inheritDoc} */ + @Override public String toString() { return "CompositeUnaryFunction<" + function + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java Sat Oct 22 01:16:16 2011 @@ -103,6 +103,7 @@ public final class CompositeUnaryPredica /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof CompositeUnaryPredicate<?> && equals((CompositeUnaryPredicate<?>) that)); @@ -120,6 +121,7 @@ public final class CompositeUnaryPredica /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "CompositeUnaryPredicate".hashCode(); hash <<= 2; @@ -130,6 +132,7 @@ public final class CompositeUnaryPredica /** * {@inheritDoc} */ + @Override public String toString() { return "CompositeUnaryFunction<" + function + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java Sat Oct 22 01:16:16 2011 @@ -103,6 +103,7 @@ public final class CompositeUnaryProcedu /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof CompositeUnaryProcedure<?> && equals((CompositeUnaryProcedure<?>) that)); @@ -120,6 +121,7 @@ public final class CompositeUnaryProcedu /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "CompositeUnaryProcedure".hashCode(); hash <<= 2; @@ -130,6 +132,7 @@ public final class CompositeUnaryProcedu /** * {@inheritDoc} */ + @Override public String toString() { return "CompositeUnaryProcedure<" + function + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java Sat Oct 22 01:16:16 2011 @@ -105,6 +105,7 @@ public final class ConditionalBinaryFunc /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalBinaryFunction<?, ?, ?> && equals((ConditionalBinaryFunction<?, ?, ?>) that)); @@ -125,6 +126,7 @@ public final class ConditionalBinaryFunc /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalBinaryFunction".hashCode(); if (null != ifPred) { @@ -145,6 +147,7 @@ public final class ConditionalBinaryFunc /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalBinaryFunction<" + ifPred + "?" + thenFunc + ":" + elseFunc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java Sat Oct 22 01:16:16 2011 @@ -95,6 +95,7 @@ public final class ConditionalBinaryPred /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalBinaryPredicate<?, ?> && equals((ConditionalBinaryPredicate<?, ?>) that)); @@ -115,6 +116,7 @@ public final class ConditionalBinaryPred /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalBinaryPredicate".hashCode(); if (null != ifPred) { @@ -135,6 +137,7 @@ public final class ConditionalBinaryPred /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalBinaryPredicate<" + ifPred + "?" + thenPred + ":" + elsePred + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java Sat Oct 22 01:16:16 2011 @@ -116,6 +116,7 @@ public final class ConditionalBinaryProc /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalBinaryProcedure<?, ?> && equals((ConditionalBinaryProcedure<?, ?>) that)); @@ -136,6 +137,7 @@ public final class ConditionalBinaryProc /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalBinaryProcedure".hashCode(); if (null != ifPred) { @@ -156,6 +158,7 @@ public final class ConditionalBinaryProc /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalBinaryProcedure<" + ifPred + "?" + thenProc + ":" + elseProc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java Sat Oct 22 01:16:16 2011 @@ -101,6 +101,7 @@ public final class ConditionalFunction<T /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalFunction<?> && equals((ConditionalFunction<?>) that)); } @@ -120,6 +121,7 @@ public final class ConditionalFunction<T /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalFunction".hashCode(); if (null != ifPred) { @@ -140,6 +142,7 @@ public final class ConditionalFunction<T /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalFunction<" + ifPred + "?" + thenFunc + ":" + elseFunc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java Sat Oct 22 01:16:16 2011 @@ -92,6 +92,7 @@ public final class ConditionalPredicate /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalPredicate && equals((ConditionalPredicate) that)); } @@ -111,6 +112,7 @@ public final class ConditionalPredicate /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalPredicate".hashCode(); if (null != ifPred) { @@ -131,6 +133,7 @@ public final class ConditionalPredicate /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalPredicate<" + ifPred + "?" + thenPred + ":" + elsePred + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalProcedure.java Sat Oct 22 01:16:16 2011 @@ -110,6 +110,7 @@ public final class ConditionalProcedure /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalProcedure && equals((ConditionalProcedure) that)); } @@ -129,6 +130,7 @@ public final class ConditionalProcedure /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalProcedure".hashCode(); if (null != ifPred) { @@ -149,6 +151,7 @@ public final class ConditionalProcedure /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalProcedure<" + ifPred + "?" + thenProc + ":" + elseProc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java Sat Oct 22 01:16:16 2011 @@ -103,6 +103,7 @@ public final class ConditionalUnaryFunct /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalUnaryFunction<?, ?> && equals((ConditionalUnaryFunction<?, ?>) that)); @@ -123,6 +124,7 @@ public final class ConditionalUnaryFunct /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalUnaryFunction".hashCode(); if (null != ifPred) { @@ -143,6 +145,7 @@ public final class ConditionalUnaryFunct /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalUnaryFunction<" + ifPred + "?" + thenFunc + ":" + elseFunc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java Sat Oct 22 01:16:16 2011 @@ -94,6 +94,7 @@ public final class ConditionalUnaryPredi /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalUnaryPredicate<?> && equals((ConditionalUnaryPredicate<?>) that)); @@ -114,6 +115,7 @@ public final class ConditionalUnaryPredi /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalUnaryPredicate".hashCode(); if (null != ifPred) { @@ -134,6 +136,7 @@ public final class ConditionalUnaryPredi /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalUnaryPredicate<" + ifPred + "?" + thenPred + ":" + elsePred + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java Sat Oct 22 01:16:16 2011 @@ -112,6 +112,7 @@ public final class ConditionalUnaryProce /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof ConditionalUnaryProcedure<?> && equals((ConditionalUnaryProcedure<?>) that)); @@ -132,6 +133,7 @@ public final class ConditionalUnaryProce /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "ConditionalUnaryProcedure".hashCode(); if (null != ifPred) { @@ -152,6 +154,7 @@ public final class ConditionalUnaryProce /** * {@inheritDoc} */ + @Override public String toString() { return "ConditionalUnaryProcedure<" + ifPred + "?" + thenProc + ":" + elseProc + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java Sat Oct 22 01:16:16 2011 @@ -63,6 +63,7 @@ public class DoWhileProcedure extends Ab /** * {@inheritDoc} */ + @Override public String toString() { return "DoWhileProcedure<do(" + getAction() + ") while(" + getCondition() + ")>"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Not.java Sat Oct 22 01:16:16 2011 @@ -72,6 +72,7 @@ public final class Not implements Predic /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof Not && equals((Not) that)); } @@ -88,6 +89,7 @@ public final class Not implements Predic /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "Not".hashCode(); if (null != predicate) { @@ -99,6 +101,7 @@ public final class Not implements Predic /** * {@inheritDoc} */ + @Override public String toString() { return "Not<" + predicate + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Or.java Sat Oct 22 01:16:16 2011 @@ -95,6 +95,7 @@ public final class Or extends BasePredic /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof Or && equals((Or) that)); } @@ -111,6 +112,7 @@ public final class Or extends BasePredic /** * {@inheritDoc} */ + @Override public int hashCode() { return "Or".hashCode() ^ getPredicateListHashCode(); } @@ -118,6 +120,7 @@ public final class Or extends BasePredic /** * {@inheritDoc} */ + @Override public String toString() { return "Or<" + getPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java Sat Oct 22 01:16:16 2011 @@ -116,6 +116,7 @@ public class Sequence implements Procedu /** * {@inheritDoc} */ + @Override public final boolean equals(Object that) { return that == this || (that instanceof Sequence && equals((Sequence) that)); } @@ -133,6 +134,7 @@ public class Sequence implements Procedu /** * {@inheritDoc} */ + @Override public int hashCode() { // by construction, list is never null return "Sequence".hashCode() ^ list.hashCode(); @@ -141,6 +143,7 @@ public class Sequence implements Procedu /** * {@inheritDoc} */ + @Override public String toString() { return "Sequence<" + list + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java Sat Oct 22 01:16:16 2011 @@ -80,6 +80,7 @@ public class TransposedFunction<L, R, T> /** * {@inheritDoc} */ + @Override public final boolean equals(Object that) { return that == this || (that instanceof TransposedFunction<?, ?, ?> && equals((TransposedFunction<?, ?, ?>) that)); @@ -97,6 +98,7 @@ public class TransposedFunction<L, R, T> /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "TransposedFunction".hashCode(); if (null != function) { @@ -108,6 +110,7 @@ public class TransposedFunction<L, R, T> /** * {@inheritDoc} */ + @Override public String toString() { return "TransposedFunction<" + function + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java Sat Oct 22 01:16:16 2011 @@ -78,6 +78,7 @@ public class TransposedPredicate<L, R> i /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof TransposedPredicate<?, ?> && equals((TransposedPredicate<?, ?>) that)); } @@ -94,6 +95,7 @@ public class TransposedPredicate<L, R> i /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "TransposedPredicate".hashCode(); if (null != predicate) { @@ -105,6 +107,7 @@ public class TransposedPredicate<L, R> i /** * {@inheritDoc} */ + @Override public String toString() { return "TransposedPredicate<" + predicate + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java Sat Oct 22 01:16:16 2011 @@ -78,6 +78,7 @@ public class TransposedProcedure<L, R> i /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof TransposedProcedure<?, ?> && equals((TransposedProcedure<?, ?>) that)); } @@ -94,6 +95,7 @@ public class TransposedProcedure<L, R> i /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "TransposedProcedure".hashCode(); if (null != procedure) { @@ -105,6 +107,7 @@ public class TransposedProcedure<L, R> i /** * {@inheritDoc} */ + @Override public String toString() { return "TransposedProcedure<" + procedure + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java Sat Oct 22 01:16:16 2011 @@ -98,6 +98,7 @@ public final class UnaryAnd<A> extends B /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnaryAnd<?> && equals((UnaryAnd<?>) that)); } @@ -114,6 +115,7 @@ public final class UnaryAnd<A> extends B /** * {@inheritDoc} */ + @Override public int hashCode() { return "UnaryAnd".hashCode() ^ getUnaryPredicateListHashCode(); } @@ -121,6 +123,7 @@ public final class UnaryAnd<A> extends B /** * {@inheritDoc} */ + @Override public String toString() { return "UnaryAnd<" + getUnaryPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java Sat Oct 22 01:16:16 2011 @@ -138,6 +138,7 @@ public class UnaryCompositeBinaryFunctio /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnaryCompositeBinaryFunction<?, ?, ?> && equals((UnaryCompositeBinaryFunction<?, ?, ?>) that)); @@ -158,6 +159,7 @@ public class UnaryCompositeBinaryFunctio /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "UnaryCompositeBinaryFunction".hashCode(); hash <<= HASH_SHIFT; @@ -172,6 +174,7 @@ public class UnaryCompositeBinaryFunctio /** * {@inheritDoc} */ + @Override public String toString() { return "UnaryCompositeBinaryFunction<" + helper.f + ";" + helper.g + ";" + helper.h + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java Sat Oct 22 01:16:16 2011 @@ -137,6 +137,7 @@ public class UnaryCompositeBinaryPredica /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnaryCompositeBinaryPredicate<?, ?> && equals((UnaryCompositeBinaryPredicate<?, ?>) that)); @@ -155,6 +156,7 @@ public class UnaryCompositeBinaryPredica /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "UnaryCompositeBinaryPredicate".hashCode(); hash <<= HASH_SHIFT; @@ -169,6 +171,7 @@ public class UnaryCompositeBinaryPredica /** * {@inheritDoc} */ + @Override public String toString() { return "UnaryCompositeBinaryPredicate<" + helper.f + ";" + helper.g + ";" + helper.h + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java Sat Oct 22 01:16:16 2011 @@ -72,6 +72,7 @@ public final class UnaryNot<A> implement /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnaryNot<?> && equals((UnaryNot<?>) that)); } @@ -88,6 +89,7 @@ public final class UnaryNot<A> implement /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "UnaryNot".hashCode(); if (null != predicate) { @@ -99,6 +101,7 @@ public final class UnaryNot<A> implement /** * {@inheritDoc} */ + @Override public String toString() { return "UnaryNot<" + predicate + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java Sat Oct 22 01:16:16 2011 @@ -98,6 +98,7 @@ public final class UnaryOr<A> extends Ba /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnaryOr<?> && equals((UnaryOr<?>) that)); } @@ -114,6 +115,7 @@ public final class UnaryOr<A> extends Ba /** * {@inheritDoc} */ + @Override public int hashCode() { return "UnaryOr".hashCode() ^ getUnaryPredicateListHashCode(); } @@ -121,6 +123,7 @@ public final class UnaryOr<A> extends Ba /** * {@inheritDoc} */ + @Override public String toString() { return "UnaryOr<" + getUnaryPredicateListToString() + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java Sat Oct 22 01:16:16 2011 @@ -117,6 +117,7 @@ public class UnarySequence<A> implements /** * {@inheritDoc} */ + @Override public boolean equals(Object that) { return that == this || (that instanceof UnarySequence<?> && equals((UnarySequence<?>) that)); } @@ -134,6 +135,7 @@ public class UnarySequence<A> implements /** * {@inheritDoc} */ + @Override public int hashCode() { // by construction, list is never null return "UnarySequence".hashCode() ^ list.hashCode(); @@ -142,6 +144,7 @@ public class UnarySequence<A> implements /** * {@inheritDoc} */ + @Override public String toString() { return "UnarySequence<" + list + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/WhileDoProcedure.java Sat Oct 22 01:16:16 2011 @@ -63,6 +63,7 @@ public class WhileDoProcedure extends Ab /** * {@inheritDoc} */ + @Override public String toString() { return "WhileDoProcedure<while(" + getCondition() + ") do(" + getAction() + ")>"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java Sat Oct 22 01:16:16 2011 @@ -69,6 +69,7 @@ public class FilteredGenerator<E> extend /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -83,6 +84,7 @@ public class FilteredGenerator<E> extend /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "FilteredGenerator".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java Sat Oct 22 01:16:16 2011 @@ -75,6 +75,7 @@ public class GenerateUntil<E> extends Ba /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -89,6 +90,7 @@ public class GenerateUntil<E> extends Ba /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "GenerateUntil".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java Sat Oct 22 01:16:16 2011 @@ -75,6 +75,7 @@ public class GenerateWhile<E> extends Ba /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -89,6 +90,7 @@ public class GenerateWhile<E> extends Ba /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "GenerateWhile".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java Sat Oct 22 01:16:16 2011 @@ -66,6 +66,7 @@ public final class IteratorToGeneratorAd /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -80,6 +81,7 @@ public final class IteratorToGeneratorAd /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "IteratorToGeneratorAdapater".hashCode(); hash <<= 2; @@ -90,6 +92,7 @@ public final class IteratorToGeneratorAd /** * {@inheritDoc} */ + @Override public String toString() { return "IteratorToGeneratorAdapter<" + iter + ">"; } Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java Sat Oct 22 01:16:16 2011 @@ -72,6 +72,7 @@ public class TransformedGenerator<I, E> /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -86,6 +87,7 @@ public class TransformedGenerator<I, E> /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "TransformedGenerator".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java Sat Oct 22 01:16:16 2011 @@ -76,6 +76,7 @@ public class UntilGenerate<E> extends Ba /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -90,6 +91,7 @@ public class UntilGenerate<E> extends Ba /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "UntilGenerate".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java Sat Oct 22 01:16:16 2011 @@ -76,6 +76,7 @@ public class WhileGenerate<E> extends Ba /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -90,6 +91,7 @@ public class WhileGenerate<E> extends Ba /** * {@inheritDoc} */ + @Override public int hashCode() { int result = "WhileGenerate".hashCode(); result <<= 2; Modified: commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java URL: http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java?rev=1187618&r1=1187617&r2=1187618&view=diff ============================================================================== --- commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java (original) +++ commons/proper/functor/trunk/src/main/java/org/apache/commons/functor/generator/util/IntegerRange.java Sat Oct 22 01:16:16 2011 @@ -110,6 +110,7 @@ public final class IntegerRange extends /** * {@inheritDoc} */ + @Override public String toString() { return "IntegerRange<" + from + "," + to + "," + step + ">"; } @@ -117,6 +118,7 @@ public final class IntegerRange extends /** * {@inheritDoc} */ + @Override public boolean equals(Object obj) { if (obj == this) { return true; @@ -131,6 +133,7 @@ public final class IntegerRange extends /** * {@inheritDoc} */ + @Override public int hashCode() { int hash = "IntegerRange".hashCode(); hash <<= 2;
