Author: tn
Date: Mon Jan 21 20:41:58 2013
New Revision: 1436601
URL: http://svn.apache.org/viewvc?rev=1436601&view=rev
Log:
Fix compilation problems with OpenJDK 1.6.0_24.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java?rev=1436601&r1=1436600&r2=1436601&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/AbstractQuantifierPredicate.java
Mon Jan 21 20:41:58 2013
@@ -51,7 +51,7 @@ public abstract class AbstractQuantifier
* @since 3.1
*/
public Predicate<? super T>[] getPredicates() {
- return FunctorUtils.copy(iPredicates);
+ return FunctorUtils.<T>copy(iPredicates);
}
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java?rev=1436601&r1=1436600&r2=1436601&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
Mon Jan 21 20:41:58 2013
@@ -110,7 +110,7 @@ public class ChainedClosure<E> implement
* @since 3.1
*/
public Closure<? super E>[] getClosures() {
- return FunctorUtils.copy(iClosures);
+ return FunctorUtils.<E>copy(iClosures);
}
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java?rev=1436601&r1=1436600&r2=1436601&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
Mon Jan 21 20:41:58 2013
@@ -111,7 +111,7 @@ public class ChainedTransformer<T> imple
* @since 3.1
*/
public Transformer<? super T, ? extends T>[] getTransformers() {
- return FunctorUtils.copy(iTransformers);
+ return FunctorUtils.<T, T>copy(iTransformers);
}
}
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java?rev=1436601&r1=1436600&r2=1436601&view=diff
==============================================================================
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
Mon Jan 21 20:41:58 2013
@@ -146,7 +146,7 @@ public class SwitchClosure<E> implements
* @since 3.1
*/
public Predicate<? super E>[] getPredicates() {
- return FunctorUtils.copy(iPredicates);
+ return FunctorUtils.<E>copy(iPredicates);
}
/**
@@ -156,7 +156,7 @@ public class SwitchClosure<E> implements
* @since 3.1
*/
public Closure<? super E>[] getClosures() {
- return FunctorUtils.copy(iClosures);
+ return FunctorUtils.<E>copy(iClosures);
}
/**