From 10450d51a808a73389f20b23c9c88db7899264c3 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 6 Dec 2014 21:01:48 +0000 Subject: [PATCH] Rename Planar Map to Command Center --- .gitattributes | 2 +- ...stMapScreen.java => CommandCenterScreen.java} | 10 +++++----- .../screens/planarconquest/ConquestMenu.java | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) rename forge-gui-mobile/src/forge/screens/planarconquest/{ConquestMapScreen.java => CommandCenterScreen.java} (96%) diff --git a/.gitattributes b/.gitattributes index c0c75ca3909..bb15d02e68a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1284,7 +1284,7 @@ forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java -text -forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java -text +forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java -text forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java -text forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java -text forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java -text diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java similarity index 96% rename from forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java rename to forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java index 04d953eb5af..19792898034 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java @@ -40,7 +40,7 @@ import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FLabel; import forge.util.Utils; -public class ConquestMapScreen extends FScreen implements IVConquestBase { +public class CommandCenterScreen extends FScreen implements IVConquestBase { private static final Color BACK_COLOR = FSkinColor.fromRGB(1, 2, 2); private static final float BORDER_THICKNESS = Utils.scale(1); private static final FSkinFont REGION_NAME_FONT = FSkinFont.get(15); @@ -57,13 +57,13 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase { private ConquestData model; - public ConquestMapScreen() { + public CommandCenterScreen() { super("", ConquestMenu.getMenu()); btnEndDay.setCommand(new FEventHandler() { @Override public void handleEvent(FEvent e) { - model.endDay(ConquestMapScreen.this); + model.endDay(CommandCenterScreen.this); } }); } @@ -359,7 +359,7 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase { @Override public void activate(int idx) { - ConquestMapScreen.this.activate(commanderRow.panels[idx]); + CommandCenterScreen.this.activate(commanderRow.panels[idx]); } }); } @@ -382,7 +382,7 @@ public class ConquestMapScreen extends FScreen implements IVConquestBase { @Override public void activate(int idx) { - ConquestMapScreen.this.activate(regionDisplay.opponents[idx]); + CommandCenterScreen.this.activate(regionDisplay.opponents[idx]); } }); } diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java index 5c3b3b438eb..7246a8113e9 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java @@ -20,13 +20,13 @@ import forge.toolbox.FEvent.FEventHandler; public class ConquestMenu extends FPopupMenu { private static final ConquestMenu conquestMenu = new ConquestMenu(); - private static final ConquestMapScreen mapScreen = new ConquestMapScreen(); + private static final CommandCenterScreen commanderCenterScreen = new CommandCenterScreen(); private static final ConquestPrefsScreen prefsScreen = new ConquestPrefsScreen(); - private static final FMenuItem mapItem = new FMenuItem("Planar Map", FSkinImage.QUEST_MAP, new FEventHandler() { + private static final FMenuItem mapItem = new FMenuItem("Command Center", FSkinImage.QUEST_MAP, new FEventHandler() { @Override public void handleEvent(FEvent e) { - Forge.openScreen(mapScreen); + Forge.openScreen(commanderCenterScreen); } }); @@ -56,14 +56,14 @@ public class ConquestMenu extends FPopupMenu { FModel.getConquest().load(ConquestDataIO.loadData(data)); ((DeckController)EditorType.PlanarConquest.getController()).setRootFolder(FModel.getConquest().getDecks()); if (reason == LaunchReason.StartPlanarConquest) { - Forge.openScreen(mapScreen); + Forge.openScreen(commanderCenterScreen); } else { - mapScreen.update(); + commanderCenterScreen.update(); if (reason == LaunchReason.LoadConquest) { Forge.back(); if (Forge.onHomeScreen()) { //open map screen if Load Conquest screen was opening direct from home screen - Forge.openScreen(mapScreen); + Forge.openScreen(commanderCenterScreen); } } else { @@ -72,7 +72,7 @@ public class ConquestMenu extends FPopupMenu { Forge.back(); //remove LoadConquestScreen from screen stack } if (Forge.onHomeScreen()) { //open map screen if New Conquest screen was opening direct from home screen - Forge.openScreen(mapScreen); + Forge.openScreen(commanderCenterScreen); } } } @@ -93,7 +93,7 @@ public class ConquestMenu extends FPopupMenu { @Override protected void buildMenu() { FScreen currentScreen = Forge.getCurrentScreen(); - addItem(mapItem); mapItem.setSelected(currentScreen == mapScreen); + addItem(mapItem); mapItem.setSelected(currentScreen == commanderCenterScreen); addItem(new FMenuItem("New Conquest", FSkinImage.NEW, new FEventHandler() { @Override public void handleEvent(FEvent e) {