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

Temporary fix for multiple search terms being treated as one.

Browse Source
This commit is contained in:
Krazy
2014-08-19 21:24:36 +00:00
parent abed6a4024
commit 3f35cb25c3
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,11 +35,15 @@ public class SFilterUtil {
return Predicates.alwaysTrue(); return Predicates.alwaysTrue();
} }
BooleanExpression expression = new BooleanExpression(text, inName, inType, inText, inCost); if (BooleanExpression.isExpression(text)) {
Predicate<CardRules> filter = expression.evaluate(); BooleanExpression expression = new BooleanExpression(text, inName, inType, inText, inCost);
if (filter != null) {
return Predicates.compose(invert ? Predicates.not(filter) : filter, PaperCard.FN_GET_RULES); Predicate<CardRules> filter = expression.evaluate();
if (filter != null) {
return Predicates.compose(invert ? Predicates.not(filter) : filter, PaperCard.FN_GET_RULES);
}
} }
String[] splitText = text.replaceAll(",", "").replaceAll(" ", " ").split(" "); String[] splitText = text.replaceAll(",", "").replaceAll(" ", " ").split(" ");
@@ -123,6 +127,10 @@ public class SFilterUtil {
parse(); parse();
} }
private static boolean isExpression(String text) {
return text.contains(Operation.AND.token) || text.contains(Operation.OR.token);
}
private void parse() { private void parse() {
Tokenizer tokenizer = new Tokenizer(text); Tokenizer tokenizer = new Tokenizer(text);