@@ -281,18 +280,6 @@ public class CardPanel extends JPanel implements CardContainer { return this.isSelected; } - /** - *
- * Setter for the field showCastingCost.
- *
* getCard. @@ -646,13 +636,11 @@ public class CardPanel extends JPanel implements CardContainer { } final BufferedImage image = card == null ? null : ImageCache.getImage(card, imagePanel.getWidth(), imagePanel.getHeight()); - if ((this.getGameCard() != null) && Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_CARD_OVERLAY)) { - this.setText(this.getGameCard()); - } + this.setText(this.getGameCard()); this.setImage(image); } - + /** * Gets the game card. * @@ -775,4 +763,22 @@ public class CardPanel extends JPanel implements CardContainer { public static final float getBorderSize() { return BLACK_BORDER_SIZE; } + + private boolean isPreferenceEnabled(FPref preferenceName) { + return Singletons.getModel().getPreferences().getPrefBoolean(preferenceName); + } + + private boolean showCardNameOverlay() { + return isPreferenceEnabled(FPref.UI_OVERLAY_CARD_NAME); + } + + private boolean showCardPowerOverlay() { + return isPreferenceEnabled(FPref.UI_OVERLAY_CARD_POWER); + } + + private boolean showCardManaCostOverlay() { + return isPreferenceEnabled(FPref.UI_OVERLAY_CARD_MANA_COST) && !this.getCard().isFaceDown(); + } + + }