From 034f235196d30d8de9b6f093bca9481b246978c6 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 18 Jan 2014 01:26:59 +0000 Subject: [PATCH] Show color and other columns for quest opponent decks --- .../forge/gui/deckchooser/FDeckChooser.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java index 60ff8b8d7c7..671b9a14d6b 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java @@ -216,31 +216,20 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener { lstDecks.setSelectedIndex(0); } - private class QuestEventDeckGenerator extends DeckGenerator { - public QuestEventDeckGenerator(String name0) { - super(name0); - } - - @Override - public Deck generateDeck() { - return DeckgenUtil.getQuestEvent(this.getName()).getEventDeck(); - } - } - private void updateQuestEvents() { lstDecks.setAllowMultipleSelections(false); ArrayList decks = new ArrayList(); QuestController quest = Singletons.getModel().getQuest(); for (QuestEvent e : quest.getDuelsManager().getAllDuels()) { - decks.add(new QuestEventDeckGenerator(e.getName())); + decks.add(e.getEventDeck()); } for (QuestEvent e : quest.getChallenges()) { - decks.add(new QuestEventDeckGenerator(e.getTitle())); + decks.add(e.getEventDeck()); } lstDecks.setPool(decks); - lstDecks.update(true); + lstDecks.update(false, true); getBtnRandom().setText("Random Deck"); getBtnRandom().setCommand(new Command() {