From 08ab364c4e4fe8ccab69eb7fb655fc2da6eea6ea Mon Sep 17 00:00:00 2001 From: Krazy Date: Sat, 16 Aug 2014 15:18:00 +0000 Subject: [PATCH] Fix to respect inverting filters. --- forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java index c0592732441..0bbf94f711f 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java @@ -39,7 +39,7 @@ public class SFilterUtil { Predicate filter = expression.evaluate(); if (filter != null) { - return Predicates.compose(filter, PaperCard.FN_GET_RULES); + return Predicates.compose(invert ? Predicates.not(filter) : filter, PaperCard.FN_GET_RULES); } String[] splitText = text.replaceAll(",", "").replaceAll(" ", " ").split(" "); @@ -256,7 +256,7 @@ public class SFilterUtil { } private Predicate evaluateValue(String value) { - List> predicates = new ArrayList>(); + List> predicates = new ArrayList<>(); if (inName) { predicates.add(CardRulesPredicates.name(StringOp.CONTAINS_IC, value)); }