You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2010/08/04 00:58:31 UTC
svn commit: r982061 [2/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...
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryAnd.java Tue Aug 3 22:58:28 2010
@@ -104,7 +104,7 @@ public final class UnaryAnd<A> extends B
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof UnaryAnd && equals((UnaryAnd<?>) that));
+ return that == this || (that instanceof UnaryAnd<?> && equals((UnaryAnd<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryFunction.java Tue Aug 3 22:58:28 2010
@@ -101,7 +101,7 @@ public class UnaryCompositeBinaryFunctio
*/
public boolean equals(Object that) {
return that == this
- || (that instanceof UnaryCompositeBinaryFunction && equals((UnaryCompositeBinaryFunction<?, ?, ?>) that));
+ || (that instanceof UnaryCompositeBinaryFunction<?, ?, ?> && equals((UnaryCompositeBinaryFunction<?, ?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryCompositeBinaryPredicate.java Tue Aug 3 22:58:28 2010
@@ -102,7 +102,7 @@ public class UnaryCompositeBinaryPredica
*/
public boolean equals(Object that) {
return that == this
- || (that instanceof UnaryCompositeBinaryPredicate && equals((UnaryCompositeBinaryPredicate<?, ?>) that));
+ || (that instanceof UnaryCompositeBinaryPredicate<?, ?> && equals((UnaryCompositeBinaryPredicate<?, ?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryNot.java Tue Aug 3 22:58:28 2010
@@ -65,7 +65,7 @@ public final class UnaryNot<A> implement
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof UnaryNot && equals((UnaryNot<?>) that));
+ return that == this || (that instanceof UnaryNot<?> && equals((UnaryNot<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnaryOr.java Tue Aug 3 22:58:28 2010
@@ -104,7 +104,7 @@ public final class UnaryOr<A> extends Ba
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof UnaryOr && equals((UnaryOr<?>) that));
+ return that == this || (that instanceof UnaryOr<?> && equals((UnaryOr<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/UnarySequence.java Tue Aug 3 22:58:28 2010
@@ -99,7 +99,7 @@ public class UnarySequence<A> implements
* {@inheritDoc}
*/
public boolean equals(Object that) {
- return that == this || (that instanceof UnarySequence && equals((UnarySequence<?>) that));
+ return that == this || (that instanceof UnarySequence<?> && equals((UnarySequence<?>) that));
}
/**
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/FilteredGenerator.java Tue Aug 3 22:58:28 2010
@@ -68,7 +68,7 @@ public class FilteredGenerator<E> extend
if (obj == this) {
return true;
}
- if (obj instanceof FilteredGenerator == false) {
+ if (obj instanceof FilteredGenerator<?> == false) {
return false;
}
FilteredGenerator<?> other = (FilteredGenerator<?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateUntil.java Tue Aug 3 22:58:28 2010
@@ -74,7 +74,7 @@ public class GenerateUntil<E> extends Ba
if (obj == this) {
return true;
}
- if (obj instanceof GenerateUntil == false) {
+ if (obj instanceof GenerateUntil<?> == false) {
return false;
}
GenerateUntil<?> other = (GenerateUntil<?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/GenerateWhile.java Tue Aug 3 22:58:28 2010
@@ -74,7 +74,7 @@ public class GenerateWhile<E> extends Ba
if (obj == this) {
return true;
}
- if (obj instanceof GenerateWhile == false) {
+ if (obj instanceof GenerateWhile<?> == false) {
return false;
}
GenerateWhile<?> other = (GenerateWhile<?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/IteratorToGeneratorAdapter.java Tue Aug 3 22:58:28 2010
@@ -66,7 +66,7 @@ public final class IteratorToGeneratorAd
if (obj == this) {
return true;
}
- if (obj instanceof IteratorToGeneratorAdapter == false) {
+ if (obj instanceof IteratorToGeneratorAdapter<?> == false) {
return false;
}
IteratorToGeneratorAdapter<?> that = (IteratorToGeneratorAdapter<?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/TransformedGenerator.java Tue Aug 3 22:58:28 2010
@@ -70,7 +70,7 @@ public class TransformedGenerator<I, E>
if (obj == this) {
return true;
}
- if (obj instanceof TransformedGenerator == false) {
+ if (obj instanceof TransformedGenerator<?, ?> == false) {
return false;
}
TransformedGenerator<?, ?> other = (TransformedGenerator<?, ?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/UntilGenerate.java Tue Aug 3 22:58:28 2010
@@ -75,7 +75,7 @@ public class UntilGenerate<E> extends Ba
if (obj == this) {
return true;
}
- if (obj instanceof UntilGenerate == false) {
+ if (obj instanceof UntilGenerate<?> == false) {
return false;
}
UntilGenerate<?> other = (UntilGenerate<?>) obj;
Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java?rev=982061&r1=982060&r2=982061&view=diff
==============================================================================
--- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java (original)
+++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/generator/WhileGenerate.java Tue Aug 3 22:58:28 2010
@@ -75,7 +75,7 @@ public class WhileGenerate<E> extends Ba
if (obj == this) {
return true;
}
- if (obj instanceof WhileGenerate == false) {
+ if (obj instanceof WhileGenerate<?> == false) {
return false;
}
WhileGenerate<?> other = (WhileGenerate<?>) obj;