From 46a7fe15a9b84dfe0f67d804a7a7328c428d67e3 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 21 Jun 2014 03:03:44 +0000
Subject: [PATCH] Prevent rendering counts for cards in catalog

---
 forge-gui-mobile/src/forge/deck/FDeckEditor.java       |  2 +-
 .../src/forge/itemmanager/CardManager.java             |  7 +++----
 .../src/forge/itemmanager/DeckManager.java             |  5 ++---
 .../src/forge/itemmanager/ItemManager.java             | 10 ++++++++--
 .../src/forge/itemmanager/SpellShopManager.java        |  5 ++---
 .../src/forge/itemmanager/views/ItemListView.java      |  8 +-------
 6 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
index 7d96ada7912..803fefdf631 100644
--- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java
+++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java
@@ -528,7 +528,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
                 needRefreshWhenShown = true;
                 return; //delay refreshing while hidden
             }
-            cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getAllCards(), PaperCard.class));
+            cardManager.setPool(ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getAllCards(), PaperCard.class), true);
         }
 
         @Override
diff --git a/forge-gui-mobile/src/forge/itemmanager/CardManager.java b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
index e224ee80cd3..bbf43f467e0 100644
--- a/forge-gui-mobile/src/forge/itemmanager/CardManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/CardManager.java
@@ -18,7 +18,6 @@ import forge.itemmanager.filters.CardSetFilter;
 import forge.itemmanager.filters.CardToughnessFilter;
 import forge.itemmanager.filters.CardTypeFilter;
 import forge.itemmanager.filters.ItemFilter;
-import forge.itemmanager.views.ItemListView.ItemRenderer;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
 import forge.menu.FSubMenu;
@@ -153,8 +152,8 @@ public class CardManager extends ItemManager<PaperCard> {
     }
 
     @Override
-    public ItemRenderer<PaperCard> getListItemRenderer() {
-        return new ItemRenderer<PaperCard>() {
+    public ItemRenderer getListItemRenderer() {
+        return new ItemRenderer() {
             @Override
             public float getItemHeight() {
                 return CardRenderer.getCardListItemHeight();
@@ -162,7 +161,7 @@ public class CardManager extends ItemManager<PaperCard> {
 
             @Override
             public void drawValue(Graphics g, Entry<PaperCard, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h) {
-                CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), value.getValue(), x, y, w, h);
+                CardRenderer.drawCardListItem(g, font, foreColor, value.getKey(), isInfinite() ? 0 : value.getValue(), x, y, w, h);
             }
 
             @Override
diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
index 76e3adce904..13aa57c530b 100644
--- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java
@@ -17,7 +17,6 @@ import forge.itemmanager.filters.DeckFormatFilter;
 import forge.itemmanager.filters.DeckSearchFilter;
 import forge.itemmanager.filters.DeckSetFilter;
 import forge.itemmanager.filters.ItemFilter;
-import forge.itemmanager.views.ItemListView.ItemRenderer;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
 import forge.menu.FSubMenu;
@@ -251,8 +250,8 @@ public final class DeckManager extends ItemManager<DeckProxy> {
     private static final float IMAGE_SIZE = CardRenderer.MANA_SYMBOL_SIZE;
 
     @Override
-    public ItemRenderer<DeckProxy> getListItemRenderer() {
-        return new ItemRenderer<DeckProxy>() {
+    public ItemRenderer getListItemRenderer() {
+        return new ItemRenderer() {
             @Override
             public float getItemHeight() {
                 if (DeckManager.this.getConfig().getCols().size() == 1) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
index b9fa75d703a..1d468c2aef2 100644
--- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java
@@ -22,13 +22,14 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Iterables;
 
+import forge.Graphics;
+import forge.assets.FSkinColor;
 import forge.assets.FSkinFont;
 import forge.assets.FSkinImage;
 import forge.item.InventoryItem;
 import forge.itemmanager.filters.ItemFilter;
 import forge.itemmanager.views.ImageView;
 import forge.itemmanager.views.ItemListView;
-import forge.itemmanager.views.ItemListView.ItemRenderer;
 import forge.itemmanager.views.ItemView;
 import forge.menu.FMenuItem;
 import forge.menu.FPopupMenu;
@@ -226,7 +227,12 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
         setHideFilters(config0.getHideFilters());
     }
 
-    public abstract ItemRenderer<T> getListItemRenderer();
+    public abstract class ItemRenderer {
+        public abstract float getItemHeight();
+        public abstract boolean tap(Entry<T, Integer> value, float x, float y, int count);
+        public abstract void drawValue(Graphics g, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h);
+    }
+    public abstract ItemRenderer getListItemRenderer();
 
     public void setViewIndex(int viewIndex) {
         if (viewIndex < 0 || viewIndex >= views.size()) { return; }
diff --git a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
index 97950bfb8ed..01691b39da8 100644
--- a/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
+++ b/forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
@@ -9,7 +9,6 @@ import forge.card.CardRenderer;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
 import forge.itemmanager.filters.ItemFilter;
-import forge.itemmanager.views.ItemListView.ItemRenderer;
 import forge.menu.FPopupMenu;
 
 
@@ -34,8 +33,8 @@ public final class SpellShopManager extends ItemManager<InventoryItem> {
     }
 
     @Override
-    public ItemRenderer<InventoryItem> getListItemRenderer() {
-        return new ItemRenderer<InventoryItem>() {
+    public ItemRenderer getListItemRenderer() {
+        return new ItemRenderer() {
             @Override
             public float getItemHeight() {
                 return CardRenderer.getCardListItemHeight();
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
index a9cc279115e..3ee92b40881 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
@@ -250,14 +250,8 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
         return visibleWidth;
     }
 
-    public abstract static class ItemRenderer<T extends InventoryItem> {
-        public abstract float getItemHeight();
-        public abstract boolean tap(Entry<T, Integer> value, float x, float y, int count);
-        public abstract void drawValue(Graphics g, Entry<T, Integer> value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h);
-    }
-
     public final class ItemList extends FList<Entry<T, Integer>> {
-        private final ItemRenderer<T> renderer;
+        private final ItemManager<T>.ItemRenderer renderer;
         private List<ItemColumn> cols = new ArrayList<ItemColumn>();
 
         private ItemList() {