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

Added filtering by Standard cards into DeckEditor. Changed sorting to release date.

Browse source
This commit is contained in:
magenoxx 2012-06-01 01:23:48 +04:00
parent 2e86a3b743
commit 9c3cc85ff2
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import mage.client.cards.CardsStorage;
import mage.client.cards.ICardGrid; import mage.client.cards.ICardGrid;
import mage.client.constants.Constants.SortBy; import mage.client.constants.Constants.SortBy;
import mage.client.deckeditor.table.TableModel; import mage.client.deckeditor.table.TableModel;
import mage.client.util.sets.ConstructedFormats;
import mage.filter.Filter.ComparisonScope; import mage.filter.Filter.ComparisonScope;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.sets.Sets; import mage.sets.Sets;
@ -152,15 +153,18 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
Arrays.sort(l, new Comparator<Object>() { Arrays.sort(l, new Comparator<Object>() {
@Override @Override
public int compare(Object o1, Object o2) { public int compare(Object o1, Object o2) {
return ((ExpansionSet)o1).getName().compareTo(((ExpansionSet)o2).getName()); return ((ExpansionSet)o2).getReleaseDate().compareTo(((ExpansionSet)o1).getReleaseDate());
} }
}); });
cbExpansionSet.setModel(new DefaultComboBoxModel(l)); cbExpansionSet.setModel(new DefaultComboBoxModel(l));
cbExpansionSet.insertItemAt("All sets", 0); cbExpansionSet.insertItemAt("-- All sets", 0);
cbExpansionSet.insertItemAt("-- Standard", 1);
cbExpansionSet.setSelectedIndex(0); cbExpansionSet.setSelectedIndex(0);
initFilter(); initFilter();
if (this.cbExpansionSet.getSelectedItem() instanceof ExpansionSet) { if (this.cbExpansionSet.getSelectedItem() instanceof ExpansionSet) {
filter.getExpansionSetCode().add(((ExpansionSet)this.cbExpansionSet.getSelectedItem()).getCode()); filter.getExpansionSetCode().add(((ExpansionSet) this.cbExpansionSet.getSelectedItem()).getCode());
} else if (this.cbExpansionSet.getSelectedItem().equals("-- Standard")) {
filter.getExpansionSetCode().addAll(ConstructedFormats.getSetsByFormat("Standard"));
} }
filterCards(); filterCards();
} }
@ -741,11 +745,16 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
if (cbExpansionSet.getSelectedItem() instanceof ExpansionSet) { if (cbExpansionSet.getSelectedItem() instanceof ExpansionSet) {
filter.getExpansionSetCode().add(((ExpansionSet)this.cbExpansionSet.getSelectedItem()).getCode()); filter.getExpansionSetCode().add(((ExpansionSet)this.cbExpansionSet.getSelectedItem()).getCode());
filterCards(); filterCards();
} else {
if (this.cbExpansionSet.getSelectedItem().equals("-- Standard")) {
filter.getExpansionSetCode().addAll(ConstructedFormats.getSetsByFormat("Standard"));
filterCards();
} else { } else {
// auto switch for ListView for "All sets" (too many cards to load) // auto switch for ListView for "All sets" (too many cards to load)
jToggleListView.doClick(); jToggleListView.doClick();
jToggleListView.setSelected(true); jToggleListView.setSelected(true);
} }
}
}//GEN-LAST:event_cbExpansionSetActionPerformed }//GEN-LAST:event_cbExpansionSetActionPerformed
@ -762,7 +771,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
} }
filterCards(); filterCards();
} else { } else {
JOptionPane.showMessageDialog(null, "It's not possible to generate booster for not Expansion Set but all cards\nChoose Expandsion Set firest."); JOptionPane.showMessageDialog(null, "It's not possible to generate booster for not Expansion Set \nChoose Expansion Set first.");
} }
}//GEN-LAST:event_btnBoosterActionPerformed }//GEN-LAST:event_btnBoosterActionPerformed