commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r982061 [1/2] - in /commons/sandbox/functor/trunk: ./ src/main/java/org/apache/commons/functor/adapter/ src/main/java/org/apache/commons/functor/core/ src/main/java/org/apache/commons/functor/core/algorithm/ src/main/java/org/apache/commons...
Date Tue, 03 Aug 2010 22:58:31 GMT
Author: mbenson
Date: Tue Aug  3 22:58:28 2010
New Revision: 982061

URL: http://svn.apache.org/viewvc?rev=982061&view=rev
Log:
checkstyle/javadoc/warnings

Modified:
    commons/sandbox/functor/trunk/checkstyle.xml
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionUnaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateUnaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureUnaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsEqual.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstance.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotEqual.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotNull.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotSame.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNull.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsSame.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/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/collection/FilteredIterator.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.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/comparator/Max.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.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/BinaryNot.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.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/CompositeUnaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedProcedure.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java
    commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java

Modified: commons/sandbox/functor/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/checkstyle.xml?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/checkstyle.xml (original)
+++ commons/sandbox/functor/trunk/checkstyle.xml Tue Aug  3 22:58:28 2010
@@ -52,7 +52,6 @@ limitations under the License.
     <module name="OperatorWrap"/>
     <module name="TabCharacter"/>
     <module name="WhitespaceAfter"/>
