From 7c262c98e2766a99f53ba9f606d51638f90cf433 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Wed, 15 Oct 2014 18:44:51 +0000
Subject: [PATCH] Fix so card name reflects alternate state properly

---
 .../src/main/java/forge/gui/CardDetailPanel.java              | 4 ++--
 forge-gui-mobile/src/forge/card/CardRenderer.java             | 2 +-
 forge-gui/src/main/java/forge/card/CardDetailUtil.java        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
index f0ad2792034..220dba5f851 100644
--- a/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
+++ b/forge-gui-desktop/src/main/java/forge/gui/CardDetailPanel.java
@@ -186,7 +186,7 @@ public class CardDetailPanel extends SkinnedPanel {
         final CardStateView state = card.getState(isInAltState);
 
         if (state.getManaCost().isNoCost() || !canShow) {
-            nameCostLabel.setText(CardDetailUtil.formatCardName(card, canShow));
+            nameCostLabel.setText(CardDetailUtil.formatCardName(card, canShow, isInAltState));
         }
         else {
             final String manaCost;
@@ -195,7 +195,7 @@ public class CardDetailPanel extends SkinnedPanel {
             } else {
                 manaCost = state.getManaCost().toString();
             }
-            nameCostLabel.setText(FSkin.encodeSymbols(CardDetailUtil.formatCardName(card, canShow) + " - " + manaCost, true));
+            nameCostLabel.setText(FSkin.encodeSymbols(CardDetailUtil.formatCardName(card, canShow, isInAltState) + " - " + manaCost, true));
         }
         typeLabel.setText(CardDetailUtil.formatCardType(state, canShow));
 
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index 339b7f441ef..27a0c8a71d8 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -415,7 +415,7 @@ public class CardRenderer {
         //draw name for card
         x += padding;
         w -= 2 * padding;
-        g.drawText(CardDetailUtil.formatCardName(card, canShow), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
+        g.drawText(CardDetailUtil.formatCardName(card, canShow, false), NAME_FONT, Color.BLACK, x, y, w - manaCostWidth - padding, h, false, HAlignment.LEFT, true);
 
         //draw type and set label for card
         y += h;
diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
index 2bf63220c63..c1abc081e55 100644
--- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java
+++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java
@@ -162,8 +162,8 @@ public class CardDetailUtil {
         return item.getName(); 
     }
 
-    public static String formatCardName(final CardView card, final boolean canShow) {
-        final String name = card.getName();
+    public static String formatCardName(final CardView card, final boolean canShow, final boolean forAltState) {
+        final String name = forAltState ? card.getAlternateState().getName() : card.getName();
         return StringUtils.isEmpty(name) || !canShow ? "???" : name.trim();
     }