external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

made deck color filters null-tolerant

Browse Source
This commit is contained in:
Maxmtg
2014-02-02 01:53:45 +00:00
parent 5a22e6a15d
commit 0adcfe55aa
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java
View File

@@ -103,12 +103,6 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener {
this.index = index0; this.index = index0;
} }
@Override
public ColorSet getColor() {
// TODO Auto-generated method stub
return ColorSet.getNullColor();
}
@Override @Override
public String getName() { public String getName() {
return name; return name;

24
forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java
View File

@@ -3,8 +3,9 @@ package forge.gui.toolbox.itemmanager.filters;
import javax.swing.JPanel; import javax.swing.JPanel;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.deck.Deck;
import forge.gui.deckeditor.DeckProxy; import forge.gui.deckeditor.DeckProxy;
import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManager;
import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes;
@@ -80,43 +81,50 @@ public class DeckColorFilter extends StatTypeFilter<DeckProxy> {
private static final Predicate<DeckProxy> IS_WHITE = new Predicate<DeckProxy>() { private static final Predicate<DeckProxy> IS_WHITE = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().hasAnyColor(MagicColor.WHITE); ColorSet cs = deck.getColor();
return cs != null && cs.hasAnyColor(MagicColor.WHITE);
} }
}; };
private static final Predicate<DeckProxy> IS_BLUE = new Predicate<DeckProxy>() { private static final Predicate<DeckProxy> IS_BLUE = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().hasAnyColor(MagicColor.BLUE); ColorSet cs = deck.getColor();
return cs != null && cs.hasAnyColor(MagicColor.BLUE);
} }
}; };
public static final Predicate<DeckProxy> IS_BLACK = new Predicate<DeckProxy>() { public static final Predicate<DeckProxy> IS_BLACK = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().hasAnyColor(MagicColor.BLACK); ColorSet cs = deck.getColor();
return cs != null && cs.hasAnyColor(MagicColor.BLACK);
} }
}; };
public static final Predicate<DeckProxy> IS_RED = new Predicate<DeckProxy>() { public static final Predicate<DeckProxy> IS_RED = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().hasAnyColor(MagicColor.RED); ColorSet cs = deck.getColor();
return cs != null && cs.hasAnyColor(MagicColor.RED);
} }
}; };
public static final Predicate<DeckProxy> IS_GREEN = new Predicate<DeckProxy>() { public static final Predicate<DeckProxy> IS_GREEN = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().hasAnyColor(MagicColor.GREEN); ColorSet cs = deck.getColor();
return cs != null && cs.hasAnyColor(MagicColor.GREEN);
} }
}; };
private static final Predicate<DeckProxy> IS_COLORLESS = new Predicate<DeckProxy>() { private static final Predicate<DeckProxy> IS_COLORLESS = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return deck.getColor().getColor() == 0; ColorSet cs = deck.getColor();
return cs != null && cs.getColor() == 0;
} }
}; };
private static final Predicate<DeckProxy> IS_MULTICOLOR = new Predicate<DeckProxy>() { private static final Predicate<DeckProxy> IS_MULTICOLOR = new Predicate<DeckProxy>() {
@Override @Override
public boolean apply(final DeckProxy deck) { public boolean apply(final DeckProxy deck) {
return BinaryUtil.bitCount(deck.getColor().getColor()) > 1; ColorSet cs = deck.getColor();
return cs != null && BinaryUtil.bitCount(cs.getColor()) > 1;
} }
}; };