From f47e73adbfbfa569cf2577b9d58d3a9a3e3a2bea Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Wed, 6 Mar 2013 10:49:29 +0000 Subject: [PATCH] removing view-related code from Card class. --- src/main/java/forge/Card.java | 15 --------------- src/main/java/forge/gui/CardDetailPanel.java | 6 ++++-- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 6e6f8eb35ba..36df8896514 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1632,21 +1632,6 @@ public class Card extends GameEntity implements Comparable { return this.getCharacteristics().getManaCost(); } - /** - *

- * Display for the field manaCost. - *

- * - * @return a {@link java.lang.String} object. - */ - public final String getManaDisplay() { - // If this is a split card, display mana as X / Y. Otherwise, Display it as normal - if (this.getRules() != null && this.getRules().getSplitType() == CardSplitType.Split) { - return String.format("%s / %s", this.getState(CardCharacteristicName.LeftSplit).getManaCost(), - this.getState(CardCharacteristicName.RightSplit).getManaCost()); - } - return this.getCharacteristics().getManaCost().toString(); - } /** *

diff --git a/src/main/java/forge/gui/CardDetailPanel.java b/src/main/java/forge/gui/CardDetailPanel.java index 123207c1b0d..0c45041759e 100644 --- a/src/main/java/forge/gui/CardDetailPanel.java +++ b/src/main/java/forge/gui/CardDetailPanel.java @@ -202,10 +202,12 @@ public class CardDetailPanel extends FPanel { final boolean canShowThis = card.canBeShownTo(Singletons.getControl().getPlayer()); if (canShowThis) { - if (card.getManaCost().toString().equals("") || card.isLand()) { + if (card.getManaCost().isNoCost()) { this.nameCostLabel.setText(card.getName()); } else { - this.nameCostLabel.setText(card.getName() + " - " + card.getManaDisplay()); + // If you want to make a special view of split cards, keep that special code in this class. + // Better if you make several labels that that draw mana symbols + this.nameCostLabel.setText(card.getName() + " - " + card.getManaCost()); } this.typeLabel.setText(GuiDisplayUtil.formatCardType(card));