From 63df7f65a78e0cbfa602492405b05c26e2c278ce Mon Sep 17 00:00:00 2001
From: ingmargoudt <ingmargoudt@gmail.com>
Date: Thu, 6 Apr 2017 22:07:59 +0200
Subject: [PATCH] remove isCreature from CardHelper, move to Cardview

---
 .../client/deckeditor/table/CardHelper.java   |  3 --
 .../deckeditor/table/MageCardComparator.java  |  7 +++--
 .../client/deckeditor/table/TableModel.java   | 30 +++++++------------
 Mage.Common/src/mage/view/CardView.java       |  4 +++
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
index b07fe03c085..e0407e07235 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/CardHelper.java
@@ -77,7 +77,4 @@ public final class CardHelper {
         return type.toString();
     }
 
-    public static boolean isCreature(CardView c) {
-        return c.getCardTypes().contains(CardType.CREATURE);
-    }
 }
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java
index 71f67900d9a..217aa1e782b 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java
@@ -26,10 +26,11 @@
  */
 package mage.client.deckeditor.table;
 
-import java.util.Comparator;
 import mage.cards.MageCard;
 import mage.view.CardView;
 
+import java.util.Comparator;
+
 /**
  * {@link MageCard} comparator. Used to sort cards in Deck Editor Table View
  * pane.
@@ -85,10 +86,10 @@ public class MageCardComparator implements Comparator<CardView> {
             case 5:
                 aCom = (float) -1;
                 bCom = (float) -1;
-                if (CardHelper.isCreature(a)) {
+                if (a.isCreature()) {
                     aCom = new Float(a.getPower() + '.' + (a.getToughness().startsWith("-") ? "0" : a.getToughness()));
                 }
-                if (CardHelper.isCreature(b)) {
+                if (b.isCreature()) {
                     bCom = new Float(b.getPower() + '.' + (b.getToughness().startsWith("-") ? "0" : b.getToughness()));
                 }
                 break;
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
index 31ea45eb342..b1655cd9688 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java
@@ -27,24 +27,6 @@
  */
 package mage.client.deckeditor.table;
 
-import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumnModel;
 import mage.client.MageFrame;
 import mage.client.cards.BigCard;
 import mage.client.cards.CardEventSource;
@@ -64,6 +46,16 @@ import org.jdesktop.swingx.JXPanel;
 import org.mage.card.arcane.ManaSymbols;
 import org.mage.card.arcane.UI;
 
+import javax.swing.*;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableColumnModel;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.util.*;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Table Model for card list.
  *
@@ -264,7 +256,7 @@ public class TableModel extends AbstractTableModel implements ICardGrid {
             case 4:
                 return CardHelper.getType(c);
             case 5:
-                return CardHelper.isCreature(c) ? c.getPower() + '/'
+                return c.isCreature() ? c.getPower() + '/'
                         + c.getToughness() : "-";
             case 6:
                 return c.getRarity().toString();
diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java
index b611d8ae766..c8f14d59c06 100644
--- a/Mage.Common/src/mage/view/CardView.java
+++ b/Mage.Common/src/mage/view/CardView.java
@@ -957,4 +957,8 @@ public class CardView extends SimpleCardView {
         this.canAttack = canAttack;
     }
 
+    public boolean isCreature(){
+        return cardTypes.contains(CardType.CREATURE);
+    }
+
 }