From 757af3b04d4a5884bba99e6fc20e4ec1dc2a75d0 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 23 Nov 2014 05:33:58 +0000
Subject: [PATCH] Refactor promptForName into static utility class

---
 .../planarconquest/NewConquestScreen.java     |  3 ++-
 .../planarconquest/ConquestController.java    | 21 ----------------
 .../forge/planarconquest/ConquestUtil.java    | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
index 534cd0741fe..1b0ddb1f9ad 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
@@ -9,6 +9,7 @@ import forge.planarconquest.ConquestController;
 import forge.planarconquest.ConquestData;
 import forge.planarconquest.ConquestPlane;
 import forge.planarconquest.ConquestPreferences.CQPref;
+import forge.planarconquest.ConquestUtil;
 import forge.screens.FScreen;
 import forge.screens.LoadingOverlay;
 import forge.screens.planarconquest.ConquestMenu.LaunchReason;
@@ -100,7 +101,7 @@ public class NewConquestScreen extends FScreen {
     }
 
     private void newConquest() {
-        String conquestName = FModel.getConquest().promptForName();
+        String conquestName = ConquestUtil.promptForName();
         if (conquestName == null) { return; }
         startNewConquest(conquestName);
     }
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
index d6532e3a622..6f8dd7250a5 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
@@ -64,27 +64,6 @@ public class ConquestController {
         }
     }
 
-    public String promptForName() {
-        String name;
-        while (true) {
-            name = SOptionPane.showInputDialog("Historians will recall your conquest as:", "Conquest Name");
-            if (name == null) { return null; }
-    
-            name = QuestUtil.cleanString(name);
-    
-            if (name.isEmpty()) {
-                SOptionPane.showMessageDialog("Please specify a conquest name.");
-                continue;
-            }
-            if (FileUtil.doesFileExist(ForgeConstants.CONQUEST_SAVE_DIR + name + ".dat")) {
-                SOptionPane.showMessageDialog("A conquest already exists with that name. Please pick another quest name.");
-                continue;
-            }
-            break;
-        }
-        return name;
-    }
-
     @Subscribe
     public void receiveGameEvent(GameEvent ev) { // Receives events only during planar conquest games
 
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
index b89f95d5947..4727342f693 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
@@ -14,7 +14,11 @@ import forge.deck.generation.DeckGeneratorBase;
 import forge.deck.generation.DeckGeneratorMonoColor;
 import forge.deck.generation.IDeckGenPool;
 import forge.item.PaperCard;
+import forge.properties.ForgeConstants;
+import forge.quest.QuestUtil;
 import forge.util.Aggregates;
+import forge.util.FileUtil;
+import forge.util.gui.SOptionPane;
 
 public class ConquestUtil {
     private ConquestUtil() {}
@@ -65,4 +69,25 @@ public class ConquestUtil {
 
         return deck;
     }
+
+    public static String promptForName() {
+        String name;
+        while (true) {
+            name = SOptionPane.showInputDialog("Historians will recall your conquest as:", "Conquest Name");
+            if (name == null) { return null; }
+    
+            name = QuestUtil.cleanString(name);
+    
+            if (name.isEmpty()) {
+                SOptionPane.showMessageDialog("Please specify a conquest name.");
+                continue;
+            }
+            if (FileUtil.doesFileExist(ForgeConstants.CONQUEST_SAVE_DIR + name + ".dat")) {
+                SOptionPane.showMessageDialog("A conquest already exists with that name. Please pick another quest name.");
+                continue;
+            }
+            break;
+        }
+        return name;
+    }
 }