Remove unused restrictedCatalog parameter

Refactor quest default land set logic to be re-usable by mobile app

forge-gui-desktop/src/main/java/forge/screens/deckeditor/AddBasicLandsDialog.java

@@ -51,7 +51,6 @@ import forge.toolbox.FOptionPane;
 import forge.toolbox.FSkin;
 import forge.toolbox.FTextField;
 import forge.toolbox.FSkin.SkinnedPanel;
-import forge.util.ItemPool;
 import forge.view.arcane.CardPanel;
 
 
@@ -80,12 +79,9 @@ public class AddBasicLandsDialog {
     private CardEdition landSet;
 
     public AddBasicLandsDialog(Deck deck0) {
-        this(deck0, null, null);
+        this(deck0, null);
     }
     public AddBasicLandsDialog(Deck deck0, CardEdition defaultLandSet) {
-        this(deck0, defaultLandSet, null);
-    }
-    public AddBasicLandsDialog(Deck deck0, CardEdition defaultLandSet, ItemPool<PaperCard> restrictedCatalog0) {
         deck = deck0;
 
         if (defaultLandSet == null) {

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

@@ -94,7 +94,7 @@ public final class CEditorCommander extends ACEditorBase<PaperCard, Deck> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorConstructed.addBasicLands(CEditorCommander.this, null);
+                CEditorConstructed.addBasicLands(CEditorCommander.this);
             }
         });
     }

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

@@ -99,7 +99,7 @@ public final class CEditorConstructed extends ACEditorBase<PaperCard, Deck> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorConstructed.addBasicLands(CEditorConstructed.this, null);
+                CEditorConstructed.addBasicLands(CEditorConstructed.this);
             }
         });
     }
@@ -332,7 +332,7 @@ public final class CEditorConstructed extends ACEditorBase<PaperCard, Deck> {
         this.controller.updateCaptions();
     }
 
-    public static void addBasicLands(ACEditorBase<PaperCard, Deck> editor, ItemPool<PaperCard> restrictedCatalog) {
+    public static void addBasicLands(ACEditorBase<PaperCard, Deck> editor) {
         Deck deck = editor.getDeckController().getModel();
         if (deck == null) { return; }
 
@@ -345,7 +345,7 @@ public final class CEditorConstructed extends ACEditorBase<PaperCard, Deck> {
         CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
         CardEdition defaultLandSet = randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet;
 
-        AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, restrictedCatalog);
+        AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet);
         CardPool landsToAdd = dialog.show();
         if (landsToAdd != null) {
             editor.onAddItems(landsToAdd, false);

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorLimited.java

@@ -39,7 +39,6 @@ import forge.screens.deckeditor.views.VDeckgen;
 import forge.screens.home.sanctioned.CSubmenuDraft;
 import forge.screens.home.sanctioned.CSubmenuSealed;
 import forge.screens.match.controllers.CDetailPicture;
-import forge.util.ItemPool;
 import forge.util.storage.IStorage;
 
 import java.util.Map.Entry;
@@ -91,7 +90,7 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorLimited.addBasicLands(CEditorLimited.this, null);
+                CEditorLimited.addBasicLands(CEditorLimited.this);
             }
         });
     }
@@ -169,12 +168,12 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
         return this.controller;
     }
 
-    public static void addBasicLands(ACEditorBase<PaperCard, DeckGroup> editor, ItemPool<PaperCard> restrictedCatalog) {
+    public static void addBasicLands(ACEditorBase<PaperCard, DeckGroup> editor) {
         Deck deck = editor.getDeckController().getModel().getHumanDeck();
         if (deck == null) { return; }
 
         CardEdition defaultLandSet = StaticData.instance().getEditions().getEarliestEditionWithAllCards(deck.getAllCardsInASinglePool());
-        AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, restrictedCatalog);
+        AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet);
         CardPool landsToAdd = dialog.show();
         if (landsToAdd != null) {
             editor.onAddItems(landsToAdd, false);

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java

@@ -25,10 +25,7 @@ import java.util.Map.Entry;
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-import com.google.common.collect.Lists;
-
 import forge.UiCommand;
-import forge.card.CardEdition;
 import forge.deck.CardPool;
 import forge.deck.Deck;
 import forge.deck.DeckSection;
@@ -43,7 +40,6 @@ import forge.itemmanager.views.ItemTableColumn;
 import forge.model.FModel;
 import forge.properties.ForgePreferences.FPref;
 import forge.quest.QuestController;
-import forge.quest.data.GameFormatQuest;
 import forge.screens.deckeditor.AddBasicLandsDialog;
 import forge.screens.deckeditor.SEditorIO;
 import forge.screens.deckeditor.views.VAllDecks;
@@ -65,7 +61,6 @@ import forge.util.ItemPool;
  */
 public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
     private final QuestController questData;
-    private static GameFormatQuest questFormat;
     private final DeckController<Deck> controller;
     private final List<DeckSection> allSections = new ArrayList<DeckSection>();
     private DragCell allDecksParent = null;
@@ -128,8 +123,14 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                questFormat = questData.getFormat();
+                Deck deck = getDeckController().getModel();
-                CEditorQuest.addBasicLands(CEditorQuest.this, questData.getCards().getCardpool());
+                if (deck == null) { return; }
+
+                AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, questData.getDefaultLandSet());
+                CardPool landsToAdd = dialog.show();
+                if (landsToAdd != null) {
+                    onAddItems(landsToAdd, false);
+                }
             }
         });
     }
