From a21e815ae98b153d9021d4a232ae87b5a55a3511 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sat, 15 Oct 2011 23:42:24 -0400 Subject: [PATCH] fixed issue 281 --- .../java/mage/client/deckeditor/CardSelector.java | 12 ++++++------ .../java/mage/client/deckeditor/DeckEditorPanel.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java index 57e6bf5a015..979856dda45 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java @@ -66,7 +66,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene private final List cards = new ArrayList(); private final FilterCard filter = new FilterCard(); private BigCard bigCard; - private boolean construct = false; + private boolean limited = false; /** Creates new form CardSelector */ public CardSelector() { @@ -122,12 +122,12 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene }); } - public void loadCards(List sideboard, BigCard bigCard, boolean construct) { + public void loadSideboard(List sideboard, BigCard bigCard) { this.bigCard = bigCard; this.btnBooster.setVisible(false); this.btnClear.setVisible(false); this.cbExpansionSet.setVisible(false); - this.construct = construct; + this.limited = true; this.cards.clear(); for (Card card: sideboard) { this.cards.add(card); @@ -183,7 +183,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene try { List filteredCards = new ArrayList(); setCursor(new Cursor(Cursor.WAIT_CURSOR)); - if (!cards.isEmpty()) { + if (limited) { for (Card card: cards) { if (filter.match(card)) filteredCards.add(card); @@ -761,7 +761,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene mainModel.doubleClick(index); } //if (!mode.equals(Constants.DeckEditorMode.Constructed)) - if (construct) + if (limited) mainModel.fireTableDataChanged(); } }//GEN-LAST:event_jButtonAddToMainActionPerformed @@ -775,7 +775,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene mainModel.shiftDoubleClick(index); } //if (!mode.equals(Constants.DeckEditorMode.Constructed)) - if (construct) + if (limited) mainModel.fireTableDataChanged(); } }//GEN-LAST:event_jButtonAddToSideboardActionPerformed diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 8f4b869f1f3..06d04500147 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -127,7 +127,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { this.txtTimeRemaining.setVisible(true); case Sideboard: this.btnSubmit.setVisible(true); - this.cardSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); + this.cardSelector.loadSideboard(new ArrayList(deck.getSideboard()), this.bigCard); this.btnExit.setVisible(false); this.btnImport.setVisible(false); if (!MageFrame.getSession().isTestMode()) @@ -208,7 +208,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { deck.getCards().remove(card); if (mode == DeckEditorMode.Limited || mode == DeckEditorMode.Sideboard) { deck.getSideboard().add(card); - cardSelector.loadCards(new ArrayList(deck.getSideboard()), getBigCard(), mode == DeckEditorMode.Limited); + cardSelector.loadSideboard(new ArrayList(deck.getSideboard()), getBigCard()); } break; } @@ -529,7 +529,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { deck.getSideboard().add(card); } deck.getCards().clear(); - cardSelector.loadCards(new ArrayList(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited); + cardSelector.loadSideboard(new ArrayList(deck.getSideboard()), this.bigCard); } else { deck = new Deck();