Only sort by one field

src/uk/co/md87/evetool/ui/dialogs/listableconfig/ListableConfigDialog.java

@@ -160,11 +160,8 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
         components.put("bl", getComponents(config.bottomLeft));
         components.put("br", getComponents(config.bottomRight));
         components.put("+group", getComponents(config.group));
+        components.put("+sort", getComponents(config.sortOrder));
         
-        for (int i = 0; i < config.sortOrder.length; i++) {
-            components.put("+sort_" + i, getComponents(config.sortOrder[i]));
-        }
-
         complete = true;
     }
 
@@ -207,8 +204,8 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
             return "Group by:";
         }
 
-        if (key.startsWith("+sort")) {
-            return key.equals("+sort_0") ? "Sort by:" : "... then:";
+        if (key.equals("+sort")) {
+            return "Sort by:";
         }
 
         final StringBuilder builder = new StringBuilder();
@@ -248,9 +245,7 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
         return res;
     }
 
-    protected void rebuildConfig() {
-        config.sortOrder = new ConfigElement[components.size() - 5];
-        
+    protected void rebuildConfig() {        
         for (String loc : components.keySet()) {
             final List<ConfigElement> elements = new ArrayList<ConfigElement>();
 
@@ -276,9 +271,8 @@ public class ListableConfigDialog extends JDialog implements ActionListener,
                 config.bottomLeft = res;
             } else if (loc.equals("+group")) {
                 config.group = res;
-            } else if (loc.startsWith("+sort_")) {
-                final int line = Integer.parseInt(loc.substring(6));
-                config.sortOrder[line] = res;
+            } else if (loc.equals("+sort")) {
+                config.sortOrder = res;
             }
         }
     }

src/uk/co/md87/evetool/ui/listable/ListableComparator.java

@@ -33,24 +33,22 @@ import uk.co.md87.evetool.ui.listable.ListableConfig.ConfigElement;
  */
 public class ListableComparator implements Comparator<Object> {
 
-    private final ListableConfig.ConfigElement[] order;
+    private final ListableConfig.ConfigElement order;
     private final ListableParser parser;
 
-    public ListableComparator(ConfigElement[] order, ListableParser parser) {
+    public ListableComparator(ConfigElement order, ListableParser parser) {
         this.order = order;
         this.parser = parser;
     }
 
     public int compare(final Object o1, final Object o2) {
-        for (ConfigElement element : order) {
-            final Object op1 = element.getUnformattedValue(o1, parser);
-            final Object op2 = element.getUnformattedValue(o2, parser);
+        final Object op1 = order.getUnformattedValue(o1, parser);
+        final Object op2 = order.getUnformattedValue(o2, parser);
 
-            int res = doCompare(op1, op2);
+        int res = doCompare(op1, op2);
 
-            if (res != 0) {
-                return res;
-            }
+        if (res != 0) {
+            return res;
         }
 
         return 0;

src/uk/co/md87/evetool/ui/listable/ListableConfig.java

@@ -34,7 +34,7 @@ import java.util.List;
 public class ListableConfig implements Cloneable {
 
     public ConfigElement topLeft, topRight, bottomLeft, bottomRight;
-    public ConfigElement[] sortOrder;
+    public ConfigElement sortOrder;
     public ConfigElement group;
 
     public static interface ConfigElement {
@@ -130,7 +130,7 @@ public class ListableConfig implements Cloneable {
         clone.topLeft = topLeft;
         clone.topRight = topRight;
         clone.group = group;
-        clone.sortOrder = Arrays.copyOf(sortOrder, sortOrder.length);
+        clone.sortOrder = sortOrder;
 
         return clone;
     }

src/uk/co/md87/evetool/ui/pages/ShipsPage.java

@@ -32,6 +32,8 @@ import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
 import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.data.BasicShipInfoSurrogate;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
+import uk.co.md87.evetool.ui.listable.ListableConfig.BasicConfigElement;
+import uk.co.md87.evetool.ui.listable.ListableConfig.CompoundConfigElement;
 
 /**
  *
@@ -52,16 +54,16 @@ public class ShipsPage extends ListablePage<BasicShipInfoSurrogate> implements A
         super(window, manager, factory);
 
         config = new ListableConfig();
-        config.topLeft = new ListableConfig.BasicConfigElement("name");
-        config.topRight = new ListableConfig.CompoundConfigElement();
-        config.bottomLeft = new ListableConfig.BasicConfigElement("can fly");
-        config.bottomRight = new ListableConfig.CompoundConfigElement();
-        config.group = new ListableConfig.BasicConfigElement("group name");
+        config.topLeft = new BasicConfigElement("name");
+        config.topRight = new CompoundConfigElement();
+        config.bottomLeft = new BasicConfigElement("can fly");
+        config.bottomRight = new CompoundConfigElement();
+        config.group = new BasicConfigElement("group name");
 
-        config.sortOrder = new ListableConfig.ConfigElement[]{
-            new ListableConfig.BasicConfigElement("group name"),
-            new ListableConfig.BasicConfigElement("name"),
-        };
+        config.sortOrder = new CompoundConfigElement(
+            new BasicConfigElement("group name"),
+            new BasicConfigElement("name")
+        );
     }
 
     /** {@inheritDoc} */

src/uk/co/md87/evetool/ui/pages/SkillPage.java

@@ -32,6 +32,9 @@ import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
 import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.data.TrainedSkillInfoSurrogate;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
+import uk.co.md87.evetool.ui.listable.ListableConfig.BasicConfigElement;
+import uk.co.md87.evetool.ui.listable.ListableConfig.CompoundConfigElement;
+import uk.co.md87.evetool.ui.listable.ListableConfig.LiteralConfigElement;
 
 /**
  *
@@ -53,20 +56,20 @@ public class SkillPage extends ListablePage<TrainedSkillInfoSurrogate>
         super(window, manager, factory);
 
         config = new ListableConfig();
-        config.topLeft = new ListableConfig.BasicConfigElement("name");
-        config.topRight = new ListableConfig.CompoundConfigElement(
-                new ListableConfig.BasicConfigElement("trained skillpoints"),
-                new ListableConfig.LiteralConfigElement("/"),
-                new ListableConfig.BasicConfigElement("max skillpoints"));
-        config.bottomLeft = new ListableConfig.BasicConfigElement("group name");
-        config.bottomRight = new ListableConfig.BasicConfigElement("time to next level");
-        config.group = new ListableConfig.BasicConfigElement("group name");
+        config.topLeft = new BasicConfigElement("name");
+        config.topRight = new CompoundConfigElement(
+                new BasicConfigElement("trained skillpoints"),
+                new LiteralConfigElement("/"),
+                new BasicConfigElement("max skillpoints"));
+        config.bottomLeft = new BasicConfigElement("group name");
+        config.bottomRight = new BasicConfigElement("time to next level");
+        config.group = new BasicConfigElement("group name");
 
-        config.sortOrder = new ListableConfig.ConfigElement[]{
-            new ListableConfig.BasicConfigElement("group name"),
-            new ListableConfig.BasicConfigElement("current level"),
-            new ListableConfig.BasicConfigElement("trained skillpoints"),
-        };
+        config.sortOrder = new CompoundConfigElement(
+            new BasicConfigElement("group name"),
+            new BasicConfigElement("current level"),
+            new BasicConfigElement("trained skillpoints")
+        );
     }
 
     /** {@inheritDoc} */