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

bit of cleanup in FDeckChooser

Browse Source
This commit is contained in:
myk
2013-02-26 16:40:48 +00:00
parent e3e0ab8d52
commit c2dd603394
2 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/deck/DeckgenUtil.java
View File

@@ -54,11 +54,10 @@ public class DeckgenUtil {
COLOR_VALS.put("White", "white"); COLOR_VALS.put("White", "white");
} }
/** */ public enum DeckTypes {
public enum DeckTypes { /** */ COLORS,
COLORS, /** */ THEMES,
THEMES, /** */ CUSTOM,
CUSTOM, /** */
QUESTEVENTS QUESTEVENTS
} }

57
src/main/java/forge/gui/toolbox/FDeckChooser.java
View File

@@ -32,15 +32,6 @@ import forge.util.storage.IStorage;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FDeckChooser extends JPanel { public class FDeckChooser extends JPanel {
private enum ESubmenuConstructedTypes {
COLORS,
THEMES,
CUSTOM,
QUESTEVENTS
}
private final QuestController quest = Singletons.getModel().getQuest();
private final JRadioButton radColors = new FRadioButton("Fully random color deck"); private final JRadioButton radColors = new FRadioButton("Fully random color deck");
private final JRadioButton radThemes = new FRadioButton("Semi-random theme deck"); private final JRadioButton radThemes = new FRadioButton("Semi-random theme deck");
private final JRadioButton radCustom = new FRadioButton("Custom user deck"); private final JRadioButton radCustom = new FRadioButton("Custom user deck");
@@ -60,10 +51,9 @@ public class FDeckChooser extends JPanel {
private final MouseAdapter madDecklist = new MouseAdapter() { private final MouseAdapter madDecklist = new MouseAdapter() {
@Override @Override
public void mouseClicked(final MouseEvent e) { public void mouseClicked(final MouseEvent e) {
if (e.getClickCount() == 2) { if (MouseEvent.BUTTON1 == e.getButton() && e.getClickCount() == 2) {
final JList src = ((JList) e.getSource()); final JList src = ((JList) e.getSource());
if (getRadColors().isSelected()) { return; } if (getRadColors().isSelected() || getRadThemes().isSelected()) { return; }
if (getRadThemes().isSelected()) { return; }
DeckgenUtil.showDecklist(src); DeckgenUtil.showDecklist(src);
} }
} }
@@ -123,7 +113,7 @@ public class FDeckChooser extends JPanel {
lst.setListData(new String[] {"Random 1", "Random 2", "Random 3", lst.setListData(new String[] {"Random 1", "Random 2", "Random 3",
"Random 4", "Black", "Blue", "Green", "Red", "White"}); "Random 4", "Black", "Blue", "Green", "Red", "White"});
lst.setName(ESubmenuConstructedTypes.COLORS.toString()); lst.setName(DeckgenUtil.DeckTypes.COLORS.toString());
lst.removeMouseListener(madDecklist); lst.removeMouseListener(madDecklist);
lst.addMouseListener(madDecklist); lst.addMouseListener(madDecklist);
@@ -139,7 +129,6 @@ public class FDeckChooser extends JPanel {
final JList lst = getLstDecks(); final JList lst = getLstDecks();
lst.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); lst.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
lst.setName(ESubmenuConstructedTypes.COLORS.toString());
lst.removeMouseListener(madDecklist); lst.removeMouseListener(madDecklist);
lst.addMouseListener(madDecklist); lst.addMouseListener(madDecklist);
@@ -147,7 +136,7 @@ public class FDeckChooser extends JPanel {
for (final String s : GenerateThemeDeck.getThemeNames()) { themeNames.add(s); } for (final String s : GenerateThemeDeck.getThemeNames()) { themeNames.add(s); }
lst.setListData(themeNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY)); lst.setListData(themeNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY));
lst.setName(ESubmenuConstructedTypes.THEMES.toString()); lst.setName(DeckgenUtil.DeckTypes.THEMES.toString());
lst.removeMouseListener(madDecklist); lst.removeMouseListener(madDecklist);
getBtnRandom().setCommand(new Command() { getBtnRandom().setCommand(new Command() {
@@ -167,7 +156,7 @@ public class FDeckChooser extends JPanel {
for (final Deck d : allDecks) { customNames.add(d.getName()); } for (final Deck d : allDecks) { customNames.add(d.getName()); }
lst.setListData(customNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY)); lst.setListData(customNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY));
lst.setName(ESubmenuConstructedTypes.CUSTOM.toString()); lst.setName(DeckgenUtil.DeckTypes.CUSTOM.toString());
lst.removeMouseListener(madDecklist); lst.removeMouseListener(madDecklist);
lst.addMouseListener(madDecklist); lst.addMouseListener(madDecklist);
@@ -185,16 +174,17 @@ public class FDeckChooser extends JPanel {
final List<String> eventNames = new ArrayList<String>(); final List<String> eventNames = new ArrayList<String>();
for (final QuestEvent e : quest.getDuelsManager().getAllDuels()) { QuestController quest = Singletons.getModel().getQuest();
for (QuestEvent e : quest.getDuelsManager().getAllDuels()) {
eventNames.add(e.getEventDeck().getName()); eventNames.add(e.getEventDeck().getName());
} }
for (final QuestEvent e : quest.getChallengesManager().getAllChallenges()) { for (QuestEvent e : quest.getChallengesManager().getAllChallenges()) {
eventNames.add(e.getEventDeck().getName()); eventNames.add(e.getEventDeck().getName());
} }
lst.setListData(eventNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY)); lst.setListData(eventNames.toArray(ArrayUtils.EMPTY_STRING_ARRAY));
lst.setName(ESubmenuConstructedTypes.QUESTEVENTS.toString()); lst.setName(DeckgenUtil.DeckTypes.QUESTEVENTS.toString());
lst.removeMouseListener(madDecklist); lst.removeMouseListener(madDecklist);
lst.addMouseListener(madDecklist); lst.addMouseListener(madDecklist);
@@ -210,29 +200,20 @@ public class FDeckChooser extends JPanel {
JList lst0 = getLstDecks(); JList lst0 = getLstDecks();
final String[] selection = Arrays.copyOf(lst0.getSelectedValues(), lst0.getSelectedValues().length, String[].class); final String[] selection = Arrays.copyOf(lst0.getSelectedValues(), lst0.getSelectedValues().length, String[].class);
final Deck deck;
if (selection.length == 0) { return null; } if (selection.length == 0) { return null; }
if (lst0.getName().equals(ESubmenuConstructedTypes.COLORS.toString()) && DeckgenUtil.colorCheck(selection)) { if (lst0.getName().equals(DeckgenUtil.DeckTypes.COLORS.toString()) && DeckgenUtil.colorCheck(selection)) {
deck = DeckgenUtil.buildColorDeck(selection, getPlayerType()); return DeckgenUtil.buildColorDeck(selection, getPlayerType());
} } else if (lst0.getName().equals(DeckgenUtil.DeckTypes.THEMES.toString())) {
else if (lst0.getName().equals(ESubmenuConstructedTypes.THEMES.toString())) { return DeckgenUtil.buildThemeDeck(selection);
deck = DeckgenUtil.buildThemeDeck(selection); } else if (lst0.getName().equals(DeckgenUtil.DeckTypes.QUESTEVENTS.toString())) {
} return DeckgenUtil.buildQuestDeck(selection);
else if (lst0.getName().equals(ESubmenuConstructedTypes.QUESTEVENTS.toString())) { } else if (lst0.getName().equals(DeckgenUtil.DeckTypes.CUSTOM.toString())) {
deck = DeckgenUtil.buildQuestDeck(selection); return DeckgenUtil.getConstructedDeck(selection);
}
// Custom deck
else if (lst0.getName().equals(ESubmenuConstructedTypes.CUSTOM.toString())) {
deck = DeckgenUtil.getConstructedDeck(selection);
}
// Failure, for some reason
else {
deck = null;
} }
return deck; // Failure, for some reason
return null;
} }
private PlayerType getPlayerType() { private PlayerType getPlayerType() {