mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 20:28:00 +00:00
Refactor promptForName into static utility class
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user