-    <module name="WhitespaceAround"/>
 
     <module name="GenericIllegalRegexp">
       <property name="format" value="\s+$"/>

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -22,19 +22,14 @@ import org.apache.commons.functor.Binary
 import org.apache.commons.functor.BinaryPredicate;
 
 /**
- * Adapts a <code>Boolean</code>-valued
- * {@link BinaryFunction BinaryFunction}
- * to the {@link BinaryPredicate BinaryPredicate}
- * interface.
- * <p>
- * Note that although this class implements
- * {@link Serializable}, a given instance will
- * only be truly <code>Serializable</code> if the
- * underlying functor is.  Attempts to serialize
- * an instance whose delegate is not
- * <code>Serializable</code> will result in an exception.
- * </p>
- * @version $Revision$ $Date$
+ * Adapts a <code>Boolean</code>-valued {@link BinaryFunction BinaryFunction} to
+ * the {@link BinaryPredicate BinaryPredicate} interface. <p> Note that although
+ * this class implements {@link Serializable}, a given instance will only be
+ * truly <code>Serializable</code> if the underlying functor is. Attempts to
+ * serialize an instance whose delegate is not <code>Serializable</code> will
+ * result in an exception. </p>
+ * @version $Revision$ $Date: 2008-06-10 10:31:53 -0500 (Tue, 10 Jun
+ * 2008) $
  * @author Rodney Waldhoff
  */
 public final class BinaryFunctionBinaryPredicate<L, R> implements BinaryPredicate<L, R>, Serializable {
@@ -42,8 +37,8 @@ public final class BinaryFunctionBinaryP
     private BinaryFunction<? super L, ? super R, Boolean> function;
 
     /**
-     * Create an {@link BinaryPredicate BinaryPredicate} wrapping
-     * the given {@link BinaryFunction BinaryFunction}.
+     * Create an {@link BinaryPredicate BinaryPredicate} wrapping the given
+     * {@link BinaryFunction BinaryFunction}.
      * @param function the {@link BinaryFunction BinaryFunction} to wrap
      */
     public BinaryFunctionBinaryPredicate(BinaryFunction<? super L, ? super R, Boolean> function) {
@@ -54,13 +49,15 @@ public final class BinaryFunctionBinaryP
     }
 
     /**
-     * {@inheritDoc}
-     * Returns the <code>boolean</code> value of the non-<code>null</code>
-     * <code>Boolean</code> returned by the {@link BinaryFunction#evaluate evaluate}
-     * method of my underlying function.
-     *
-     * @throws NullPointerException if my underlying function returns <code>null</code>
-     * @throws ClassCastException if my underlying function returns a non-<code>Boolean</code>
+     * {@inheritDoc} Returns the <code>boolean</code> value of the
+     * non-<code>null</code> <code>Boolean</code> returned by the
+     * {@link BinaryFunction#evaluate evaluate} method of my underlying
+     * function.
+     * 
+     * @throws NullPointerException if my underlying function returns
+     * <code>null</code>
+     * @throws ClassCastException if my underlying function returns a
+     * non-<code>Boolean</code>
      */
     public boolean test(L left, R right) {
         return function.evaluate(left, right);
@@ -71,7 +68,8 @@ public final class BinaryFunctionBinaryP
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof BinaryFunctionBinaryPredicate && equals((BinaryFunctionBinaryPredicate<?, ?>) that));
+                || (that instanceof BinaryFunctionBinaryPredicate<?, ?>
+                && equals((BinaryFunctionBinaryPredicate<?, ?>) that));
     }
 
     /**
@@ -102,17 +100,19 @@ public final class BinaryFunctionBinaryP
     }
 
     /**
-     * Adapt the given, possibly-<code>null</code>,
-     * {@link BinaryFunction BinaryFunction} to the
-     * {@link BinaryPredicate BinaryPredicate} interface.
-     * When the given <code>BinaryFunction</code> is <code>null</code>,
-     * returns <code>null</code>.
-     *
-     * @param function the possibly-<code>null</code>
-     *        {@link BinaryFunction BinaryFunction} to adapt
+     * Adapt the given, possibly-<code>null</code>, {@link BinaryFunction
+     * BinaryFunction} to the {@link BinaryPredicate BinaryPredicate} interface.
+     * When the given <code>BinaryFunction</code> is <code>null</code>, returns
+     * <code>null</code>.
+     * 
+     * @param <L> left type
+     * @param <R> right type
+     * @param <T> result type
+     * @param function the possibly-<code>null</code> {@link BinaryFunction
+     * BinaryFunction} to adapt
      * @return a <code>BinaryFunctionBinaryPredicate</code> wrapping the given
-     *         {@link BinaryFunction BinaryFunction}, or <code>null</code>
-     *         if the given <code>BinaryFunction</code> is <code>null</code>
+     * {@link BinaryFunction BinaryFunction}, or <code>null</code> if the given
+     * <code>BinaryFunction</code> is <code>null</code>
      */
     public static <L, R, T> BinaryFunctionBinaryPredicate<L, R> adapt(
             BinaryFunction<? super L, ? super R, Boolean> function) {

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionBinaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -65,7 +65,8 @@ public final class BinaryFunctionBinaryP
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof BinaryFunctionBinaryProcedure && equals((BinaryFunctionBinaryProcedure<?, ?>) that));
+                || (that instanceof BinaryFunctionBinaryProcedure<?, ?>
+                && equals((BinaryFunctionBinaryProcedure<?, ?>) that));
     }
 
     /**
@@ -102,6 +103,8 @@ public final class BinaryFunctionBinaryP
      * When the given <code>BinaryFunction</code> is <code>null</code>,
      * returns <code>null</code>.
      *
+     * @param <L> left type
+     * @param <R> right type
      * @param function the possibly-<code>null</code>
      *        {@link BinaryFunction BinaryFunction} to adapt
      * @return a <code>BinaryFunctionBinaryProcedure</code> wrapping the given

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionUnaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryFunctionUnaryFunction.java Tue Aug  3 22:58:28 2010
@@ -28,7 +28,7 @@ import org.apache.commons.functor.UnaryF
 public final class BinaryFunctionUnaryFunction<A, T> implements UnaryFunction<A, T> {
     private BinaryFunction<? super A, ? super A, ? extends T> function;
 
-    /**
+    /**``
      * Create a new BinaryFunctionUnaryFunction.
      * @param function to adapt
      */
