diff --git a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java index 5d4f1aff68c..a3271473e0e 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java +++ b/forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java @@ -317,7 +317,6 @@ public class AdventureDeckEditor extends FDeckEditor { protected void initialize() { super.initialize(); cardManager.setBtnAdvancedSearchOptions(true); - cardManager.setCatalogDisplay(true); scheduleRefresh(); } @@ -435,7 +434,6 @@ public class AdventureDeckEditor extends FDeckEditor { protected void initialize() { super.initialize(); cardManager.setBtnAdvancedSearchOptions(true); - cardManager.setCatalogDisplay(true); cardManager.setPool(getCardPool(), false); //Need to update this early for the caption. this.updateCaption(); } @@ -945,7 +943,6 @@ public class AdventureDeckEditor extends FDeckEditor { protected AdventureDeckSectionPage(DeckSection deckSection, ItemManagerConfig config) { super(new AdventureCardManager(), deckSection, config, deckSection.getLocalizedShortName(), iconFromDeckSection(deckSection)); cardManager.setBtnAdvancedSearchOptions(deckSection == DeckSection.Main); - cardManager.setCatalogDisplay(false); } } diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index d1c4ff38ae9..1a4f60cb86d 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -77,7 +77,6 @@ public abstract class ItemManager extends FContainer im private boolean viewUpdating, needSecondUpdate; private Supplier> sortCols = Suppliers.memoize(ArrayList::new); private final TextSearchFilter searchFilter; - private CardFormatFilter cardFormatFilter; private final FLabel btnSearch = new FLabel.ButtonBuilder() .icon(Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH).iconScaleFactor(0.9f).selectable().build(); @@ -638,25 +637,6 @@ public abstract class ItemManager extends FContainer im btnAdvancedSearchOptions.setEnabled(enable); } - public void setCatalogDisplay(boolean enable) { - if (cardFormatFilter == null) - return; - if (cardFormatFilter.getMainComponent() instanceof FComboBox) { - if (!enable) - ((FComboBox) cardFormatFilter.getMainComponent()).setSelectedIndex(0); - cardFormatFilter.getMainComponent().setEnabled(enable); - } - } - - public int getCatalogSelectedIndex() { - if (cardFormatFilter == null) - return 0; - if (cardFormatFilter.getMainComponent() instanceof FComboBox) { - return((FComboBox) cardFormatFilter.getMainComponent()).getSelectedIndex(); - } - return 0; - } - public void scrollSelectionIntoView() { currentView.scrollSelectionIntoView(); } @@ -678,8 +658,6 @@ public abstract class ItemManager extends FContainer im public void addFilter(final ItemFilter filter) { filters.get().add(filter); add(filter.getWidget()); - if (filter instanceof CardFormatFilter) - cardFormatFilter = (CardFormatFilter) filter; boolean visible = !hideFilters; filter.getWidget().setVisible(visible);