From 5c0cbda8af0c7a9244a007aff6b6db885b491c91 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 10:50:44 +0000
Subject: [PATCH] * cleanups * bugfix += != =+

---
 src/DeckConverter.java             |  4 +---
 src/forge/AbilityFactory_Pump.java |  2 +-
 src/forge/CardFactoryUtil.java     |  4 ++--
 src/forge/TableSorter.java         | 32 +++---------------------------
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/src/DeckConverter.java b/src/DeckConverter.java
index 0461a302904..a7b90ed3e20 100644
--- a/src/DeckConverter.java
+++ b/src/DeckConverter.java
@@ -73,9 +73,7 @@ public class DeckConverter {
             return o;
         } else if(o instanceof forge.Deck[]) {
             //a new-type booster deck
-        	//TODO: FIX this impossible cast
-            Deck d = (Deck) o;
-            return d.migrate();
+            return o;
         } else if(o instanceof Deck) {
             // an old type deck
             Deck d = (Deck) o;
diff --git a/src/forge/AbilityFactory_Pump.java b/src/forge/AbilityFactory_Pump.java
index 56d1049741e..af1cd5f2134 100644
--- a/src/forge/AbilityFactory_Pump.java
+++ b/src/forge/AbilityFactory_Pump.java
@@ -225,7 +225,7 @@ public class AbilityFactory_Pump {
                 boolean kSize = Keywords.size() > 0;
                 String KWs[] = {"none"};
                 if (!Keywords.get(0).equals("none"))
-                	KWs = (String[]) Keywords.toArray();
+                	KWs = Keywords.toArray(new String[Keywords.size()]);
                 
                 boolean hKW = c.hasAnyKeyword(KWs);
                 return (cAtt && cTgt && (kSize && !hKW) && !(!hSick && kHaste));
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index 00507dc6073..8e3d5ca40dd 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -418,14 +418,14 @@ public class CardFactoryUtil {
     
     public static int evaluateCreatureList(CardList list) {
     	int value = 0;
-    	for(int i = 0; i < list.size(); i++) value =+ evaluateCreature(list.get(i));
+    	for(int i = 0; i < list.size(); i++) value += evaluateCreature(list.get(i));
     	
     	return value;
     }
     
     public static int evaluatePermanentList(CardList list) {
     	int value = 0;
-    	for(int i = 0; i < list.size(); i++) value =+ list.get(i).getCMC() + 1;
+    	for(int i = 0; i < list.size(); i++) value += list.get(i).getCMC() + 1;
     	
     	return value;
     }
diff --git a/src/forge/TableSorter.java b/src/forge/TableSorter.java
index b42dbf3758c..5ca9135130d 100644
--- a/src/forge/TableSorter.java
+++ b/src/forge/TableSorter.java
@@ -31,27 +31,8 @@ public class TableSorter implements Comparator<Card>, NewConstants
 	  all = new CardList(in_all.toArray());
 	  column = in_column;
 	  ascending = in_ascending;
+  }
 
-	  /*
-	  if(cardsTxt == null)
-		  cardsTxt = readCardsTxt();
-		*/
-  }
-  /*
-  //reads the file "cards.txt"
-  private HashMap<String, Integer> readCardsTxt()
-  {
-    HashMap<String, Integer>  map = new HashMap<String, Integer> ();
-    ArrayList<String> list = FileUtil.readFile(ForgeProps.getFile(CARDS));
-   
-    for(int i = 0; i < list.size(); i++)
-       map.put(list.get(i).toString().trim(), Integer.valueOf(i));
-    
-    return map;
-  }
-  */
- 
- 
   final public int compare(Card a, Card b)
   {
     
@@ -105,11 +86,11 @@ public class TableSorter implements Comparator<Card>, NewConstants
       aCom = getValue(a);
       bCom = getValue(b);
     }
-    else if (column == 99)//New First
+    /*else if (column == 99)//New First
     {
       aCom = sortNewFirst(a);
       bCom = sortNewFirst(b);
-    }
+    }*/
 
     if(ascending)
       return aCom.compareTo(bCom);
@@ -161,11 +142,4 @@ public class TableSorter implements Comparator<Card>, NewConstants
     return c.getType().toString();
   }
 
-  final private Comparable<Integer> sortNewFirst(Card c)
-  {
-   if(! cardsTxt.containsKey(c.getName()))
-     throw new RuntimeException("TableSorter : sortNewFirst() error, Card not found - " +c.getName() +" in hashmap - " +cardsTxt);
-
-   return cardsTxt.get(c.getName());
-  }
 }
\ No newline at end of file