@@ -44,7 +44,7 @@ public final class BinaryFunctionUnaryFu
      * {@inheritDoc}
      */
     public T evaluate(A obj) {
-        return function.evaluate(obj,obj);
+        return function.evaluate(obj, obj);
     }
 
     /**
@@ -52,7 +52,7 @@ public final class BinaryFunctionUnaryFu
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof BinaryFunctionUnaryFunction
+        return obj == this || obj instanceof BinaryFunctionUnaryFunction<?, ?>
                 && equals((BinaryFunctionUnaryFunction<?, ?>) obj);
     }
 
@@ -83,8 +83,8 @@ public final class BinaryFunctionUnaryFu
 
     /**
      * Adapt a BinaryFunction as a UnaryFunction.
-     * @param <A>
-     * @param <T>
+     * @param <A> input type
+     * @param <T> result type
      * @param function to adapt
      * @return UnaryFunction<A, T>
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateBinaryFunction.java Tue Aug  3 22:58:28 2010
@@ -66,7 +66,8 @@ public final class BinaryPredicateBinary
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof BinaryPredicateBinaryFunction && equals((BinaryPredicateBinaryFunction<?, ?>) that));
+                || (that instanceof BinaryPredicateBinaryFunction<?, ?>
+                && equals((BinaryPredicateBinaryFunction<?, ?>) that));
     }
 
     /**
@@ -103,6 +104,8 @@ public final class BinaryPredicateBinary
      * When the given <code>BinaryPredicate</code> is <code>null</code>,
      * returns <code>null</code>.
      *
+     * @param <L> left type
+     * @param <R> right type
      * @param predicate the possibly-<code>null</code>
      *        {@link BinaryPredicate BinaryPredicate} to adapt
      * @return a <code>BinaryPredicateBinaryFunction</code> wrapping the given

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateUnaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryPredicateUnaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -50,7 +50,7 @@ public final class BinaryPredicateUnaryP
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof BinaryPredicateUnaryPredicate
+        return obj == this || obj instanceof BinaryPredicateUnaryPredicate<?>
                 && equals((BinaryPredicateUnaryPredicate<?>) obj);
     }
 

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureBinaryFunction.java Tue Aug  3 22:58:28 2010
@@ -66,7 +66,7 @@ public final class BinaryProcedureBinary
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof BinaryProcedureBinaryFunction && equals((BinaryProcedureBinaryFunction<?, ?, ?>) that));
+                || (that instanceof BinaryProcedureBinaryFunction<?, ?, ?> && equals((BinaryProcedureBinaryFunction<?, ?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureUnaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/BinaryProcedureUnaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -50,7 +50,7 @@ public final class BinaryProcedureUnaryP
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof BinaryProcedureUnaryProcedure
+        return obj == this || obj instanceof BinaryProcedureUnaryProcedure<?>
                 && equals((BinaryProcedureUnaryProcedure<?>) obj);
     }
 
@@ -84,8 +84,8 @@ public final class BinaryProcedureUnaryP
 
     /**
      * Adapt a BinaryProcedure as a UnaryProcedure.
-     * @param <A>
-     * @param predicate BinaryProcedure to adapt
+     * @param <A> argument type
+     * @param procedure BinaryProcedure to adapt
      * @return UnaryProcedure<A>
      */
     public static <A> UnaryProcedure<A> adapt(BinaryProcedure<? super A, ? super A> procedure) {

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/FunctionUnaryFunction.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,8 @@ public final class FunctionUnaryFunction
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof FunctionUnaryFunction && equals((FunctionUnaryFunction<?, ?>) that));
+        return that == this || (that instanceof FunctionUnaryFunction<?, ?>
+                && equals((FunctionUnaryFunction<?, ?>) that));
     }
 
     /**
@@ -96,6 +97,8 @@ public final class FunctionUnaryFunction
 
     /**
      * Adapt a Function to the UnaryFunction interface.
+     * @param <A> arg type
+     * @param <T> result type
      * @param function to adapt
      * @return FunctionUnaryFunction
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftFunction.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,8 @@ public final class IgnoreLeftFunction<L,
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreLeftFunction && equals((IgnoreLeftFunction<?, ?, ?>) that));
+        return that == this || (that instanceof IgnoreLeftFunction<?, ?, ?>
+                && equals((IgnoreLeftFunction<?, ?, ?>) that));
     }
 
     /**
@@ -96,6 +97,9 @@ public final class IgnoreLeftFunction<L,
 
     /**
      * Adapt a UnaryFunction to the BinaryFunction interface.
+     * @param <L> left type
+     * @param <R> right type
+     * @param <T> result type
      * @param function to adapt
      * @return IgnoreLeftFunction
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftPredicate.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class IgnoreLeftPredicate<L
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreLeftPredicate && equals((IgnoreLeftPredicate<?, ?>) that));
+        return that == this || (that instanceof IgnoreLeftPredicate<?, ?> && equals((IgnoreLeftPredicate<?, ?>) that));
     }
 
     /**
@@ -96,8 +96,8 @@ public final class IgnoreLeftPredicate<L
 
     /**
      * Adapt a UnaryPredicate to an IgnoreLeftPredicate.
-     * @param <L>
-     * @param <R>
+     * @param <L> left type
+     * @param <R> right type
      * @param predicate to adapt
      * @return IgnoreLeftPredicate<L, R>
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreLeftProcedure.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class IgnoreLeftProcedure<L
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreLeftProcedure && equals((IgnoreLeftProcedure<?, ?>) that));
+        return that == this || (that instanceof IgnoreLeftProcedure<?, ?> && equals((IgnoreLeftProcedure<?, ?>) that));
     }
 
     /**
@@ -96,8 +96,8 @@ public final class IgnoreLeftProcedure<L
 
     /**
      * Adapt a UnaryProcedure to the BinaryProcedure interface.
-     * @param <L>
-     * @param <R>
+     * @param <L> left type
+     * @param <R> right type
      * @param procedure to adapt
      * @return IgnoreLeftProcedure<L, R>
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightFunction.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class IgnoreRightFunction<L
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreRightFunction && equals((IgnoreRightFunction<?, ?, ?>) that));
+        return that == this || (that instanceof IgnoreRightFunction<?, ?, ?> && equals((IgnoreRightFunction<?, ?, ?>) that));
     }
 
     /**
@@ -96,6 +96,9 @@ public final class IgnoreRightFunction<L
 
     /**
      * Adapt a UnaryFunction to the BinaryFunction interface.
+     * @param <L> left type
+     * @param <R> right type
+     * @param <T> result type
      * @param function UnaryFunction to adapt
      * @return IgnoreRightFunction
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightPredicate.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class IgnoreRightPredicate<
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreRightPredicate && equals((IgnoreRightPredicate<?, ?>) that));
+        return that == this || (that instanceof IgnoreRightPredicate<?, ?> && equals((IgnoreRightPredicate<?, ?>) that));
     }
 
     /**
@@ -96,8 +96,8 @@ public final class IgnoreRightPredicate<
 
     /**
      * Adapt a UnaryPredicate as an IgnoreRightPredicate
-     * @param <L>
-     * @param <R>
+     * @param <L> left type
+     * @param <R> right type
      * @param predicate to adapt
      * @return IgnoreRightPredicate<L, R>
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/IgnoreRightProcedure.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class IgnoreRightProcedure<
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IgnoreRightProcedure && equals((IgnoreRightProcedure<?, ?>) that));
+        return that == this || (that instanceof IgnoreRightProcedure<?, ?> && equals((IgnoreRightProcedure<?, ?>) that));
     }
 
     /**
@@ -96,6 +96,8 @@ public final class IgnoreRightProcedure<
 
     /**
      * Adapt a UnaryProcedure to the BinaryProcedure interface.
+     * @param <L> left type
+     * @param <R> right type
      * @param procedure UnaryProcedure to adapt
      * @return IgnoreRightProcedure
      */

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/PredicateUnaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class PredicateUnaryPredica
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof PredicateUnaryPredicate && equals((PredicateUnaryPredicate<?>) that));
+        return that == this || (that instanceof PredicateUnaryPredicate<?> && equals((PredicateUnaryPredicate<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureFunction.java Tue Aug  3 22:58:28 2010
@@ -65,7 +65,7 @@ public final class ProcedureFunction<T> 
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ProcedureFunction && equals((ProcedureFunction<?>) that));
+        return that == this || (that instanceof ProcedureFunction<?> && equals((ProcedureFunction<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/ProcedureUnaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -64,7 +64,7 @@ public final class ProcedureUnaryProcedu
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ProcedureUnaryProcedure && equals((ProcedureUnaryProcedure<?>) that));
+        return that == this || (that instanceof ProcedureUnaryProcedure<?> && equals((ProcedureUnaryProcedure<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -71,7 +71,7 @@ public final class UnaryFunctionUnaryPre
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof UnaryFunctionUnaryPredicate && equals((UnaryFunctionUnaryPredicate<?>) that));
+                || (that instanceof UnaryFunctionUnaryPredicate<?> && equals((UnaryFunctionUnaryPredicate<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryFunctionUnaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -68,7 +68,7 @@ public final class UnaryFunctionUnaryPro
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof UnaryFunctionUnaryProcedure && equals((UnaryFunctionUnaryProcedure<?>) that));
+                || (that instanceof UnaryFunctionUnaryProcedure<?> && equals((UnaryFunctionUnaryProcedure<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryPredicateUnaryFunction.java Tue Aug  3 22:58:28 2010
@@ -69,7 +69,7 @@ public final class UnaryPredicateUnaryFu
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof UnaryPredicateUnaryFunction && equals((UnaryPredicateUnaryFunction<?>) that));
+                || (that instanceof UnaryPredicateUnaryFunction<?> && equals((UnaryPredicateUnaryFunction<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/adapter/UnaryProcedureUnaryFunction.java Tue Aug  3 22:58:28 2010
@@ -66,7 +66,7 @@ public final class UnaryProcedureUnaryFu
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof UnaryProcedureUnaryFunction && equals((UnaryProcedureUnaryFunction<?, ?>) that));
+                || (that instanceof UnaryProcedureUnaryFunction<?, ?> && equals((UnaryProcedureUnaryFunction<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Constant.java Tue Aug  3 22:58:28 2010
@@ -119,7 +119,7 @@ public final class Constant<T> implement
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof Constant && equals((Constant<?>) that));
+        return that == this || (that instanceof Constant<?> && equals((Constant<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/Identity.java Tue Aug  3 22:58:28 2010
@@ -78,7 +78,7 @@ public final class Identity<T> implement
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return (that instanceof Identity);
+        return (that instanceof Identity<?>);
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsEqual.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsEqual.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsEqual.java Tue Aug  3 22:58:28 2010
@@ -66,7 +66,7 @@ public final class IsEqual<L, R> impleme
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsEqual;
+        return that instanceof IsEqual<?, ?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstance.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstance.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstance.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsInstance.java Tue Aug  3 22:58:28 2010
@@ -51,7 +51,7 @@ public final class IsInstance<T> impleme
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsInstance;
+        return that instanceof IsInstance<?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotEqual.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotEqual.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotEqual.java Tue Aug  3 22:58:28 2010
@@ -63,7 +63,7 @@ public final class IsNotEqual<L, R> impl
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsNotEqual;
+        return that instanceof IsNotEqual<?, ?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotNull.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotNull.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotNull.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotNull.java Tue Aug  3 22:58:28 2010
@@ -70,7 +70,7 @@ public final class IsNotNull<T> implemen
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsNotNull;
+        return that instanceof IsNotNull<?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotSame.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotSame.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotSame.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNotSame.java Tue Aug  3 22:58:28 2010
@@ -57,7 +57,7 @@ public final class IsNotSame<L, R> imple
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsNotSame;
+        return that instanceof IsNotSame<?, ?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNull.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNull.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNull.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsNull.java Tue Aug  3 22:58:28 2010
@@ -70,7 +70,7 @@ public final class IsNull<A> implements 
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsNull;
+        return that instanceof IsNull<?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsSame.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsSame.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsSame.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/IsSame.java Tue Aug  3 22:58:28 2010
@@ -57,7 +57,7 @@ public final class IsSame<L, R> implemen
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsSame;
+        return that instanceof IsSame<?, ?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FindWithinGenerator.java Tue Aug  3 22:58:28 2010
@@ -106,7 +106,7 @@ public final class FindWithinGenerator<E
         if (obj == this) {
             return true;
         }
-        if (obj instanceof FindWithinGenerator == false) {
+        if (obj instanceof FindWithinGenerator<?> == false) {
             return false;
         }
         FindWithinGenerator<?> other = (FindWithinGenerator<?>) obj;

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -115,7 +115,7 @@ public class FoldLeft<T> implements Unar
         if (obj == this) {
             return true;
         }
-        if (obj instanceof FoldLeft == false) {
+        if (obj instanceof FoldLeft<?> == false) {
             return false;
         }
         return ((FoldLeft<?>) obj).function.equals(function);

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -122,7 +122,7 @@ public class FoldRight<T> implements Una
         if (obj == this) {
             return true;
         }
-        if (obj instanceof FoldRight == false) {
+        if (obj instanceof FoldRight<?> == false) {
             return false;
         }
         return ((FoldRight<?>) obj).function.equals(function);

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/FilteredIterator.java Tue Aug  3 22:58:28 2010
@@ -97,7 +97,7 @@ public final class FilteredIterator<T> i
         if (obj == this) {
             return true;
         }
-        if (obj instanceof FilteredIterator == false) {
+        if (obj instanceof FilteredIterator<?> == false) {
             return false;
         }
         FilteredIterator<?> that = (FilteredIterator<?>) obj;

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsElementOf.java Tue Aug  3 22:58:28 2010
@@ -54,7 +54,7 @@ public final class IsElementOf<L, R> imp
      * {@inheritDoc}
      */
     public boolean test(L obj, R col) {
-        if (col instanceof Collection) {
+        if (col instanceof Collection<?>) {
             return testCollection(obj, (Collection<?>) col);
         }
         if (null != col && col.getClass().isArray()) {
@@ -70,7 +70,7 @@ public final class IsElementOf<L, R> imp
      * {@inheritDoc}
      */
     public boolean equals(Object obj) {
-        return (obj instanceof IsElementOf);
+        return (obj instanceof IsElementOf<?, ?>);
     }
 
     /**
@@ -134,7 +134,7 @@ public final class IsElementOf<L, R> imp
     public static <A> UnaryPredicate<A> instance(Object obj) {
         if (null == obj) {
             throw new NullPointerException("Argument must not be null");
-        } else if (obj instanceof Collection) {
+        } else if (obj instanceof Collection<?>) {
             return new RightBoundPredicate<A, Object>(new IsElementOf<A, Object>(), obj);
         } else if (obj.getClass().isArray()) {
             return new RightBoundPredicate<A, Object>(new IsElementOf<A, Object>(), obj);

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java Tue Aug  3 22:58:28 2010
@@ -51,10 +51,10 @@ public final class IsEmpty<A> implements
      * {@inheritDoc}
      */
     public boolean test(A obj) {
-        if (obj instanceof Collection) {
+        if (obj instanceof Collection<?>) {
             return testCollection((Collection<?>) obj);
         }
-        if (obj instanceof Map) {
+        if (obj instanceof Map<?, ?>) {
             return testMap((Map<?, ?>) obj);
         }
         if (obj instanceof String) {
@@ -73,7 +73,7 @@ public final class IsEmpty<A> implements
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof IsEmpty;
+        return that instanceof IsEmpty<?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java Tue Aug  3 22:58:28 2010
@@ -43,7 +43,7 @@ public final class Size<A> implements Un
      * {@inheritDoc}
      */
     public Integer evaluate(Object obj) {
-        if (obj instanceof Collection) {
+        if (obj instanceof Collection<?>) {
             return evaluate((Collection<?>) obj);
         }
         if (obj instanceof String) {
@@ -62,7 +62,7 @@ public final class Size<A> implements Un
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that instanceof Size;
+        return that instanceof Size<?>;
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java Tue Aug  3 22:58:28 2010
@@ -85,7 +85,7 @@ public final class TransformedIterator<E
         if (obj == this) {
             return true;
         }
-        if (obj instanceof TransformedIterator == false) {
+        if (obj instanceof TransformedIterator<?, ?> == false) {
             return false;
         }
         TransformedIterator<?, ?> that = (TransformedIterator<?, ?>) obj;

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparatorFunction.java Tue Aug  3 22:58:28 2010
@@ -58,7 +58,7 @@ public final class ComparatorFunction<T>
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ComparatorFunction && equals((ComparatorFunction<?>) that));
+        return that == this || (that instanceof ComparatorFunction<?> && equals((ComparatorFunction<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java Tue Aug  3 22:58:28 2010
@@ -81,7 +81,7 @@ public final class IsEquivalent<T> imple
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsEquivalent && equals((IsEquivalent<?>) that));
+        return that == this || (that instanceof IsEquivalent<?> && equals((IsEquivalent<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java Tue Aug  3 22:58:28 2010
@@ -79,7 +79,7 @@ public final class IsGreaterThan<T> impl
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsGreaterThan && equals((IsGreaterThan<?>) that));
+        return that == this || (that instanceof IsGreaterThan<?> && equals((IsGreaterThan<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java Tue Aug  3 22:58:28 2010
@@ -80,7 +80,7 @@ public final class IsGreaterThanOrEqual<
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsGreaterThanOrEqual && equals((IsGreaterThanOrEqual<?>) that));
+        return that == this || (that instanceof IsGreaterThanOrEqual<?> && equals((IsGreaterThanOrEqual<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java Tue Aug  3 22:58:28 2010
@@ -79,7 +79,7 @@ public final class IsLessThan<T> impleme
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsLessThan && equals((IsLessThan<?>) that));
+        return that == this || (that instanceof IsLessThan<?> && equals((IsLessThan<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java Tue Aug  3 22:58:28 2010
@@ -79,7 +79,7 @@ public final class IsLessThanOrEqual<T> 
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsLessThanOrEqual && equals((IsLessThanOrEqual<?>) that));
+        return that == this || (that instanceof IsLessThanOrEqual<?> && equals((IsLessThanOrEqual<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java Tue Aug  3 22:58:28 2010
@@ -81,7 +81,7 @@ public final class IsNotEquivalent<T> im
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof IsNotEquivalent && equals((IsNotEquivalent<?>) that));
+        return that == this || (that instanceof IsNotEquivalent<?> && equals((IsNotEquivalent<?>) that));
     }
 
     /**

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -81,7 +81,7 @@ public class IsWithinRange<A extends Com
         if (this == o) {
             return true;
         }
-        if (!(o instanceof IsWithinRange)) {
+        if (!(o instanceof IsWithinRange<?>)) {
             return false;
         }
         final IsWithinRange<?> isWithinRange = (IsWithinRange<?>) o;

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java Tue Aug  3 22:58:28 2010
@@ -68,7 +68,7 @@ public final class Max<T> implements Bin
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof Max && equals((Max<?>) that));
+        return that == this || (that instanceof Max<?> && equals((Max<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java Tue Aug  3 22:58:28 2010
@@ -68,7 +68,7 @@ public final class Min<T> implements Bin
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof Min && equals((Min<?>) that));
+        return that == this || (that instanceof Min<?> && equals((Min<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryAnd.java Tue Aug  3 22:58:28 2010
@@ -105,7 +105,7 @@ public final class BinaryAnd<L, R> exten
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof BinaryAnd && equals((BinaryAnd<?, ?>) that));
+        return that == this || (that instanceof BinaryAnd<?, ?> && equals((BinaryAnd<?, ?>) that));
     }
 
     /**

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -102,7 +102,7 @@ public class BinaryCompositeBinaryFuncti
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof BinaryCompositeBinaryFunction && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that));
+                || (that instanceof BinaryCompositeBinaryFunction<?, ?, ?> && equals((BinaryCompositeBinaryFunction<?, ?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryNot.java Tue Aug  3 22:58:28 2010
@@ -65,7 +65,7 @@ public final class BinaryNot<L, R> imple
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof BinaryNot && equals((BinaryNot<?, ?>) that));
+        return that == this || (that instanceof BinaryNot<?, ?> && equals((BinaryNot<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryOr.java Tue Aug  3 22:58:28 2010
@@ -105,7 +105,7 @@ public final class BinaryOr<L, R> extend
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof BinaryOr && equals((BinaryOr<?, ?>) that));
+        return that == this || (that instanceof BinaryOr<?, ?> && equals((BinaryOr<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java?rev=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -97,7 +97,7 @@ public class BinarySequence<L, R> implem
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof BinarySequence && equals((BinarySequence<?, ?>) that));
+        return that == this || (that instanceof BinarySequence<?, ?> && equals((BinarySequence<?, ?>) that));
     }
 
     /**

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -82,7 +82,7 @@ public class CompositeUnaryFunction<A, T
          */
         @Override
         public boolean equals(Object obj) {
-            return obj == this || obj instanceof Helper && equals((Helper<?>) obj);
+            return obj == this || obj instanceof CompositeUnaryFunction<?, ?>.Helper<?> && equals((Helper<?>) obj);
         }
 
         private boolean equals(Helper<?> helper) {
@@ -124,7 +124,8 @@ public class CompositeUnaryFunction<A, T
         this.function = function;
     }
 
-    private <X> CompositeUnaryFunction(UnaryFunction<? super X, ? extends T> following, UnaryFunction<? super A, ? extends X> preceding) {
+    private <X> CompositeUnaryFunction(UnaryFunction<? super X, ? extends T> following,
+            UnaryFunction<? super A, ? extends X> preceding) {
         this.function = new Helper<X>(following, preceding);
     }
 
@@ -152,7 +153,8 @@ public class CompositeUnaryFunction<A, T
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof CompositeUnaryFunction && equals((CompositeUnaryFunction<?, ?>) that));
+        return that == this
+                || (that instanceof CompositeUnaryFunction<?, ?> && equals((CompositeUnaryFunction<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -95,7 +95,7 @@ public final class CompositeUnaryPredica
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof CompositeUnaryPredicate && equals((CompositeUnaryPredicate<?>) that));
+        return that == this || (that instanceof CompositeUnaryPredicate<?> && equals((CompositeUnaryPredicate<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -91,7 +91,7 @@ public final class CompositeUnaryProcedu
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof CompositeUnaryProcedure && equals((CompositeUnaryProcedure<?>) that));
+        return that == this || (that instanceof CompositeUnaryProcedure<?> && equals((CompositeUnaryProcedure<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java Tue Aug  3 22:58:28 2010
@@ -87,7 +87,7 @@ public final class ConditionalBinaryFunc
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ConditionalBinaryFunction && equals((ConditionalBinaryFunction<?, ?, ?>) that));
+        return that == this || (that instanceof ConditionalBinaryFunction<?, ?, ?> && equals((ConditionalBinaryFunction<?, ?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -79,7 +79,7 @@ public final class ConditionalBinaryPred
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof ConditionalBinaryPredicate && equals((ConditionalBinaryPredicate<?, ?>) that));
+                || (that instanceof ConditionalBinaryPredicate<?, ?> && equals((ConditionalBinaryPredicate<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -61,7 +61,7 @@ public final class ConditionalBinaryProc
             BinaryProcedure<? super L, ? super R> thenProc) {
         this(ifPred, thenProc, NoOp.instance());
     }
-    
+
     /**
      * Create a new ConditionalBinaryProcedure.
      * @param ifPred to evaluate
@@ -100,7 +100,7 @@ public final class ConditionalBinaryProc
      */
     public boolean equals(Object that) {
         return that == this
-                || (that instanceof ConditionalBinaryProcedure && equals((ConditionalBinaryProcedure<?, ?>) that));
+                || (that instanceof ConditionalBinaryProcedure<?, ?> && equals((ConditionalBinaryProcedure<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java Tue Aug  3 22:58:28 2010
@@ -85,7 +85,7 @@ public final class ConditionalFunction<T
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ConditionalFunction && equals((ConditionalFunction<?>) that));
+        return that == this || (that instanceof ConditionalFunction<?> && equals((ConditionalFunction<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryFunction.java Tue Aug  3 22:58:28 2010
@@ -86,7 +86,7 @@ public final class ConditionalUnaryFunct
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ConditionalUnaryFunction && equals((ConditionalUnaryFunction<?, ?>) that));
+        return that == this || (that instanceof ConditionalUnaryFunction<?, ?> && equals((ConditionalUnaryFunction<?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryPredicate.java Tue Aug  3 22:58:28 2010
@@ -78,7 +78,7 @@ public final class ConditionalUnaryPredi
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ConditionalUnaryPredicate && equals((ConditionalUnaryPredicate<?>) that));
+        return that == this || (that instanceof ConditionalUnaryPredicate<?> && equals((ConditionalUnaryPredicate<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalUnaryProcedure.java Tue Aug  3 22:58:28 2010
@@ -94,7 +94,7 @@ public final class ConditionalUnaryProce
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof ConditionalUnaryProcedure && equals((ConditionalUnaryProcedure<?>) that));
+        return that == this || (that instanceof ConditionalUnaryProcedure<?> && equals((ConditionalUnaryProcedure<?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransformedBinaryFunction.java?rev=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -78,7 +78,7 @@ public class TransformedBinaryFunction<L
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof TransformedBinaryFunction
+        return obj == this || obj instanceof TransformedBinaryFunction<?, ?, ?>
                 && equals((TransformedBinaryFunction<?, ?, ?>) obj);
     }
 

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -79,7 +79,7 @@ public class TransformedBinaryProcedure<
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof TransformedBinaryProcedure
+        return obj == this || obj instanceof TransformedBinaryProcedure<?, ?>
                 && equals((TransformedBinaryProcedure<?, ?>) obj);
     }
 

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -78,7 +78,7 @@ public class TransformedFunction<T> impl
      */
     @Override
     public boolean equals(Object obj) {
-        return obj == this || obj instanceof TransformedFunction && equals((TransformedFunction<?>) obj);
+        return obj == this || obj instanceof TransformedFunction<?> && equals((TransformedFunction<?>) obj);
     }
 
     /**

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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -70,7 +70,7 @@ public class TransposedFunction<L, R, T>
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof TransposedFunction && equals((TransposedFunction<?, ?, ?>) that));
+        return that == this || (that instanceof TransposedFunction<?, ?, ?> && equals((TransposedFunction<?, ?, ?>) that));
     }
 
     /**

Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/TransposedPredicate.java?rev=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -70,7 +70,7 @@ public class TransposedPredicate<L, R> i
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof TransposedPredicate && equals((TransposedPredicate<?, ?>) that));
+        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=982061&r1=982060&r2=982061&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 Tue Aug  3 22:58:28 2010
@@ -70,7 +70,7 @@ public class TransposedProcedure<L, R> i
      * {@inheritDoc}
      */
     public boolean equals(Object that) {
-        return that == this || (that instanceof TransposedProcedure && equals((TransposedProcedure<?, ?>) that));
+        return that == this || (that instanceof TransposedProcedure<?, ?> && equals((TransposedProcedure<?, ?>) that));
     }
 
     /**



Mime
View raw message