github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3185 from HanClinto/CMH-FixPredicate

Browse source 
Fix for "Inference variable T#1 has incompatible bounds"
This commit is contained in:
Derek M 2017-04-20 04:37:23 -04:00 committed by GitHub
commit e9d31aa93c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/main/java/mage/filter/predicate/Predicates.java
View file

@ -52,7 +52,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> not(Predicate<T> predicate) {
return new NotPredicate<>(predicate);
return new NotPredicate<T>(predicate);
}
/**
@ -65,7 +65,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> and(Iterable<? extends Predicate<? super T>> components) {
return new AndPredicate<>(defensiveCopy(components));
return new AndPredicate<T>(defensiveCopy(components));
}
/**
@ -78,7 +78,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> and(Predicate<? super T>... components) {
return new AndPredicate<>(defensiveCopy(components));
return new AndPredicate<T>(defensiveCopy(components));
}
/**
@ -91,7 +91,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> and(Predicate<? super T> first, Predicate<? super T> second) {
return new AndPredicate<>(Predicates.<T>asList(checkNotNull(first), checkNotNull(second)));
return new AndPredicate<T>(Predicates.<T>asList(checkNotNull(first), checkNotNull(second)));
}
/**
@ -104,7 +104,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> or(Iterable<? extends Predicate<? super T>> components) {
return new OrPredicate<>(defensiveCopy(components));
return new OrPredicate<T>(defensiveCopy(components));
}
/**
@ -117,7 +117,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> or(Predicate<? super T>... components) {
return new OrPredicate<>(defensiveCopy(components));
return new OrPredicate<T>(defensiveCopy(components));
}
/**
@ -129,7 +129,7 @@ public final class Predicates {
* @return
*/
public static <T> Predicate<T> or(Predicate<? super T> first, Predicate<? super T> second) {
return new OrPredicate<>(Predicates.<T>asList(first, second));
return new OrPredicate<T>(Predicates.<T>asList(first, second));
}
/**
@ -221,7 +221,7 @@ public final class Predicates {
}
static <T> List<T> defensiveCopy(Iterable<T> iterable) {
ArrayList<T> list = new ArrayList<>();
ArrayList<T> list = new ArrayList<T>();
for (T element : iterable) {
list.add(checkNotNull(element));
}