@@ -307,25 +308,4 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
             allDecksParent.addDoc(VAllDecks.SINGLETON_INSTANCE);
         }
     }
-
-    public static void addBasicLands(ACEditorBase<PaperCard, Deck> editor, ItemPool<PaperCard> restrictedCatalog) {
-        Deck deck = editor.getDeckController().getModel();
-        if (deck == null) { return; }
-
-        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
-        List<CardEdition> availableEditions = new ArrayList<>();
-
-        for (String s : availableEditionCodes) {
-            availableEditions.add(FModel.getMagicDb().getEditions().get(s));
-        }
-
-        CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
-        CardEdition defaultLandSet = randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet;
-
-        AddBasicLandsDialog dialog = new AddBasicLandsDialog(deck, defaultLandSet, restrictedCatalog);
-        CardPool landsToAdd = dialog.show();
-        if (landsToAdd != null) {
-            editor.onAddItems(landsToAdd, false);
-        }
-    }
 }

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java

@@ -125,7 +125,7 @@ public final class CEditorQuestLimited extends ACEditorBase<PaperCard, DeckGroup
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorLimited.addBasicLands(CEditorQuestLimited.this, questData.getCards().getCardpool());
+                CEditorLimited.addBasicLands(CEditorQuestLimited.this);
             }
         });
     }

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

@@ -88,7 +88,7 @@ public final class CEditorVariant extends ACEditorBase<PaperCard, Deck> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorConstructed.addBasicLands(CEditorVariant.this, null);
+                CEditorConstructed.addBasicLands(CEditorVariant.this);
             }
         });
     }

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWinstonProcess.java

@@ -95,7 +95,7 @@ public class CEditorWinstonProcess extends ACEditorBase<PaperCard, DeckGroup> {
         getBtnAddBasicLands().setCommand(new UiCommand() {
             @Override
             public void run() {
-                CEditorLimited.addBasicLands(CEditorWinstonProcess.this, null);
+                CEditorLimited.addBasicLands(CEditorWinstonProcess.this);
             }
         });
     }

forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java

@@ -92,9 +92,6 @@ public class AddBasicLandsDialog extends FDialog {
     private CardEdition landSet;
 
     public AddBasicLandsDialog(Deck deck, CardEdition defaultLandSet, final Callback<CardPool> callback0) {
-        this(deck, defaultLandSet, null, callback0);
-    }
-    public AddBasicLandsDialog(Deck deck, CardEdition defaultLandSet, CardPool restrictedCatalog0, final Callback<CardPool> callback0) {
         super("Add Basic Lands \n" + deck.getName(), 2);
 
         callback = callback0;

forge-gui-mobile/src/forge/deck/FDeckEditor.java

@@ -286,6 +286,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                                     //use most recent edition that all cards in limited pool came before or in
                                     defaultLandSet = StaticData.instance().getEditions().getEarliestEditionWithAllCards(deck.getAllCardsInASinglePool());
                                     break;
+                                case Quest:
+                                    defaultLandSet = FModel.getQuest().getDefaultLandSet();
+                                    break;
                                 default:
                                     //TODO: Support loading/saving default land set for non-limited decks
                                     defaultLandSet = StaticData.instance().getEditions().get("ZEN");

forge-gui/src/main/java/forge/quest/QuestController.java

@@ -27,8 +27,10 @@ import java.util.TreeMap;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
+import com.google.common.collect.Lists;
 import com.google.common.eventbus.Subscribe;
 
+import forge.card.CardEdition;
 import forge.deck.Deck;
 import forge.deck.DeckGroup;
 import forge.game.GameFormat;
@@ -535,4 +537,16 @@ public class QuestController {
         achievements.setCurrentChallenges(availableChallengeIds);
         save();
     }
+
+    public CardEdition getDefaultLandSet() {
+        List<String> availableEditionCodes = questFormat != null ? questFormat.getAllowedSetCodes() : Lists.newArrayList(FModel.getMagicDb().getEditions().getItemNames());
+        List<CardEdition> availableEditions = new ArrayList<>();
+
+        for (String s : availableEditionCodes) {
+            availableEditions.add(FModel.getMagicDb().getEditions().get(s));
+        }
+
+        CardEdition randomLandSet = CardEdition.Predicates.getRandomSetWithAllBasicLands(availableEditions);
+        return randomLandSet == null ? FModel.getMagicDb().getEditions().get("ZEN") : randomLandSet;
+    }
 }