Author: simonetripodi
Date: Thu Sep 15 15:58:38 2011
New Revision: 1171154
URL: http://svn.apache.org/viewvc?rev=1171154&view=rev
Log:
removed the final modifier on equals(), hashCode() and toString() methods as
discussed in the ML
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedProcedure.java
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
Thu Sep 15 15:58:38 2011
@@ -120,7 +120,7 @@ public class FoldLeft<T> implements Unar
/**
* {@inheritDoc}
*/
- public final boolean equals(Object obj) {
+ public boolean equals(Object obj) {
if (obj == this) {
return true;
}
@@ -133,7 +133,7 @@ public class FoldLeft<T> implements Unar
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
return "FoldLeft".hashCode() << 2 ^ function.hashCode();
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
Thu Sep 15 15:58:38 2011
@@ -139,7 +139,7 @@ public class FoldRight<T> implements Una
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
return "FoldRight".hashCode() << 2 ^ function.hashCode();
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
Thu Sep 15 15:58:38 2011
@@ -94,7 +94,7 @@ public class RecursiveEvaluation impleme
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
return "RecursiveEvaluation".hashCode() << 2 ^ function.hashCode();
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Thu Sep 15 15:58:38 2011
@@ -99,14 +99,14 @@ public class IsWithinRange<A extends Com
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
return BASE_HASH_CODE * min.hashCode() + max.hashCode() +
NAME_HASH_CODE;
}
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "IsWithinRange(" + min + ", " + max + ")";
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Thu Sep 15 15:58:38 2011
@@ -69,7 +69,7 @@ public abstract class AbstractLoopProced
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
return hashCode("AbstractLoopProcedure".hashCode());
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Thu Sep 15 15:58:38 2011
@@ -133,7 +133,7 @@ public class BinaryCompositeBinaryFuncti
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
int hash = "BinaryCompositeBinaryFunction".hashCode();
hash <<= HASH_SHIFT;
hash ^= helper.f.hashCode();
@@ -147,7 +147,7 @@ public class BinaryCompositeBinaryFuncti
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "BinaryCompositeBinaryFunction<" + helper.f + ";" + helper.g +
";" + helper.h + ">";
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
Thu Sep 15 15:58:38 2011
@@ -129,7 +129,7 @@ public class BinarySequence<L, R> implem
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
// by construction, list is never null
return "BinarySequence".hashCode() ^ list.hashCode();
}
@@ -137,7 +137,7 @@ public class BinarySequence<L, R> implem
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "BinarySequence<" + list + ">";
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Thu Sep 15 15:58:38 2011
@@ -183,7 +183,7 @@ public class CompositeUnaryFunction<A, T
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
// by construction, list is never null
return ("CompositeUnaryFunction".hashCode() << HASH_SHIFT) ^
function.hashCode();
}
@@ -191,7 +191,7 @@ public class CompositeUnaryFunction<A, T
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "CompositeUnaryFunction<" + function + ">";
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/DoWhileProcedure.java
Thu Sep 15 15:58:38 2011
@@ -63,7 +63,7 @@ public class DoWhileProcedure extends Ab
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "DoWhileProcedure<do(" + getAction() + ") while(" +
getCondition() + ")>";
}
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Sequence.java
Thu Sep 15 15:58:38 2011
@@ -130,7 +130,7 @@ public class Sequence implements Procedu
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
// by construction, list is never null
return "Sequence".hashCode() ^ list.hashCode();
}
@@ -138,7 +138,7 @@ public class Sequence implements Procedu
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "Sequence<" + list + ">";
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
Thu Sep 15 15:58:38 2011
@@ -106,7 +106,7 @@ public class TransformedBinaryFunction<L
* {@inheritDoc}
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
int result = "TransformedBinaryFunction".hashCode();
result <<= 2;
result |= helper.following.hashCode();
@@ -119,7 +119,7 @@ public class TransformedBinaryFunction<L
* {@inheritDoc}
*/
@Override
- public final String toString() {
+ public String toString() {
return "TransformedBinaryFunction<" + helper.preceding + "; " +
helper.following + ">";
}
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
Thu Sep 15 15:58:38 2011
@@ -107,7 +107,7 @@ public class TransformedBinaryProcedure<
* {@inheritDoc}
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
int result = "TransformedBinaryProcedure".hashCode();
result <<= 2;
result |= helper.procedure.hashCode();
@@ -120,7 +120,7 @@ public class TransformedBinaryProcedure<
* {@inheritDoc}
*/
@Override
- public final String toString() {
+ public String toString() {
return "TransformedBinaryProcedure<" + helper.function + "; " +
helper.procedure + ">";
}
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java
Thu Sep 15 15:58:38 2011
@@ -104,7 +104,7 @@ public class TransformedFunction<T> impl
* {@inheritDoc}
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
int result = "TransformedFunction".hashCode();
result <<= 2;
result |= helper.following.hashCode();
@@ -117,7 +117,7 @@ public class TransformedFunction<T> impl
* {@inheritDoc}
*/
@Override
- public final String toString() {
+ public String toString() {
return "TransformedFunction<" + helper.preceding + "; " +
helper.following + ">";
}
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedProcedure.java?rev=1171154&r1=1171153&r2=1171154&view=diff
==============================================================================
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedProcedure.java
Thu Sep 15 15:58:38 2011
@@ -108,7 +108,7 @@ public class TransformedProcedure implem
* {@inheritDoc}
*/
@Override
- public final int hashCode() {
+ public int hashCode() {
int result = "TransformedProcedure".hashCode();
result <<= HASH_SHIFT;
result |= helper.procedure.hashCode();
@@ -121,7 +121,7 @@ public class TransformedProcedure implem
* {@inheritDoc}
*/
@Override
- public final String toString() {
+ public String toString() {
return "TransformedProcedure<" + helper.function + "; " +
helper.procedure + ">";
}
}
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java?rev=1171154&r1=1171153&r2=1171154&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
Thu Sep 15 15:58:38 2011
@@ -90,7 +90,7 @@ public class TransposedFunction<L, R, T>
/**
* {@inheritDoc}
*/
- public final int hashCode() {
+ public int hashCode() {
int hash = "TransposedFunction".hashCode();
if (null != function) {
hash ^= function.hashCode();
@@ -101,7 +101,7 @@ public class TransposedFunction<L, R, T>
/**
* {@inheritDoc}
*/
- public final String toString() {
+ public String toString() {
return "TransposedFunction<" + function + ">";
}
