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

FORCING all Deck Editors to not have a Unique Cards Only filter

Browse Source
This commit is contained in:
leriomaggio
2021-08-13 10:17:51 +01:00
parent d171170c45
commit b09b5972ab
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorCommander.java
View File

@@ -17,16 +17,9 @@
*/ */
package forge.screens.deckeditor.controllers; package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.card.CardDb; import forge.card.CardDb;
import forge.card.CardRules; import forge.card.CardRules;
@@ -50,6 +43,12 @@ import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FComboBox; import forge.toolbox.FComboBox;
import forge.util.ItemPool; import forge.util.ItemPool;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
/** /**
* Child controller for constructed deck editor UI. * Child controller for constructed deck editor UI.
* This is the least restrictive mode; * This is the least restrictive mode;
@@ -106,7 +105,8 @@ public final class CEditorCommander extends CDeckEditor<Deck> {
} }
CardManager catalogManager = new CardManager(getCDetailPicture(), true, false); CardManager catalogManager = new CardManager(getCDetailPicture(), true, false);
CardManager deckManager = new CardManager(getCDetailPicture(), true, false); CardManager deckManager = new CardManager(getCDetailPicture(), false, false);
deckManager.setAlwaysNonUnique(true);
catalogManager.setCaption("Catalog"); catalogManager.setCaption("Catalog");

16
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
View File

@@ -17,14 +17,7 @@
*/ */
package forge.screens.deckeditor.controllers; package forge.screens.deckeditor.controllers;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import forge.deck.CardPool; import forge.deck.CardPool;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckSection; import forge.deck.DeckSection;
@@ -43,6 +36,12 @@ import forge.toolbox.FComboBox;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.Localizer; import forge.util.Localizer;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
/** /**
* Child controller for constructed deck editor UI. * Child controller for constructed deck editor UI.
* This is the least restrictive mode; * This is the least restrictive mode;
@@ -130,7 +129,8 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
} }
catalogManager = new CardManager(getCDetailPicture(), wantUnique, false); catalogManager = new CardManager(getCDetailPicture(), wantUnique, false);
deckManager = new CardManager(getCDetailPicture(), wantUnique, false); deckManager = new CardManager(getCDetailPicture(), false, false);
deckManager.setAlwaysNonUnique(true);
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();

9
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorVariant.java
View File

@@ -17,12 +17,9 @@
*/ */
package forge.screens.deckeditor.controllers; package forge.screens.deckeditor.controllers;
import java.util.Map.Entry;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckSection; import forge.deck.DeckSection;
import forge.game.GameType; import forge.game.GameType;
@@ -42,6 +39,8 @@ import forge.util.ItemPool;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;
import java.util.Map.Entry;
/** /**
* Child controller for constructed deck editor UI. * Child controller for constructed deck editor UI.
* This is the least restrictive mode; * This is the least restrictive mode;
@@ -72,7 +71,9 @@ public final class CEditorVariant extends CDeckEditor<Deck> {
this.sectionMode = deckSection0; this.sectionMode = deckSection0;
final CardManager catalogManager = new CardManager(cDetailPicture0, true, false); final CardManager catalogManager = new CardManager(cDetailPicture0, true, false);
final CardManager deckManager = new CardManager(cDetailPicture0, true, false); final CardManager deckManager = new CardManager(cDetailPicture0, false, false);
deckManager.setAlwaysNonUnique(true);
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();
catalogManager.setCaption(localizer.getMessage("lblCatalog")); catalogManager.setCaption(localizer.getMessage("lblCatalog"));