You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2012/07/15 10:50:52 UTC
svn commit: r1361659 -
/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Author: tn
Date: Sun Jul 15 08:50:52 2012
New Revision: 1361659
URL: http://svn.apache.org/viewvc?rev=1361659&view=rev
Log:
Fix compilation problem with jdk1.5 wrt generics.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java?rev=1361659&r1=1361658&r2=1361659&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java Sun Jul 15 08:50:52 2012
@@ -361,7 +361,7 @@ public class PredicateUtils {
*/
public static <T> Predicate<T> eitherPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
@SuppressWarnings("unchecked")
- Predicate<T> onePredicate = onePredicate(predicate1, predicate2);
+ Predicate<T> onePredicate = PredicateUtils.<T>onePredicate(predicate1, predicate2);
return onePredicate;
}
@@ -410,7 +410,7 @@ public class PredicateUtils {
*/
public static <T> Predicate<T> neitherPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
@SuppressWarnings("unchecked")
- Predicate<T> nonePredicate = nonePredicate(predicate1, predicate2);
+ Predicate<T> nonePredicate = PredicateUtils.<T>nonePredicate(predicate1, predicate2);
return nonePredicate;
}