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

Merge pull request #8694 from kevlahnota/master4

Browse Source 
fix Keyword Advanced Search
This commit is contained in:
kevlahnota
2025-09-11 19:04:51 +08:00
committed by GitHub
parent 10618d4f31 1dbd358c19
commit 50f34442f6
2 changed files with 200 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/keyword/Keyword.java
View File

@@ -278,6 +278,12 @@ public enum Keyword {
return keywords;
}
public static Keyword get(String key) {
if (key.isEmpty())
return null;
return Arrays.stream(values()).filter(k -> key.equalsIgnoreCase(k.displayName)).findFirst().orElse(null);
}
private static final Map<String, Set<Keyword>> cardKeywordSetLookup = new HashMap<>();
public static Set<Keyword> getKeywordSet(PaperCard card) {

264
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -57,6 +57,7 @@ public class AdvancedSearch {
protected String getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
Set<String> names = new HashSet<>();
@@ -77,6 +78,7 @@ public class AdvancedSearch {
protected String getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
Set<String> names = new HashSet<>();
@@ -98,22 +100,31 @@ public class AdvancedSearch {
protected Keyword getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<Keyword> getItemValues(PaperCard input) {
CardSplitType cardSplitType = input.getRules().getSplitType();
if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
Set<Keyword> keywords = new HashSet<>();
if (cardSplitType != CardSplitType.None && cardSplitType != CardSplitType.Split) {
if (input.getRules().getOtherPart() != null) {
PaperCard otherPart = FModel.getMagicDb().getCommonCards().getCard(input.getRules().getOtherPart().getName());
if (otherPart != null) {
keywords.addAll(Keyword.getKeywordSet(otherPart));
keywords.addAll(Keyword.getKeywordSet(input));
if (input.getRules().getOtherPart().getKeywords() != null) {
for (String key : input.getRules().getOtherPart().getKeywords()) {
Keyword keyword = Keyword.get(key);
if (keyword != null)
keywords.add(keyword);
}
}
}
}
if (input.getRules().getMainPart().getKeywords() != null) {
for (String key : input.getRules().getMainPart().getKeywords()) {
Keyword keyword = Keyword.get(key);
if (keyword != null)
keywords.add(keyword);
}
}
return keywords;
}
return Keyword.getKeywordSet(input);
}
}),
CARD_SET("lblSet", PaperCard.class, FilterOperator.SINGLE_LIST_OPS, new CustomListEvaluator<PaperCard, CardEdition>(FModel.getMagicDb().getSortedEditions(), CardEdition::getCode) {
@Override
@@ -121,11 +132,12 @@ public class AdvancedSearch {
return FModel.getMagicDb().getCardEdition(input.getEdition());
}
}),
CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
CARD_FORMAT("lblFormat", PaperCard.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<PaperCard, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
@Override
protected GameFormat getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<GameFormat> getItemValues(PaperCard input) {
return FModel.getFormats().getAllFormatsOfCard(input);
@@ -136,6 +148,7 @@ public class AdvancedSearch {
protected ConquestPlane getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<ConquestPlane> getItemValues(PaperCard input) {
return ConquestPlane.getAllPlanesOfCard(input);
@@ -146,6 +159,7 @@ public class AdvancedSearch {
protected ConquestRegion getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<ConquestRegion> getItemValues(PaperCard input) {
return ConquestRegion.getAllRegionsOfCard(input);
@@ -156,6 +170,7 @@ public class AdvancedSearch {
protected QuestWorld getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<QuestWorld> getItemValues(PaperCard input) {
return QuestWorld.getAllQuestWorldsOfCard(input);
@@ -166,6 +181,7 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(PaperCard input) {
return input.getRules().getColor().toEnumSet();
@@ -176,6 +192,7 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(PaperCard input) {
return input.getRules().getColorIdentity().toEnumSet();
@@ -192,6 +209,7 @@ public class AdvancedSearch {
protected String getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
final CardType type = input.getRules().getType();
@@ -228,6 +246,7 @@ public class AdvancedSearch {
protected String getItemValue(PaperCard input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(PaperCard input) {
CardSplitType cardSplitType = input.getRules().getSplitType();
@@ -243,7 +262,7 @@ public class AdvancedSearch {
return subtypes;
}
}
return (Set<String>)input.getRules().getType().getSubtypes();
return (Set<String>) input.getRules().getType().getSubtypes();
}
}),
CARD_CMC("lblCMC", PaperCard.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<PaperCard>(0, 20) {
@@ -294,7 +313,9 @@ public class AdvancedSearch {
@Override
protected Boolean getItemValue(PaperCard input) {
List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
if (cards.size() <= 1) { return true; }
if (cards.size() <= 1) {
return true;
}
cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
return cards.get(0) == input;
@@ -318,7 +339,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return "";
}
return ((PaperCard)input).getRules().getOracleText();
return ((PaperCard) input).getRules().getOracleText();
}
}),
INVITEM_KEYWORDS("lblKeywords", InventoryItem.class, FilterOperator.COLLECTION_OPS, new CustomListEvaluator<InventoryItem, Keyword>(Keyword.getAllKeywords()) {
@@ -326,38 +347,40 @@ public class AdvancedSearch {
protected Keyword getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<Keyword> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return Keyword.getKeywordSet((PaperCard)input);
return Keyword.getKeywordSet((PaperCard) input);
}
}),
INVITEM_SET("lblSet", InventoryItem.class, FilterOperator.SINGLE_LIST_OPS, new CustomListEvaluator<InventoryItem, CardEdition>(FModel.getMagicDb().getSortedEditions(), CardEdition::getCode) {
@Override
protected CardEdition getItemValue(InventoryItem input) {
if (input instanceof PaperCard) {
CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard)input).getEdition());
CardEdition set = FModel.getMagicDb().getEditions().get(((PaperCard) input).getEdition());
return set;
} else if (input instanceof SealedProduct) {
return FModel.getMagicDb().getEditions().get(((SealedProduct)input).getEdition());
return FModel.getMagicDb().getEditions().get(((SealedProduct) input).getEdition());
} else {
return CardEdition.UNKNOWN;
}
}
}),
INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
INVITEM_FORMAT("lblFormat", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
@Override
protected GameFormat getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<GameFormat> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return FModel.getFormats().getAllFormatsOfCard((PaperCard)input);
return FModel.getFormats().getAllFormatsOfCard((PaperCard) input);
}
}),
INVITEM_PLANE("lblPlane", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestPlane>(ImmutableList.copyOf(FModel.getPlanes())) {
@@ -365,12 +388,13 @@ public class AdvancedSearch {
protected ConquestPlane getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<ConquestPlane> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return ConquestPlane.getAllPlanesOfCard((PaperCard)input);
return ConquestPlane.getAllPlanesOfCard((PaperCard) input);
}
}),
INVITEM_REGION("lblRegion", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, ConquestRegion>(ConquestRegion.getAllRegions()) {
@@ -378,12 +402,13 @@ public class AdvancedSearch {
protected ConquestRegion getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<ConquestRegion> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return ConquestRegion.getAllRegionsOfCard((PaperCard)input);
return ConquestRegion.getAllRegionsOfCard((PaperCard) input);
}
}),
INVITEM_QUEST_WORLD("lblQuestWorld", InventoryItem.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<InventoryItem, QuestWorld>(ImmutableList.copyOf(FModel.getWorlds())) {
@@ -391,12 +416,13 @@ public class AdvancedSearch {
protected QuestWorld getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<QuestWorld> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return QuestWorld.getAllQuestWorldsOfCard(((PaperCard)input));
return QuestWorld.getAllQuestWorldsOfCard(((PaperCard) input));
}
}),
INVITEM_COLOR("lblColor", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -404,12 +430,13 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return ((PaperCard)input).getRules().getColor().toEnumSet();
return ((PaperCard) input).getRules().getColor().toEnumSet();
}
}),
INVITEM_COLOR_IDENTITY("lblColorIdentity", InventoryItem.class, FilterOperator.COMBINATION_OPS, new ColorEvaluator<InventoryItem>() {
@@ -417,12 +444,13 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return ((PaperCard)input).getRules().getColorIdentity().toEnumSet();
return ((PaperCard) input).getRules().getColorIdentity().toEnumSet();
}
}),
INVITEM_COLOR_COUNT("lblColorCount", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 5) {
@@ -431,7 +459,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return 0;
}
return ((PaperCard)input).getRules().getColor().countColors();
return ((PaperCard) input).getRules().getColor().countColors();
}
}),
INVITEM_TYPE("lblType", InventoryItem.class, FilterOperator.COMBINATION_OPS, new CustomListEvaluator<InventoryItem, String>(CardType.getCombinedSuperAndCoreTypes()) {
@@ -439,12 +467,13 @@ public class AdvancedSearch {
protected String getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
final CardType type = ((PaperCard)input).getRules().getType();
final CardType type = ((PaperCard) input).getRules().getType();
final Set<String> types = new HashSet<>();
for (Supertype t : type.getSupertypes()) {
types.add(t.name());
@@ -460,12 +489,13 @@ public class AdvancedSearch {
protected String getItemValue(InventoryItem input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<String> getItemValues(InventoryItem input) {
if (!(input instanceof PaperCard)) {
return new HashSet<>();
}
return (Set<String>)((PaperCard)input).getRules().getType().getSubtypes();
return (Set<String>) ((PaperCard) input).getRules().getType().getSubtypes();
}
}),
INVITEM_CMC("lblCMC", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -474,7 +504,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return 0;
}
return ((PaperCard)input).getRules().getManaCost().getCMC();
return ((PaperCard) input).getRules().getManaCost().getCMC();
}
}),
INVITEM_GENERIC_COST("lblGenericCost", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -483,7 +513,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return 0;
}
return ((PaperCard)input).getRules().getManaCost().getGenericCost();
return ((PaperCard) input).getRules().getManaCost().getGenericCost();
}
}),
INVITEM_POWER("lblPower", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 20) {
@@ -492,7 +522,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return null;
}
CardRules rules = ((PaperCard)input).getRules();
CardRules rules = ((PaperCard) input).getRules();
if (rules.getType().isCreature()) {
return rules.getIntPower();
}
@@ -505,7 +535,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return null;
}
CardRules rules = ((PaperCard)input).getRules();
CardRules rules = ((PaperCard) input).getRules();
if (rules.getType().isCreature()) {
return rules.getIntToughness();
}
@@ -518,14 +548,16 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return "";
}
return ((PaperCard)input).getRules().getManaCost().toString();
return ((PaperCard) input).getRules().getManaCost().toString();
}
}),
INVITEM_FIRST_PRINTING("lblFirstPrinting", InventoryItem.class, FilterOperator.BOOLEAN_OPS, new BooleanEvaluator<InventoryItem>() {
@Override
protected Boolean getItemValue(InventoryItem input) {
List<PaperCard> cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName());
if (cards.size() <= 1) { return true; }
if (cards.size() <= 1) {
return true;
}
cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR);
return cards.get(0) == input;
@@ -537,7 +569,7 @@ public class AdvancedSearch {
if (!(input instanceof PaperCard)) {
return CardRarity.Special;
}
return ((PaperCard)input).getRarity();
return ((PaperCard) input).getRarity();
}
}),
INVITEM_BUY_PRICE("lblBuyPrice", InventoryItem.class, FilterOperator.NUMBER_OPS, new NumericEvaluator<InventoryItem>(0, 10000000) {
@@ -576,11 +608,12 @@ public class AdvancedSearch {
return input.isFavoriteDeck();
}
}),
DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>)FModel.getFormats().getFilterList()) {
DECK_FORMAT("lblFormat", DeckProxy.class, FilterOperator.MULTI_LIST_OPS, new CustomListEvaluator<DeckProxy, GameFormat>((List<GameFormat>) FModel.getFormats().getFilterList()) {
@Override
protected GameFormat getItemValue(DeckProxy input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<GameFormat> getItemValues(DeckProxy input) {
return input.getExhaustiveFormats();
@@ -591,6 +624,7 @@ public class AdvancedSearch {
protected QuestWorld getItemValue(DeckProxy input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<QuestWorld> getItemValues(DeckProxy input) {
return QuestWorld.getAllQuestWorldsOfDeck(input.getDeck());
@@ -601,6 +635,7 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(DeckProxy input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
return input.getColor().toEnumSet();
@@ -611,6 +646,7 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(DeckProxy input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(DeckProxy input) {
return input.getColorIdentity().toEnumSet();
@@ -673,6 +709,7 @@ public class AdvancedSearch {
protected MagicColor.Color getItemValue(ConquestCommander input) {
throw new RuntimeException("getItemValues should be called instead");
}
@Override
protected Set<MagicColor.Color> getItemValues(ConquestCommander input) {
return input.getCard().getRules().getColorIdentity().toEnumSet();
@@ -825,6 +862,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -846,6 +884,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -867,6 +906,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<String> inputs, List<String> values) {
if (inputs != null && !inputs.isEmpty() && !values.isEmpty()) {
@@ -890,6 +930,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null && inputs.size() == values.size()) {
@@ -915,6 +956,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null) {
@@ -939,6 +981,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null) {
@@ -959,6 +1002,7 @@ public class AdvancedSearch {
}
return false;
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null) {
@@ -977,6 +1021,7 @@ public class AdvancedSearch {
public boolean apply(Object input, List<Object> values) {
throw new RuntimeException("shouldn't be called with a single input");
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null) {
@@ -994,6 +1039,7 @@ public class AdvancedSearch {
public boolean apply(Object input, List<Object> values) {
throw new RuntimeException("shouldn't be called with a single input");
}
@Override
public boolean apply(Set<Object> inputs, List<Object> values) {
if (inputs != null) {
@@ -1030,31 +1076,31 @@ public class AdvancedSearch {
}
});
public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[] {
public static final FilterOperator[] BOOLEAN_OPS = new FilterOperator[]{
IS_TRUE, IS_FALSE
};
public static final FilterOperator[] NUMBER_OPS = new FilterOperator[] {
public static final FilterOperator[] NUMBER_OPS = new FilterOperator[]{
EQUALS, NOT_EQUALS, GREATER_THAN, LESS_THAN, GT_OR_EQUAL, LT_OR_EQUAL, BETWEEN_INCLUSIVE, BETWEEN_EXCLUSIVE
};
public static final FilterOperator[] STRING_OPS = new FilterOperator[] {
public static final FilterOperator[] STRING_OPS = new FilterOperator[]{
CONTAINS, STARTS_WITH, ENDS_WITH
};
public static final FilterOperator[] STRINGS_OPS = new FilterOperator[] {
public static final FilterOperator[] STRINGS_OPS = new FilterOperator[]{
CONTAINS, STARTS_WITH, ENDS_WITH
};
public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[] {
public static final FilterOperator[] SINGLE_LIST_OPS = new FilterOperator[]{
IS_ANY
};
public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[] {
public static final FilterOperator[] MULTI_LIST_OPS = new FilterOperator[]{
IS_ANY
};
public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[] {
public static final FilterOperator[] COMBINATION_OPS = new FilterOperator[]{
IS_EXACTLY, CONTAINS_ANY, CONTAINS_ALL
};
public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[] {
public static final FilterOperator[] COLLECTION_OPS = new FilterOperator[]{
CONTAIN_ANY, CONTAIN_ALL
};
public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[] {
public static final FilterOperator[] DECK_CONTENT_OPS = new FilterOperator[]{
CONTAINS_CARD, CONTAINS_X_COPIES_OF_CARD
};
@@ -1104,8 +1150,8 @@ public class AdvancedSearch {
final OperatorEvaluator<V> evaluator = (OperatorEvaluator<V>) operator.evaluator;
Predicate<T> predicate = input -> evaluator.apply(getItemValue(input), values);
final FilterOperator[][] manyValueOperators = { FilterOperator.MULTI_LIST_OPS,
FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS };
final FilterOperator[][] manyValueOperators = {FilterOperator.MULTI_LIST_OPS,
FilterOperator.COMBINATION_OPS, FilterOperator.COLLECTION_OPS, FilterOperator.STRINGS_OPS};
for (FilterOperator[] oper : manyValueOperators) {
if (option.operatorOptions == oper) {
predicate = input -> evaluator.apply(getItemValues(input), values);
@@ -1125,8 +1171,7 @@ public class AdvancedSearch {
final List<V> values;
try {
values = getValuesFromString(initialValueText, option, operator);
}
catch(Exception e) {
} catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -1134,8 +1179,11 @@ public class AdvancedSearch {
}
protected abstract List<V> getValues(FilterOption option, FilterOperator operator);
protected abstract List<V> getValuesFromString(String valueText, FilterOption option, FilterOperator operator);
protected abstract String getCaption(List<V> values, FilterOption option, FilterOperator operator);
protected abstract V getItemValue(T input);
protected Set<V> getItemValues(T input) { //available for options that have multiple inputs
@@ -1178,12 +1226,13 @@ public class AdvancedSearch {
String message;
if (operator.valueCount == FilterValueCount.ONE) {
message = option.name + " " + operator.caption + " ?";
}
else {
} else {
message = "? " + operator.caption.replace("|", " " + option.name + " ");
}
Integer lowerBound = SGuiChoose.getInteger(message, min, max);
if (lowerBound == null) { return null; }
if (lowerBound == null) {
return null;
}
final List<Integer> values = new ArrayList<>();
values.add(lowerBound);
@@ -1195,7 +1244,9 @@ public class AdvancedSearch {
upperBoundMin += 2; //if exclusive, ensure it's possible to have numbers in between
}
Integer upperBound = SGuiChoose.getInteger(message, upperBoundMin, max);
if (upperBound == null) { return null; }
if (upperBound == null) {
return null;
}
values.add(upperBound);
}
@@ -1226,7 +1277,9 @@ public class AdvancedSearch {
protected List<String> getValues(FilterOption option, FilterOperator operator) {
String message = option.name + " " + operator.caption + " ?";
String value = SOptionPane.showInputDialog("", message, null, initialInput);
if (value == null) { return null; }
if (value == null) {
return null;
}
initialInput = value; //store value as initial input for next time
@@ -1253,9 +1306,11 @@ public class AdvancedSearch {
public CustomListEvaluator(Collection<V> choices0) {
this(choices0, null, null);
}
public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0) {
this(choices0, toShortString0, null);
}
public CustomListEvaluator(Collection<V> choices0, Function<V, String> toShortString0, Function<V, String> toLongString0) {
choices = choices0;
toShortString = toShortString0;
@@ -1276,9 +1331,9 @@ public class AdvancedSearch {
}
private boolean eitherStringMatches(V choice, String name) {
if(toLongString != null && name.equals(toLongString.apply(choice)))
if (toLongString != null && name.equals(toLongString.apply(choice)))
return true;
if(toShortString != null)
if (toShortString != null)
return name.equals(toShortString.apply(choice));
return name.equals(choice.toString());
}
@@ -1350,12 +1405,16 @@ public class AdvancedSearch {
protected List<Map<String, Integer>> getValues(FilterOption option, FilterOperator operator) {
String message = option.name + " " + operator.caption + " ?";
PaperCard card = SGuiChoose.oneOrNone(message, FModel.getMagicDb().getCommonCards().getUniqueCards());
if (card == null) { return null; }
if (card == null) {
return null;
}
Integer amount = -1;
if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) { //prompt for quantity if needed
amount = SGuiChoose.getInteger(Localizer.getInstance().getMessage("lblHowManyCopiesOfN", CardTranslation.getTranslatedName(card.getName())), 0, 4);
if (amount == null) { return null; }
if (amount == null) {
return null;
}
}
Map<String, Integer> map = new HashMap<>();
@@ -1370,13 +1429,12 @@ public class AdvancedSearch {
protected List<Map<String, Integer>> getValuesFromString(String valueText, FilterOption option, FilterOperator operator) {
int amount = -1;
String cardName;
if(operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
if (operator == FilterOperator.CONTAINS_X_COPIES_OF_CARD) {
//Take the format "2 Mountain"
String[] split = valueText.split(" ", 2);
amount = Integer.parseInt(split[0]);
cardName = split[1];
}
else
} else
cardName = valueText;
Map<String, Integer> map = new HashMap<>();
map.put(cardName, amount);
@@ -1412,25 +1470,29 @@ public class AdvancedSearch {
}
}
option = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectAFilterType"), options, defaultOption, null);
if (option == null) { return editFilter; }
if (option == null) {
return editFilter;
}
else {
} else {
option = defaultOption;
}
if (option == FilterOption.NONE) { return null; } //allow user to clear filter by selecting "(none)"
if (option == FilterOption.NONE) {
return null;
} //allow user to clear filter by selecting "(none)"
final FilterOperator operator;
if (option.operatorOptions.length > 1) {
final FilterOperator defaultOperator = option == defaultOption ? editFilter.operator : null;
operator = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblSelectOperatorFor", option.name), option.operatorOptions, defaultOperator, null);
if (operator == null) { return editFilter; }
if (operator == null) {
return editFilter;
}
else {
} else {
operator = option.operatorOptions[0];
}
Filter<T> filter = (Filter<T>)option.evaluator.createFilter(option, operator);
Filter<T> filter = (Filter<T>) option.evaluator.createFilter(option, operator);
if (filter == null) {
filter = editFilter;
}
@@ -1440,8 +1502,7 @@ public class AdvancedSearch {
@SuppressWarnings("unchecked")
public static <T extends InventoryItem> Filter<T> getFilter(Class<? super T> type, String filterText) {
String[] words = filterText.split(" ", 3);
if(words.length < 2)
{
if (words.length < 2) {
System.out.printf("Unable to generate filter from expression '%s'%n", filterText);
return null;
}
@@ -1454,8 +1515,7 @@ public class AdvancedSearch {
System.out.printf("Unable to generate filter from FilterOption '%s'%n", words[0]);
return null;
}
if(option.type != type)
{
if (option.type != type) {
System.out.printf("Unable to generate filter from FilterOption '%s' - filter type '%s' != option type '%s' %n", words[0], type, option.type);
return null;
}
@@ -1515,14 +1575,23 @@ public class AdvancedSearch {
public interface IFilterControl<T extends InventoryItem> {
IButton getBtnNotBeforeParen();
IButton getBtnOpenParen();
IButton getBtnNotAfterParen();
IButton getBtnFilter();
IButton getBtnCloseParen();
IButton getBtnAnd();
IButton getBtnOr();
Filter<T> getFilter();
void setFilter(Filter<T> filter0);
Class<? super T> getGenericType();
}
@@ -1554,23 +1623,18 @@ public class AdvancedSearch {
Object piece = iterator.get();
if (piece.equals(Operator.OPEN_PAREN)) {
predPiece = getPredicatePiece(iterator.next());
}
else if (piece.equals(Operator.CLOSE_PAREN)) {
} else if (piece.equals(Operator.CLOSE_PAREN)) {
return pred;
}
else if (piece.equals(Operator.AND)) {
} else if (piece.equals(Operator.AND)) {
operator = Operator.AND;
continue;
}
else if (piece.equals(Operator.OR)) {
} else if (piece.equals(Operator.OR)) {
operator = Operator.OR;
continue;
}
else if (piece.equals(Operator.NOT)) {
} else if (piece.equals(Operator.NOT)) {
applyNot = !applyNot;
continue;
}
else {
} else {
predPiece = ((AdvancedSearch.Filter<T>) piece).getPredicate();
}
if (applyNot) {
@@ -1579,11 +1643,9 @@ public class AdvancedSearch {
}
if (pred == null) {
pred = predPiece;
}
else if (operator == Operator.AND) {
} else if (operator == Operator.AND) {
pred = pred.and(predPiece);
}
else if (operator == Operator.OR) {
} else if (operator == Operator.OR) {
pred = pred.or(predPiece);
}
operator = null;
@@ -1626,16 +1688,7 @@ public class AdvancedSearch {
control.setFilter(filter);
if (filter != null) {
control.getBtnFilter().setText(GuiBase.getInterface().encodeSymbols(filter.toString(), false));
if (filter.getOption() == FilterOption.CARD_KEYWORDS) {
//the first time the user selects keywords, preload keywords for all cards
Runnable preloadTask = Keyword.getPreloadTask();
if (preloadTask != null) {
GuiBase.getInterface().runBackgroundTask(Localizer.getInstance().getMessage("lblLoadingKeywords"), preloadTask);
}
}
}
else {
} else {
control.getBtnFilter().setText(EMPTY_FILTER_TEXT);
}
if (onChange != null) {
@@ -1657,32 +1710,31 @@ public class AdvancedSearch {
@SuppressWarnings("unchecked")
public void updateLabel() {
if (label == null) { return; }
if (label == null) {
return;
}
StringBuilder builder = new StringBuilder();
builder.append("Filter: ");
if (expression.isEmpty()) {
builder.append("(none)");
}
else {
} else {
int prevFilterEndIdx = -1;
AdvancedSearch.Filter<T> filter, prevFilter = null;
for (Object piece : expression) {
if (piece instanceof AdvancedSearch.Filter) {
filter = (AdvancedSearch.Filter<T>)piece;
filter = (AdvancedSearch.Filter<T>) piece;
if (filter.canMergeCaptionWith(prevFilter)) {
//convert boolean operators between filters to lowercase
builder.replace(prevFilterEndIdx, builder.length(), builder.substring(prevFilterEndIdx).toLowerCase());
//append only values for filter
builder.append(filter.extractValuesFromCaption());
}
else {
} else {
builder.append(filter);
}
prevFilter = filter;
prevFilterEndIdx = builder.length();
}
else {
} else {
if (piece.equals(Operator.OPEN_PAREN) || piece.equals(Operator.CLOSE_PAREN)) {
prevFilter = null; //prevent merging filters with parentheses in between
}
@@ -1695,7 +1747,9 @@ public class AdvancedSearch {
}
public String getTooltip() {
if (expression.isEmpty()) { return ""; }
if (expression.isEmpty()) {
return "";
}
StringBuilder builder = new StringBuilder();
builder.append("Filter:\n");
@@ -1718,7 +1772,9 @@ public class AdvancedSearch {
expression.clear();
for (IFilterControl<T> control : controls) {
if (control.getFilter() == null) { continue; } //skip any blank filters
if (control.getFilter() == null) {
continue;
} //skip any blank filters
if (control.getBtnNotBeforeParen().isSelected()) {
expression.add(Operator.NOT);
@@ -1737,8 +1793,7 @@ public class AdvancedSearch {
}
if (control.getBtnAnd().isSelected()) {
expression.add(Operator.AND);
}
else if (control.getBtnOr().isSelected()) {
} else if (control.getBtnOr().isSelected()) {
expression.add(Operator.OR);
}
}
@@ -1748,13 +1803,16 @@ public class AdvancedSearch {
private class ExpressionIterator {
private int index;
private boolean hasNext() {
return index < expression.size();
}
private ExpressionIterator next() {
index++;
return this;
}
private Object get() {
return expression.get(index);
}