external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor promptForName into static utility class

Browse Source
This commit is contained in:
drdev
2014-11-23 05:33:58 +00:00
parent 060fcba17d
commit 757af3b04d
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -9,6 +9,7 @@ import forge.planarconquest.ConquestController;
import forge.planarconquest.ConquestData; import forge.planarconquest.ConquestData;
import forge.planarconquest.ConquestPlane; import forge.planarconquest.ConquestPlane;
import forge.planarconquest.ConquestPreferences.CQPref; import forge.planarconquest.ConquestPreferences.CQPref;
import forge.planarconquest.ConquestUtil;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.screens.LoadingOverlay; import forge.screens.LoadingOverlay;
import forge.screens.planarconquest.ConquestMenu.LaunchReason; import forge.screens.planarconquest.ConquestMenu.LaunchReason;
@@ -100,7 +101,7 @@ public class NewConquestScreen extends FScreen {
} }
private void newConquest() { private void newConquest() {
String conquestName = FModel.getConquest().promptForName(); String conquestName = ConquestUtil.promptForName();
if (conquestName == null) { return; } if (conquestName == null) { return; }
startNewConquest(conquestName); startNewConquest(conquestName);
} }

21
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -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 @Subscribe
public void receiveGameEvent(GameEvent ev) { // Receives events only during planar conquest games public void receiveGameEvent(GameEvent ev) { // Receives events only during planar conquest games

25
forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
View File

@@ -14,7 +14,11 @@ import forge.deck.generation.DeckGeneratorBase;
import forge.deck.generation.DeckGeneratorMonoColor; import forge.deck.generation.DeckGeneratorMonoColor;
import forge.deck.generation.IDeckGenPool; import forge.deck.generation.IDeckGenPool;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.properties.ForgeConstants;
import forge.quest.QuestUtil;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.FileUtil;
import forge.util.gui.SOptionPane;
public class ConquestUtil { public class ConquestUtil {
private ConquestUtil() {} private ConquestUtil() {}
@@ -65,4 +69,25 @@ public class ConquestUtil {
return deck; 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;
}
} }