From 7e913a632231763dac12c490139ea78e582af323 Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 19 Apr 2015 18:39:01 +0000 Subject: [PATCH] Update enum name --- forge-game/src/main/java/forge/game/GameType.java | 2 +- forge-gui-mobile/src/forge/deck/FDeckChooser.java | 10 +++++----- .../src/forge/screens/home/HomeScreen.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java index ae5ffd31327..615c293c7a6 100644 --- a/forge-game/src/main/java/forge/game/GameType.java +++ b/forge-game/src/main/java/forge/game/GameType.java @@ -17,7 +17,7 @@ public enum GameType { QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""), PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""), Constructed (DeckFormat.Constructed, false, true, true, "Constructed", ""), - DeckEditor (DeckFormat.Constructed, false, true, true, "Deck Editor", ""), + DeckEditorTest (DeckFormat.Constructed, false, true, true, "Deck Editor Test", ""), Vanguard (DeckFormat.Vanguard, true, true, true, "Vanguard", "Each player has a special \"Avatar\" card that affects the game."), Commander (DeckFormat.Commander, false, false, false, "Commander", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors."), TinyLeaders (DeckFormat.TinyLeaders, false, false, false, "Tiny Leaders", "Each player has a legendary \"General\" card which can be cast at any time and determines deck colors. Each card must have CMC less than 4."), diff --git a/forge-gui-mobile/src/forge/deck/FDeckChooser.java b/forge-gui-mobile/src/forge/deck/FDeckChooser.java index 00501f12339..b1118bce382 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckChooser.java +++ b/forge-gui-mobile/src/forge/deck/FDeckChooser.java @@ -80,7 +80,7 @@ public class FDeckChooser extends FScreen { lstDecks.setItemActivateHandler(new FEventHandler() { @Override public void handleEvent(FEvent e) { - if (lstDecks.getGameType() == GameType.DeckEditor) { + if (lstDecks.getGameType() == GameType.DeckEditorTest) { //for Deck Editor, edit deck instead of accepting editSelectedDeck(); return; @@ -158,7 +158,7 @@ public class FDeckChooser extends FScreen { btnRandom.setCommand(new FEventHandler() { @Override public void handleEvent(FEvent e) { - if (lstDecks.getGameType() == GameType.DeckEditor) { + if (lstDecks.getGameType() == GameType.DeckEditorTest) { //for Deck Editor, play deck instead of randomly selecting deck editSelectedDeck(); return; @@ -177,7 +177,7 @@ public class FDeckChooser extends FScreen { break; //delay initialize for constructed until saved decks can be reloaded case Commander: case Gauntlet: - case DeckEditor: + case DeckEditorTest: initialize(null, DeckType.CUSTOM_DECK); break; default: @@ -295,7 +295,7 @@ public class FDeckChooser extends FScreen { cmbDeckTypes.addItem(DeckType.RANDOM_DECK); cmbDeckTypes.addItem(DeckType.NET_DECK); break; - case DeckEditor: + case DeckEditorTest: cmbDeckTypes.addItem(DeckType.CUSTOM_DECK); cmbDeckTypes.addItem(DeckType.PRECONSTRUCTED_DECK); cmbDeckTypes.addItem(DeckType.QUEST_OPPONENT_DECK); @@ -452,7 +452,7 @@ public class FDeckChooser extends FScreen { btnNewDeck.setText("New Deck"); - if (lstDecks.getGameType() == GameType.DeckEditor) { + if (lstDecks.getGameType() == GameType.DeckEditorTest) { //handle special case of Deck Editor screen where this button will start a game with the deck btnRandom.setText("Test Deck"); } diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index 226adfbdd0f..28392892f3c 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -43,7 +43,7 @@ public class HomeScreen extends FScreen { addButton("Deck Editor", new FEventHandler() { @Override public void handleEvent(FEvent e) { - FDeckChooser.promptForDeck("Deck Editor", GameType.DeckEditor, false, null); + FDeckChooser.promptForDeck("Deck Editor", GameType.DeckEditorTest, false, null); } }); /*addButton("Planar Conquest", new FEventHandler() {