From fb8d27293e6937f1de38d374b37117229975f8b7 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:45:43 +0000
Subject: [PATCH] - Allows for sorting by value in the cardshop.

---
 src/forge/Gui_DeckEditor_Menu.java |  2 +-
 src/forge/TableModel.java          |  1 +
 src/forge/TableSorter.java         | 12 +++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/forge/Gui_DeckEditor_Menu.java b/src/forge/Gui_DeckEditor_Menu.java
index 66a242179b0..63e50d40aab 100644
--- a/src/forge/Gui_DeckEditor_Menu.java
+++ b/src/forge/Gui_DeckEditor_Menu.java
@@ -252,7 +252,7 @@ public class Gui_DeckEditor_Menu extends JMenuBar implements NewConstants {
                 //private String column[] = {"Qty", "Name", "Cost", "Color", "Type", "Stats", "Rarity"};
                 Gui_DeckEditor g = (Gui_DeckEditor) deckDisplay;
                 
-                g.getTopTableModel().sort(7, true);
+                g.getTopTableModel().sort(99, true);
             }
         });
         
diff --git a/src/forge/TableModel.java b/src/forge/TableModel.java
index 67bc916fd1e..fe6611d617d 100644
--- a/src/forge/TableModel.java
+++ b/src/forge/TableModel.java
@@ -80,6 +80,7 @@ class TableModel extends AbstractTableModel {
                 column.setPreferredWidth(40);
                 column.setMaxWidth(40);
             }
+            
         }//for
         
         for(int j = 0; j < table.getColumnCount(); j++) {
diff --git a/src/forge/TableSorter.java b/src/forge/TableSorter.java
index cf4f31e701a..e77aede1a26 100644
--- a/src/forge/TableSorter.java
+++ b/src/forge/TableSorter.java
@@ -92,7 +92,12 @@ public class TableSorter implements Comparator<Card>, NewConstants
       aCom = getRarity(a);
       bCom = getRarity(b);
     }
-    else if (column == 7)//New First
+    else if (column == 7)//Value
+    {
+      aCom = getValue(a);
+      bCom = getValue(b);
+    }
+    else if (column == 99)//New First
     {
       aCom = sortNewFirst(a);
       bCom = sortNewFirst(b);
@@ -128,6 +133,11 @@ public class TableSorter implements Comparator<Card>, NewConstants
       return Integer.valueOf(5);
   }
 
+  final private Long getValue(Card c)
+  {
+	  return c.getValue();
+  }
+  
   final public static String getColor(Card c)
   {
     ArrayList list = CardUtil.getColors(c);