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

Guava migration - Inline Predicates.alwaysTrue

Browse Source
This commit is contained in:
Jetz
2024-09-02 20:00:38 -04:00
parent 16c0fa1095
commit 77ba9f1728
24 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardCMCRangeFilter.java
View File

@@ -31,7 +31,7 @@ public class CardCMCRangeFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.CMC);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
return Predicates.compose(predicate, PaperCard::getRules);
}

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardPowerFilter.java
View File

@@ -31,7 +31,7 @@ public class CardPowerFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.POWER);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/CardToughnessFilter.java
View File

@@ -31,7 +31,7 @@ public class CardToughnessFilter extends ValueRangeFilter<PaperCard> {
protected Predicate<PaperCard> buildPredicate() {
Predicate<CardRules> predicate = getCardRulesFieldPredicate(CardRulesPredicates.LeafNumber.CardField.TOUGHNESS);
if (predicate == null) {
return Predicates.alwaysTrue();
return x -> true;
}
predicate = Predicates.and(predicate, CardRulesPredicates.Presets.IS_CREATURE);
return Predicates.compose(predicate, PaperCard::getRules);

3
forge-gui-desktop/src/main/java/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -14,7 +14,6 @@ import forge.itemmanager.SFilterUtil;
import forge.toolbox.FTextField;
import forge.toolbox.LayoutHelper;
import forge.util.Localizer;
import forge.util.Predicates;
public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
@@ -113,7 +112,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
protected Predicate<T> buildPredicate() {
String text = txtSearch.getText();
if (text.trim().isEmpty()) {
return Predicates.alwaysTrue();
return x -> true;
}
return SFilterUtil.buildItemTextFilter(text);
}