external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to respect inverting filters.

Browse Source
This commit is contained in:
Krazy
2014-08-16 15:18:00 +00:00
parent 674d4486d2
commit 08ab364c4e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
View File

@@ -39,7 +39,7 @@ public class SFilterUtil {
Predicate<CardRules> filter = expression.evaluate(); Predicate<CardRules> filter = expression.evaluate();
if (filter != null) { 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(" "); String[] splitText = text.replaceAll(",", "").replaceAll(" ", " ").split(" ");
@@ -256,7 +256,7 @@ public class SFilterUtil {
} }
private Predicate<CardRules> evaluateValue(String value) { private Predicate<CardRules> evaluateValue(String value) {
List<Predicate<CardRules>> predicates = new ArrayList<Predicate<CardRules>>(); List<Predicate<CardRules>> predicates = new ArrayList<>();
if (inName) { if (inName) {
predicates.add(CardRulesPredicates.name(StringOp.CONTAINS_IC, value)); predicates.add(CardRulesPredicates.name(StringOp.CONTAINS_IC, value));
} }