From fd5332ea717b31d6edb70a549ebbe8651f4e6483 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 18 Jul 2014 06:16:41 +0000
Subject: [PATCH] Fix so *NEW* suffix appears in quest deck editor

---
 forge-gui-mobile/src/forge/itemmanager/CardManager.java    | 2 +-
 forge-gui-mobile/src/forge/itemmanager/ItemManager.java    | 7 +++++++
 .../src/forge/itemmanager/SpellShopManager.java            | 4 +---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile/src/forge/itemmanager/CardManager.java b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
index e34654ec05c..1d787680831 100644
--- a/forge-gui-mobile/src/forge/itemmanager/CardManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
@@ -162,7 +162,7 @@ public class CardManager extends ItemManager<PaperCard> {
 
             @Override
             public void drawValue(Graphics g, Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, FSkinColor backColor, boolean pressed, float x, float y, float w, float h) {
-                CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), null, x, y, w, h);
+                CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), getItemSuffix(value), x, y, w, h);
             }
 
             @Override
diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
index d7ba31f6ef9..08ccd3c46d4 100644
--- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
@@ -37,6 +37,7 @@ import forge.menu.FDropDownMenu;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
 import forge.menu.FSubMenu;
+import forge.model.FModel;
 import forge.screens.FScreen;
 import forge.toolbox.FContainer;
 import forge.toolbox.FEvent;
@@ -70,6 +71,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
     private ItemManagerConfig config;
     private String caption = "Items";
     private String ratio = "(0 / 0)";
+    private boolean hasNewColumn;
 
     private final ItemFilter<? extends T> mainSearchFilter;
 
@@ -231,6 +233,11 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         }
         setViewIndex(config0.getViewIndex());
         setHideFilters(config0.getHideFilters());
+        hasNewColumn = config.getCols().containsKey(ColumnDef.NEW);
+    }
+
+    protected String getItemSuffix(Entry<T, Integer> item) {
+        return hasNewColumn && FModel.getQuest().getCards().isNew(item.getKey()) ? " *NEW*" : null;
     }
 
     public abstract class ItemRenderer {
diff --git a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
index 1231074165d..75394b946cc 100644
--- a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
@@ -17,7 +17,6 @@ import forge.item.InventoryItem;
 import forge.item.PaperCard;
 import forge.itemmanager.filters.ItemFilter;
 import forge.menu.FPopupMenu;
-import forge.model.FModel;
 import forge.quest.QuestSpellShop;
 import forge.toolbox.FList;
 
@@ -63,8 +62,7 @@ public final class SpellShopManager extends ItemManager<InventoryItem> {
                 float cardArtWidth = totalHeight * CardRenderer.CARD_ART_RATIO;
 
                 if (value.getKey() instanceof PaperCard) {
-                    String suffix = getConfig().getCols().containsKey(ColumnDef.NEW) && FModel.getQuest().getCards().isNew(value.getKey()) ? " *NEW*" : null;
-                    CardRenderer.drawCardListItem(g, font, foreColor, (PaperCard)value.getKey(), value.getValue(), suffix, x, y, w, h);
+                    CardRenderer.drawCardListItem(g, font, foreColor, (PaperCard)value.getKey(), value.getValue(), getItemSuffix(value), x, y, w, h);
                 }
                 else {
                     g.drawText(value.getValue().toString() + " " + value.getKey().toString(), font, foreColor, x + cardArtWidth, y, w - cardArtWidth, h, false, HAlignment.LEFT, true);