From 48cde05cfff99a6f318fe04ff6883f13fc42126b Mon Sep 17 00:00:00 2001 From: Clint Herron Date: Wed, 19 Apr 2017 22:55:48 -0400 Subject: [PATCH] Fixing additional instances where unspecified types could lead to errors --- .../java/mage/filter/predicate/Predicates.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage/src/main/java/mage/filter/predicate/Predicates.java b/Mage/src/main/java/mage/filter/predicate/Predicates.java index f17932b7145..c37eaa16276 100644 --- a/Mage/src/main/java/mage/filter/predicate/Predicates.java +++ b/Mage/src/main/java/mage/filter/predicate/Predicates.java @@ -52,7 +52,7 @@ public final class Predicates { * @return */ public static Predicate not(Predicate predicate) { - return new NotPredicate<>(predicate); + return new NotPredicate(predicate); } /** @@ -65,7 +65,7 @@ public final class Predicates { * @return */ public static Predicate and(Iterable> components) { - return new AndPredicate<>(defensiveCopy(components)); + return new AndPredicate(defensiveCopy(components)); } /** @@ -78,7 +78,7 @@ public final class Predicates { * @return */ public static Predicate and(Predicate... components) { - return new AndPredicate<>(defensiveCopy(components)); + return new AndPredicate(defensiveCopy(components)); } /** @@ -91,7 +91,7 @@ public final class Predicates { * @return */ public static Predicate and(Predicate first, Predicate second) { - return new AndPredicate<>(Predicates.asList(checkNotNull(first), checkNotNull(second))); + return new AndPredicate(Predicates.asList(checkNotNull(first), checkNotNull(second))); } /** @@ -104,7 +104,7 @@ public final class Predicates { * @return */ public static Predicate or(Iterable> components) { - return new OrPredicate<>(defensiveCopy(components)); + return new OrPredicate(defensiveCopy(components)); } /** @@ -129,7 +129,7 @@ public final class Predicates { * @return */ public static Predicate or(Predicate first, Predicate second) { - return new OrPredicate<>(Predicates.asList(first, second)); + return new OrPredicate(Predicates.asList(first, second)); } /** @@ -221,7 +221,7 @@ public final class Predicates { } static List defensiveCopy(Iterable iterable) { - ArrayList list = new ArrayList<>(); + ArrayList list = new ArrayList(); for (T element : iterable) { list.add(checkNotNull(element)); }