External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issue 281

Browse source
This commit is contained in:
BetaSteward 2011-10-15 23:42:24 -04:00
parent 4c1d0728bc
commit a21e815ae9
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -66,7 +66,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
private final List<Card> cards = new ArrayList<Card>();
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<Card> sideboard, BigCard bigCard, boolean construct) {
public void loadSideboard(List<Card> 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<Card> filteredCards = new ArrayList<Card>();
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

6
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -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<Card>(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited);
this.cardSelector.loadSideboard(new ArrayList<Card>(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<Card>(deck.getSideboard()), getBigCard(), mode == DeckEditorMode.Limited);
cardSelector.loadSideboard(new ArrayList<Card>(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<Card>(deck.getSideboard()), this.bigCard, mode == DeckEditorMode.Limited);
cardSelector.loadSideboard(new ArrayList<Card>(deck.getSideboard()), this.bigCard);
}
else {
deck = new Deck();