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

Fixed filter problems in Card Shop.

Browse Source
This commit is contained in:
Doublestrike
2012-05-26 13:14:35 +00:00
parent ddc0b5ad5b
commit 29b2d720d2
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/gui/deckeditor/controllers/CFilters.java
View File

@@ -16,6 +16,7 @@ import forge.gui.framework.ICDoc;
import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FLabel;
import forge.item.CardPrinted; import forge.item.CardPrinted;
import forge.item.InventoryItem; import forge.item.InventoryItem;
import forge.item.ItemPredicate;
import forge.util.closures.Predicate; import forge.util.closures.Predicate;
/** /**
@@ -170,7 +171,14 @@ public enum CFilters implements ICDoc {
lstFilters.add(SFilterUtil.buildTextFilter()); lstFilters.add(SFilterUtil.buildTextFilter());
lstFilters.add(SFilterUtil.buildIntervalFilter()); lstFilters.add(SFilterUtil.buildIntervalFilter());
// Until this is filterable, always show packs and decks in the card shop.
Predicate<InventoryItem> itemFilter = Predicate.instanceOf(
Predicate.and(lstFilters), CardPrinted.class);
itemFilter = Predicate.or(itemFilter, ItemPredicate.Presets.IS_PACK);
itemFilter = Predicate.or(itemFilter, ItemPredicate.Presets.IS_DECK);
// Apply to table // Apply to table
ed.getTableCatalog().setFilter((Predicate<TItem>) Predicate.and(lstFilters)); ed.getTableCatalog().setFilter((Predicate<TItem>) itemFilter);
} }
} }