diff --git a/src/main/java/forge/gui/CardPicturePanel.java b/src/main/java/forge/gui/CardPicturePanel.java
index 8136cd1d8ab..7fedbd58509 100644
--- a/src/main/java/forge/gui/CardPicturePanel.java
+++ b/src/main/java/forge/gui/CardPicturePanel.java
@@ -106,7 +106,7 @@ public final class CardPicturePanel extends JPanel implements CardContainer {
this.card = null;
this.inventoryItem = cp;
if (!this.isShowing()) {
- // This line didn't seem to be helping, and doesn't exist down there
+ // This line didn't seem to be helping, and doesn't exist down there
// return;
}
diff --git a/src/main/java/forge/gui/DualListBox.java b/src/main/java/forge/gui/DualListBox.java
index c906331f083..0188e630719 100644
--- a/src/main/java/forge/gui/DualListBox.java
+++ b/src/main/java/forge/gui/DualListBox.java
@@ -99,7 +99,7 @@ public class DualListBox extends JPanel {
private void fillListModel(UnsortedListModel model, ListModel newValues) {
int size = newValues.getSize();
for (int i = 0; i < size; i++) {
- model.add((T)newValues.getElementAt(i));
+ model.add((T) newValues.getElementAt(i));
}
}
diff --git a/src/main/java/forge/gui/GuiChoose.java b/src/main/java/forge/gui/GuiChoose.java
index cd850d4d333..e05be0ba8a3 100644
--- a/src/main/java/forge/gui/GuiChoose.java
+++ b/src/main/java/forge/gui/GuiChoose.java
@@ -190,7 +190,7 @@ public class GuiChoose {
CMatchUI.SINGLETON_INSTANCE.setCard((Card) list.getSelectedValue());
GuiUtils.clearPanelSelections();
- GuiUtils.setPanelSelection((Card)list.getSelectedValue());
+ GuiUtils.setPanelSelection((Card) list.getSelectedValue());
}
if (list.getSelectedValue() instanceof InventoryItem) {
CMatchUI.SINGLETON_INSTANCE.setCard((InventoryItem) list.getSelectedValue());
diff --git a/src/main/java/forge/gui/GuiDisplayUtil.java b/src/main/java/forge/gui/GuiDisplayUtil.java
index a8f64869d70..4ac1cd74087 100644
--- a/src/main/java/forge/gui/GuiDisplayUtil.java
+++ b/src/main/java/forge/gui/GuiDisplayUtil.java
@@ -338,8 +338,8 @@ public final class GuiDisplayUtil {
*
*/
public static void updateGUI() {
- for( Player p : Singletons.getModel().getGame().getRegisteredPlayers())
- {
+ for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) {
+
// why was it written twice?
p.getZone(ZoneType.Battlefield).updateObservers();
}
@@ -459,7 +459,7 @@ public final class GuiDisplayUtil {
final Player human = Singletons.getControl().getPlayer();
final Player ai = human.getOpponent();
-
+
if (!tChangePlayer.trim().toLowerCase().equals("none")) {
if (tChangePlayer.trim().toLowerCase().equals("human")) {
Singletons.getModel().getGame().getPhaseHandler().setPlayerTurn(human);
@@ -470,7 +470,7 @@ public final class GuiDisplayUtil {
}
-
+
if (!tChangePhase.trim().toLowerCase().equals("none")) {
Singletons.getModel().getGame().getPhaseHandler().setDevPhaseState(forge.game.phase.PhaseType.smartValueOf(tChangePhase));
}
@@ -740,7 +740,7 @@ public final class GuiDisplayUtil {
}
}
}
-
+
/**
*
* devModeTutorAnyCard.
@@ -751,15 +751,19 @@ public final class GuiDisplayUtil {
public static void devModeCardToHand() {
final List players = Singletons.getModel().getGame().getPlayers();
final Player p = GuiChoose.oneOrNone("Put card in play for which player?", players);
- if (null == p) return;
+ if (null == p) {
+ return;
+ }
final List cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards());
Collections.sort(cards);
-
+
// use standard forge's list selection dialog
final CardPrinted c = GuiChoose.oneOrNone("Name the card", cards);
- if (c == null) return;
-
+ if (c == null) {
+ return;
+ }
+
Card forgeCard = c.toForgeCard(p);
Singletons.getModel().getGame().getAction().moveToHand(forgeCard);
@@ -768,22 +772,30 @@ public final class GuiDisplayUtil {
public static void devModeCardToBattlefield() {
final List players = Singletons.getModel().getGame().getPlayers();
final Player p = GuiChoose.oneOrNone("Put card in play for which player?", players);
- if (null == p) return;
+ if (null == p) {
+ return;
+ }
final List cards = Lists.newArrayList(CardDb.instance().getAllUniqueCards());
Collections.sort(cards);
// use standard forge's list selection dialog
final CardPrinted c = GuiChoose.oneOrNone("Name the card", cards);
- if (c == null) return;
-
- Card forgeCard = c.toForgeCard(p);
-
- final List choices = forgeCard.getBasicSpells();
- if (choices.isEmpty()) return; // when would it happen?
+ if (c == null) {
+ return;
+ }
- final SpellAbility sa = choices.size() == 1 ? choices.get(0) : GuiChoose.oneOrNone("Choose", choices);
- if (sa == null) return; // happens if cancelled
+ Card forgeCard = c.toForgeCard(p);
+
+ final List choices = forgeCard.getBasicSpells();
+ if (choices.isEmpty()) {
+ return; // when would it happen?
+ }
+
+ final SpellAbility sa = choices.size() == 1 ? choices.get(0) : GuiChoose.oneOrNone("Choose", choices);
+ if (sa == null) {
+ return; // happens if cancelled
+ }
sa.setActivatingPlayer(p);
@@ -791,8 +803,8 @@ public final class GuiDisplayUtil {
game.getAction().moveToHand(forgeCard); // this is really needed
game.getAction().playSpellAbilityForFree(sa);
-
- }
+
+ }
public static void devModeBreakpoint() {
List Players = Singletons.getModel().getGame().getPlayers();
diff --git a/src/main/java/forge/gui/GuiInput.java b/src/main/java/forge/gui/GuiInput.java
index 81a63d07381..58309405027 100644
--- a/src/main/java/forge/gui/GuiInput.java
+++ b/src/main/java/forge/gui/GuiInput.java
@@ -52,7 +52,7 @@ public class GuiInput extends MyObservable implements Observer {
if (tmp != null) {
// System.out.println(ph.getPlayerTurn() + "'s " + ph.getPhase() + ", priority of " + ph.getPriorityPlayer() + " @ input is " + tmp.getClass().getName() );
this.setInput(tmp);
- } else if ( !ph.mayPlayerHavePriority() ) {
+ } else if (!ph.mayPlayerHavePriority()) {
//System.out.println("cannot have priority, forced to pass");
ph.passPriority();
}
diff --git a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
index 150ac42e7c2..b82e4ea0c68 100644
--- a/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
+++ b/src/main/java/forge/gui/GuiMigrateLocalMWSSetPicturesHQ.java
@@ -491,8 +491,8 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
final String urlBase = "C:\\MTGForge\\HQPICS\\";
String imgFN = "";
- for (final CardPrinted cp : CardDb.instance().getAllTraditionalCards())
- {
+ for (final CardPrinted cp : CardDb.instance().getAllTraditionalCards()) {
+
// String url = c.getSVar("Picture");
// String[] URLs = url.split("\\\\");
String edCode = cp.getEdition();
@@ -504,8 +504,8 @@ public final class GuiMigrateLocalMWSSetPicturesHQ extends DefaultBoundedRangeMo
final int maxIndex = cp.getCard().getEditionInfo(cp.getEdition()).getCopiesCount();
String k = maxIndex > 1 ? Integer.valueOf(cp.getArtIndex() + 1).toString() : "";
final String fn = GuiDisplayUtil.cleanStringMWS(cp.getName()) + k + ".full.jpg";
- final String destFn = imgBase + File.pathSeparator + edCode + File.pathSeparator + imgFN + k + ".jpg";
- cList.add(new MCard( destFn, urlBase + setCode2 + "\\" + fn, edCode));
+ final String destFn = imgBase + File.pathSeparator + edCode + File.pathSeparator + imgFN + k + ".jpg";
+ cList.add(new MCard(destFn, urlBase + setCode2 + "\\" + fn, edCode));
}
// Log.error(iName + ".jpg" + "\t" + URLs[0]);
diff --git a/src/main/java/forge/gui/GuiUtils.java b/src/main/java/forge/gui/GuiUtils.java
index e8cecd12743..96b9e45a093 100644
--- a/src/main/java/forge/gui/GuiUtils.java
+++ b/src/main/java/forge/gui/GuiUtils.java
@@ -203,7 +203,7 @@ public final class GuiUtils {
* Highlight a card on the playfield.
*
* @param c
- * a card to be highlighted
+ * a card to be highlighted
*/
public static void setPanelSelection(final Card c) {
mainLoop:
diff --git a/src/main/java/forge/gui/UnsortedListModel.java b/src/main/java/forge/gui/UnsortedListModel.java
index 5b4ac0291c3..ec80c0d14b3 100644
--- a/src/main/java/forge/gui/UnsortedListModel.java
+++ b/src/main/java/forge/gui/UnsortedListModel.java
@@ -33,8 +33,9 @@ public class UnsortedListModel extends AbstractListModel { // Java 7 has a ge
}
public void addAll(T[] elements) {
- for(T e : elements)
+ for (T e : elements) {
model.add(e);
+ }
fireContentsChanged(this, 0, getSize());
}
@@ -42,8 +43,8 @@ public class UnsortedListModel extends AbstractListModel { // Java 7 has a ge
model.addAll(elements);
fireContentsChanged(this, 0, getSize());
}
-
-
+
+
public void clear() {
model.clear();
fireContentsChanged(this, 0, getSize());
@@ -64,4 +65,4 @@ public class UnsortedListModel extends AbstractListModel { // Java 7 has a ge
}
return removed;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java b/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
index 6d5d6616746..2b320c517f5 100644
--- a/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
+++ b/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java
@@ -60,14 +60,14 @@ public enum CDeckEditorUI implements CardContainer {
}
/**
- * Set Pack, for when Packs can be shown in the CardPicturePanel
+ * Set Pack, for when Packs can be shown in the CardPicturePanel.
* @param item
*/
public void setCard(final InventoryItem item) {
CDetail.SINGLETON_INSTANCE.showCard(item);
CPicture.SINGLETON_INSTANCE.showCard(item);
}
-
+
//========= Accessor/mutator methods
/**
* @return ACEditorBase, ?>
diff --git a/src/main/java/forge/gui/deckeditor/DeckImport.java b/src/main/java/forge/gui/deckeditor/DeckImport.java
index a01056e2792..0ac27a7483b 100644
--- a/src/main/java/forge/gui/deckeditor/DeckImport.java
+++ b/src/main/java/forge/gui/deckeditor/DeckImport.java
@@ -88,7 +88,7 @@ public class DeckImport ex
private final JButton cmdAccept = new JButton("Import Deck");
private final JButton cmdCancel = new JButton("Cancel");
private final JCheckBox newEditionCheck = new JCheckBox("Import latest version of card", true);
-
+
/** The tokens. */
private final List tokens = new ArrayList();
diff --git a/src/main/java/forge/gui/deckeditor/SEditorUtil.java b/src/main/java/forge/gui/deckeditor/SEditorUtil.java
index 62cf33dcc37..0e639d43dd9 100644
--- a/src/main/java/forge/gui/deckeditor/SEditorUtil.java
+++ b/src/main/java/forge/gui/deckeditor/SEditorUtil.java
@@ -91,7 +91,7 @@ public final class SEditorUtil {
int sum = Aggregates.sum(Iterables.filter(deck, Predicates.compose(predicate, deck.getFnToCard())), deck.getFnToCount());
label.setText(String.valueOf(sum));
}
-
+
/**
* setStats.
*
diff --git a/src/main/java/forge/gui/deckeditor/SFilterUtil.java b/src/main/java/forge/gui/deckeditor/SFilterUtil.java
index e720a0eb1f4..482411985c0 100644
--- a/src/main/java/forge/gui/deckeditor/SFilterUtil.java
+++ b/src/main/java/forge/gui/deckeditor/SFilterUtil.java
@@ -191,18 +191,19 @@ public class SFilterUtil {
if (MAP_COLOR_CHECKBOXES.get(FilterProperty.RED).getCheckBox().isSelected()) { colors.add(CardRulesPredicates.Presets.IS_RED); }
if (MAP_COLOR_CHECKBOXES.get(FilterProperty.WHITE).getCheckBox().isSelected()) { colors.add(CardRulesPredicates.Presets.IS_WHITE); }
if (MAP_COLOR_CHECKBOXES.get(FilterProperty.COLORLESS).getCheckBox().isSelected()) { colors.add(CardRulesPredicates.Presets.IS_COLORLESS); }
-
+
final Predicate preColors = colors.size() == 6 ? null : Predicates.or(colors);
-
-
- boolean wantMulticolor = MAP_COLOR_CHECKBOXES.get(FilterProperty.MULTICOLOR).getCheckBox().isSelected();
- final Predicate preExceptMulti = wantMulticolor ? null : Predicates.not(CardRulesPredicates.Presets.IS_MULTICOLOR);
+
+
+ boolean wantMulticolor = MAP_COLOR_CHECKBOXES.get(FilterProperty.MULTICOLOR).getCheckBox().isSelected();
+ final Predicate preExceptMulti = wantMulticolor ? null : Predicates.not(CardRulesPredicates.Presets.IS_MULTICOLOR);
Predicate preFinal = colors.isEmpty() && wantMulticolor ? CardRulesPredicates.Presets.IS_MULTICOLOR : optimizedAnd(preExceptMulti, preColors);
-
- if ( null == preFinal)
+
+ if (null == preFinal) {
return Predicates.alwaysTrue();
-
+ }
+
return Predicates.compose(preFinal, CardPrinted.FN_GET_RULES);
}
@@ -213,7 +214,7 @@ public class SFilterUtil {
*/
public static Predicate buildSetAndFormatFilter() {
// Set/Format filter
- JComboBox cbox = VFilters.SINGLETON_INSTANCE.getCbxSets();
+ JComboBox cbox = VFilters.SINGLETON_INSTANCE.getCbxSets();
if (cbox.getSelectedIndex() == 0) {
return Predicates.alwaysTrue();
}
@@ -246,9 +247,10 @@ public class SFilterUtil {
if (MAP_TYPE_CHECKBOXES.get(FilterProperty.PLANESWALKER).getCheckBox().isSelected()) { ors.add(CardRulesPredicates.Presets.IS_PLANESWALKER); }
if (MAP_TYPE_CHECKBOXES.get(FilterProperty.SORCERY).getCheckBox().isSelected()) { ors.add(CardRulesPredicates.Presets.IS_SORCERY); }
- if (ors.size() == 7)
+ if (ors.size() == 7) {
return Predicates.alwaysTrue();
-
+ }
+
return Predicates.compose(Predicates.or(ors), CardPrinted.FN_GET_RULES);
}
@@ -312,25 +314,27 @@ public class SFilterUtil {
filterNot = Predicates.not(Predicates.or(nots));
}
Predicate preResult = optimizedAnd(filterAnd, filterNot);
- if ( preResult == null ) return Predicates.alwaysTrue();
+ if (preResult == null) {
+ return Predicates.alwaysTrue();
+ }
return Predicates.compose(preResult, CardPrinted.FN_GET_RULES);
}
private static Predicate getCardRulesFieldPredicate(String min, String max, CardRulesPredicates.LeafNumber.CardField field) {
boolean hasMin = !("*".equals(min));
boolean hasMax = !("10+".equals(max));
-
+
Predicate pMin = !hasMin ? null : new CardRulesPredicates.LeafNumber(field, ComparableOp.GT_OR_EQUAL, Integer.valueOf(min));
Predicate pMax = !hasMax ? null : new CardRulesPredicates.LeafNumber(field, ComparableOp.LT_OR_EQUAL, Integer.valueOf(max));
-
+
return optimizedAnd(pMin, pMax);
}
-
+
private static Predicate optimizedAnd(Predicate p1, Predicate p2)
{
- return p1 == null ? p2 : ( p2 == null ? p1 : Predicates.and(p1, p2) );
+ return p1 == null ? p2 : (p2 == null ? p1 : Predicates.and(p1, p2));
}
-
+
/**
* Validates combo box input, assembles predicate filters for each case,
* stacks them all together, and returns the predicate.
@@ -344,15 +348,16 @@ public class SFilterUtil {
Predicate preToughness = getCardRulesFieldPredicate(view.getCbxTLow().getSelectedItem().toString(), view.getCbxTHigh().getSelectedItem().toString(), CardRulesPredicates.LeafNumber.CardField.TOUGHNESS);
Predicate prePower = getCardRulesFieldPredicate(view.getCbxPLow().getSelectedItem().toString(), view.getCbxPHigh().getSelectedItem().toString(), CardRulesPredicates.LeafNumber.CardField.POWER);
Predicate preCMC = getCardRulesFieldPredicate(view.getCbxCMCLow().getSelectedItem().toString(), view.getCbxCMCHigh().getSelectedItem().toString(), CardRulesPredicates.LeafNumber.CardField.CMC);
-
+
Predicate preCreature = optimizedAnd(preToughness, prePower);
- preCreature = preCreature == null ? null : Predicates.and( preCreature, CardRulesPredicates.Presets.IS_CREATURE );
-
+ preCreature = preCreature == null ? null : Predicates.and(preCreature, CardRulesPredicates.Presets.IS_CREATURE);
+
Predicate preFinal = optimizedAnd(preCMC, preCreature);
- if (preFinal == null)
+ if (preFinal == null) {
return Predicates.alwaysTrue();
- else
+ } else {
return Predicates.compose(preFinal, CardPrinted.FN_GET_RULES);
+ }
}
//========== Custom class handling
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CAllDecks.java b/src/main/java/forge/gui/deckeditor/controllers/CAllDecks.java
index 38a67f7a505..8d4e21046f8 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CAllDecks.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CAllDecks.java
@@ -46,8 +46,8 @@ public enum CAllDecks implements ICDoc {
public void execute() { importDeck(); } });
}
-
-
+
+
/* (non-Javadoc)
* @see forge.gui.framework.ICDoc#update()
*/
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java b/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java
index 0fe8be0fbb9..6e302714bea 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java
@@ -80,10 +80,10 @@ public enum CDeckgen implements ICDoc {
final Deck randomDeck = new Deck();
- Predicate notBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND,CardPrinted.FN_GET_RULES));
+ Predicate notBasicLand = Predicates.not(Predicates.compose(CardRulesPredicates.Presets.IS_BASIC_LAND, CardPrinted.FN_GET_RULES));
Iterable source = Iterables.filter(CardDb.instance().getAllUniqueCards(), notBasicLand);
- randomDeck.getMain().addAllFlat(Aggregates.random(source, 15*5));
-
+ randomDeck.getMain().addAllFlat(Aggregates.random(source, 15 * 5));
+
randomDeck.getMain().add("Plains");
randomDeck.getMain().add("Island");
randomDeck.getMain().add("Swamp");
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java b/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java
index 9c5bbad41b2..427ac6676f2 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java
@@ -44,10 +44,10 @@ public enum CEditorPreferences implements ICDoc {
SEditorIO.loadPreferences();
HashMap prefsDict = new HashMap();
-
+
// Simplified Column Preferences
VEditorPreferences prefsInstance = VEditorPreferences.SINGLETON_INSTANCE;
-
+
// Catalog
prefsDict.put(prefsInstance.getChbCatalogColor(), ColumnName.CAT_COLOR);
prefsDict.put(prefsInstance.getChbCatalogRarity(), ColumnName.CAT_RARITY);
@@ -56,7 +56,7 @@ public enum CEditorPreferences implements ICDoc {
prefsDict.put(prefsInstance.getChbCatalogAI(), ColumnName.CAT_AI);
prefsDict.put(prefsInstance.getChbCatalogPower(), ColumnName.CAT_POWER);
prefsDict.put(prefsInstance.getChbCatalogToughness(), ColumnName.CAT_TOUGHNESS);
-
+
// Deck
prefsDict.put(prefsInstance.getChbDeckColor(), ColumnName.DECK_COLOR);
prefsDict.put(prefsInstance.getChbDeckRarity(), ColumnName.DECK_RARITY);
@@ -71,7 +71,7 @@ public enum CEditorPreferences implements ICDoc {
final ColumnName name = prefsDict.get(key);
key.setSelected(SColumnUtil.getColumn(name).isShowing());
key.addItemListener(new ItemListener() {
-
+
@Override
public void itemStateChanged(ItemEvent arg0) {
SColumnUtil.toggleColumn(SColumnUtil.getColumn(name));
diff --git a/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java b/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java
index 1296a80c954..9b541f6ca3a 100644
--- a/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java
+++ b/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java
@@ -61,10 +61,10 @@ public enum CStatistics implements ICDoc {
private void setLabelValue(JLabel label, ItemPoolView deck, Predicate predicate, int total) {
int tmp = Aggregates.sum(Iterables.filter(deck, Predicates.compose(predicate, deck.getFnToCard())), deck.getFnToCount());
- label.setText( tmp + " (" + SEditorUtil.calculatePercentage(tmp, total) + "%)");
+ label.setText(tmp + " (" + SEditorUtil.calculatePercentage(tmp, total) + "%)");
}
-
+
//========== Other methods
@SuppressWarnings("unchecked")
private void analyze() {
@@ -81,23 +81,23 @@ public enum CStatistics implements ICDoc {
// Hack-ish: avoid /0 cases, but still populate labels :)
if (total == 0) { total = 1; }
-
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblCreature(), deck, CardRulesPredicates.Presets.IS_CREATURE, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblLand(), deck, CardRulesPredicates.Presets.IS_LAND, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblEnchantment(), deck, CardRulesPredicates.Presets.IS_ENCHANTMENT, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblArtifact(), deck, CardRulesPredicates.Presets.IS_ARTIFACT, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblInstant(), deck, CardRulesPredicates.Presets.IS_INSTANT, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblSorcery(), deck, CardRulesPredicates.Presets.IS_SORCERY, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblPlaneswalker(), deck, CardRulesPredicates.Presets.IS_PLANESWALKER, total );
-
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblMulti(), deck, CardRulesPredicates.Presets.IS_MULTICOLOR, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblColorless(), deck, CardRulesPredicates.Presets.IS_COLORLESS, total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblBlack(), deck, CardRulesPredicates.isMonoColor(CardColor.BLACK), total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblBlue(), deck, CardRulesPredicates.isMonoColor(CardColor.BLUE), total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblGreen(), deck, CardRulesPredicates.isMonoColor(CardColor.GREEN), total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblRed(), deck, CardRulesPredicates.isMonoColor(CardColor.RED), total );
- setLabelValue( VStatistics.SINGLETON_INSTANCE.getLblWhite(), deck, CardRulesPredicates.isMonoColor(CardColor.WHITE), total );
-
+
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblCreature(), deck, CardRulesPredicates.Presets.IS_CREATURE, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblLand(), deck, CardRulesPredicates.Presets.IS_LAND, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblEnchantment(), deck, CardRulesPredicates.Presets.IS_ENCHANTMENT, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblArtifact(), deck, CardRulesPredicates.Presets.IS_ARTIFACT, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblInstant(), deck, CardRulesPredicates.Presets.IS_INSTANT, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblSorcery(), deck, CardRulesPredicates.Presets.IS_SORCERY, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblPlaneswalker(), deck, CardRulesPredicates.Presets.IS_PLANESWALKER, total);
+
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblMulti(), deck, CardRulesPredicates.Presets.IS_MULTICOLOR, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblColorless(), deck, CardRulesPredicates.Presets.IS_COLORLESS, total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblBlack(), deck, CardRulesPredicates.isMonoColor(CardColor.BLACK), total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblBlue(), deck, CardRulesPredicates.isMonoColor(CardColor.BLUE), total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblGreen(), deck, CardRulesPredicates.isMonoColor(CardColor.GREEN), total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblRed(), deck, CardRulesPredicates.isMonoColor(CardColor.RED), total);
+ setLabelValue(VStatistics.SINGLETON_INSTANCE.getLblWhite(), deck, CardRulesPredicates.isMonoColor(CardColor.WHITE), total);
+
int cmc0 = 0, cmc1 = 0, cmc2 = 0, cmc3 = 0, cmc4 = 0, cmc5 = 0, cmc6 = 0;
int tmc = 0;