From b3a49e005f8db819f99a3a3bd340aa6ad36a8d9a Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Sun, 9 Oct 2016 15:17:58 +0000
Subject: [PATCH] - For now, disregard both -1 and Integer.MAX_VALUE when
 rendering integer components in a table. - Unfortunately, this means that
 Spinal Parasite does not have its P/T visualized in the deck editor table;
 but at least there won't be a lot of -1's elsewhere in the editor. Couldn't
 find a way to fix both of these at the same time for now. - Revert processing
 default CMC as Integer.MAX_VALUE for the UI purposes.

---
 .../main/java/forge/itemmanager/views/IntegerRenderer.java    | 4 ++--
 forge-gui/src/main/java/forge/itemmanager/ColumnDef.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/IntegerRenderer.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/IntegerRenderer.java
index 2b20c0d2107..5a44db18945 100644
--- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/IntegerRenderer.java
+++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/IntegerRenderer.java
@@ -21,7 +21,7 @@ import javax.swing.*;
 import java.awt.*;
 
 /**
- * A quick converter to avoid Integer.MAX_VALUE being displayed for unapplicable values.
+ * A quick converter to avoid -1 and Integer.MAX_VALUE being displayed for unapplicable values.
  */
 @SuppressWarnings("serial")
 public class IntegerRenderer extends ItemCellRenderer {
@@ -36,7 +36,7 @@ public class IntegerRenderer extends ItemCellRenderer {
     public final Component getTableCellRendererComponent(final JTable table, Object value0,
             final boolean isSelected, final boolean hasFocus, final int row, final int column) {
 
-        if (value0 == null || (int)value0 == Integer.MAX_VALUE) { value0 = "-"; }
+        if (value0 == null || (int)value0 == Integer.MAX_VALUE || (int)value0 == -1) { value0 = "-"; }
         return super.getTableCellRendererComponent(table, value0, isSelected, hasFocus, row, column);
     }
 }
diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
index 52682d71e46..f8cd4998450 100644
--- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
+++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
@@ -442,7 +442,7 @@ public enum ColumnDef {
     }
 
     private static Integer toCMC(final InventoryItem i) {
-        return i instanceof PaperCard ? ((IPaperCard) i).getRules().getManaCost().getCMC() : Integer.MAX_VALUE;
+        return i instanceof PaperCard ? ((IPaperCard) i).getRules().getManaCost().getCMC() : -1;
     }
 
     private static CardRarity toRarity(final InventoryItem i) {