diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java index d0f48951bf7..538ebe2e5c8 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java @@ -233,15 +233,7 @@ public class CardManager extends ItemManager { if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) { JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock")); - List blockFormats = new ArrayList<>(); - for (GameFormat format : FModel.getFormats().getHistoricList()){ - if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK) - continue; - if (!format.getName().endsWith("Block")) - continue; - blockFormats.add(format); - } - Collections.sort(blockFormats); // GameFormat will be sorted by Index! + final List blockFormats = FModel.getBlockFormats(); for (final GameFormat f : blockFormats) { GuiUtils.addMenuItem(blocks, f.getName(), null, new Runnable() { @Override diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java index e70f92087ac..553b1d769b1 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/DeckManager.java @@ -281,15 +281,7 @@ public final class DeckManager extends ItemManager implements IHasGam if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.LOAD_HISTORIC_FORMATS)) { JMenu blocks = GuiUtils.createMenu(localizer.getMessage("lblBlock")); - List blockFormats = new ArrayList<>(); - for (GameFormat format : FModel.getFormats().getHistoricList()){ - if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK) - continue; - if (!format.getName().endsWith("Block")) - continue; - blockFormats.add(format); - } - Collections.sort(blockFormats); // GameFormat will be sorted by Index! + final List blockFormats = FModel.getBlockFormats(); for (final GameFormat f : blockFormats) { GuiUtils.addMenuItem(blocks, f.getName(), null, new Runnable() { @Override diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index b83e3b59646..4fce49b27bd 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -64,9 +64,7 @@ import forge.util.storage.IStorage; import forge.util.storage.StorageBase; import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * The default Model implementation for Forge. @@ -465,6 +463,19 @@ public final class FModel { return blocks; } + public static List getBlockFormats(){ + List blockFormats = new ArrayList<>(); + for (GameFormat format : FModel.getFormats().getHistoricList()){ + if (format.getFormatSubType() != GameFormat.FormatSubType.BLOCK) + continue; + if (!format.getName().endsWith("Block")) + continue; + blockFormats.add(format); + } + Collections.sort(blockFormats); // GameFormat will be sorted by Index! + return blockFormats; + } + public static QuestPreferences getQuestPreferences() { return questPreferences; }