From 4bc6797992868561d0debd7621fe9b3db80f3150 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 3 Jan 2016 00:15:52 +0000 Subject: [PATCH] Code cleanup --- .../planarconquest/ConquestDeckEditor.java | 6 ----- .../screens/planarconquest/ConquestMenu.java | 2 +- .../planarconquest/LoadConquestScreen.java | 4 +-- .../planarconquest/NewConquestScreen.java | 4 +-- .../planarconquest/ConquestController.java | 19 ++++++-------- .../forge/planarconquest/ConquestData.java | 26 ------------------- 6 files changed, 13 insertions(+), 48 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java index e2835e1c8f0..60b74c2ace1 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java @@ -26,12 +26,6 @@ public class ConquestDeckEditor extends FDeckEditor { return false; } - @Override - public void onActivate() { - super.onActivate(); - FModel.getConquest().getModel().updateDecksForEachCard(); - } - @Override protected Map getColOverrides(ItemManagerConfig config) { return FModel.getConquest().getModel().getColOverrides(config); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java index b304bb5cd68..cbc90c6b852 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java @@ -82,7 +82,7 @@ public class ConquestMenu extends FPopupMenu { @Override @SuppressWarnings("unchecked") public void run() { - FModel.getConquest().load(new ConquestData(data)); + FModel.getConquest().setModel(new ConquestData(data)); ((DeckController)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks()); if (reason == LaunchReason.StartPlanarConquest) { Forge.openScreen(multiverseScreen); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index ac728b18479..16e4a26e4f9 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -114,10 +114,10 @@ public class LoadConquestScreen extends LaunchScreen { } // Drop into AllZone. - qc.load(lstConquests.getSelectedConquest()); + qc.setModel(lstConquests.getSelectedConquest()); } else { - qc.load(null); + qc.setModel(null); } Gdx.app.postRunnable(new Runnable() { @Override diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java index 035c4cb1e92..1db2ac26060 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java @@ -61,9 +61,9 @@ public class NewConquestScreen extends MultiStepWizardScreen getDecks() { - return decks; - } - - public void load(final ConquestData model0) { + public void setModel(final ConquestData model0) { model = model0; + if (model == null) { + decks = null; + return; + } File decksDir = new File(model.getDirectory(), "decks"); FileUtil.ensureDirectoryExists(decksDir); @@ -79,10 +78,8 @@ public class ConquestController { decks = new StorageImmediatelySerialized(model.getName() + " decks", storage); } - public void save() { - if (model != null) { - model.saveData(); - } + public IStorage getDecks() { + return decks; } public void launchEvent(final IConquestEventLauncher launcher0, final ConquestCommander commander0, final ConquestEvent event0) { @@ -243,7 +240,7 @@ public class ConquestController { model.addLoss(gameRunner.event); } - FModel.getConquest().save(); + model.saveData(); FModel.getConquestPreferences().save(); gameRunner.finish(); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 17182e16934..d4b4bdb00aa 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -20,7 +20,6 @@ package forge.planarconquest; import forge.achievement.PlaneswalkerAchievements; import forge.assets.ISkinImage; import forge.card.CardDb; -import forge.deck.Deck; import forge.item.InventoryItem; import forge.item.PaperCard; import forge.itemmanager.ColumnDef; @@ -63,7 +62,6 @@ public final class ConquestData { private final EnumMap planeDataMap = new EnumMap(ConquestPlane.class); private final HashSet unlockedCards = new HashSet(); private final List commanders = new ArrayList(); - private final ItemPool decksUsingMyCards = new ItemPool(InventoryItem.class); private final HashSet newCards = new HashSet(); public ConquestData(String name0, PaperCard planeswalker0, ConquestPlane startingPlane0, PaperCard startingCommander0) { @@ -245,15 +243,6 @@ public final class ConquestData { directory.renameTo(new File(ForgeConstants.CONQUEST_SAVE_DIR, name)); } - public void updateDecksForEachCard() { - decksUsingMyCards.clear(); - for (final Deck deck : FModel.getConquest().getDecks()) { - for (final Entry e : deck.getMain()) { - decksUsingMyCards.add(e.getKey()); - } - } - } - public HashSet getNewCards() { return newCards; } @@ -272,25 +261,10 @@ public final class ConquestData { return newCards.contains(from.getKey()) ? "NEW" : ""; } }; - private final Function, Comparable> fnDeckCompare = new Function, Comparable>() { - @Override - public Comparable apply(final Entry from) { - final Integer iValue = decksUsingMyCards.count(from.getKey()); - return iValue == null ? Integer.valueOf(0) : iValue; - } - }; - private final Function, Object> fnDeckGet = new Function, Object>() { - @Override - public Object apply(final Entry from) { - final Integer iValue = decksUsingMyCards.count(from.getKey()); - return iValue == null ? "" : iValue.toString(); - } - }; public Map getColOverrides(ItemManagerConfig config) { Map colOverrides = new HashMap(); ItemColumn.addColOverride(config, colOverrides, ColumnDef.NEW, fnNewCompare, fnNewGet); - ItemColumn.addColOverride(config, colOverrides, ColumnDef.DECKS, fnDeckCompare, fnDeckGet); return colOverrides; }