Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Aded Random deck generation to Mage.Client start up dialog. Also now all cards on client can be fetched using CardsStorage.getAllCards() method.

Browse source
This commit is contained in:
magenoxx 2010-11-30 16:16:54 +00:00
parent 791ce58b23
commit 2987d15b4e
10 changed files with 530 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,7 @@ import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.client.cards.BigCard;
import mage.client.cards.CardGrid;
import mage.client.cards.CardsStorage;
import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard;
import mage.sets.Sets;
@ -58,7 +59,6 @@ import mage.view.CardsView;
*/
public class CardSelector extends javax.swing.JPanel implements ComponentListener {
private final Set<Card> allCards = new LinkedHashSet<Card>();
private final List<Card> cards = new ArrayList<Card>();
private final FilterCard filter = new FilterCard();
private BigCard bigCard;
@ -73,9 +73,6 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
this.bigCard = bigCard;
cbExpansionSet.setModel(new DefaultComboBoxModel(Sets.getInstance().values().toArray()));
// cbExpansionSet.insertItemAt("All sets", 0);
for (ExpansionSet set: Sets.getInstance().values()) {
allCards.addAll(set.createCards());
}
cbExpansionSet.setSelectedIndex(0);
filter.setUseColor(true);
filter.getColor().setBlack(true);
@ -103,7 +100,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
try {
setCursor(new Cursor(Cursor.WAIT_CURSOR));
cards.clear();
for (Card card: allCards) {
for (Card card: CardsStorage.getAllCards()) {
if (filter.match(card))
cards.add(card);
}