Listable sorting

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

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2009 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.evetool.ui.listable;
+
+import java.util.Comparator;
+import uk.co.md87.evetool.ui.listable.ListableConfig.ConfigElement;
+
+/**
+ *
+ * TODO: Document ListableComparator
+ * @author chris
+ */
+public class ListableComparator implements Comparator<Object> {
+
+    private final ListableConfig.ConfigElement[] order;
+    private final 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 int res = element.getValue(o1, parser).compareTo(element.getValue(o2, parser));
+
+            if (res != 0) {
+                return res;
+            }
+        }
+
+        return 0;
+    }
+
+}

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

@@ -29,7 +29,7 @@ package uk.co.md87.evetool.ui.listable;
 public class ListableConfig {
 
     public ConfigElement topLeft, topRight, bottomLeft, bottomRight;
-    public String[] sortOrder;
+    public ConfigElement[] sortOrder;
     public ConfigElement group;
 
     public static interface ConfigElement {

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

@@ -24,8 +24,10 @@ package uk.co.md87.evetool.ui.pages;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
 import java.util.Collections;
 
+import java.util.List;
 import javax.swing.JSeparator;
 
 import net.miginfocom.swing.MigLayout;
@@ -43,6 +45,7 @@ import uk.co.md87.evetool.ui.components.ListablePanel;
 import uk.co.md87.evetool.ui.data.TrainedSkillInfoSurrogate;
 import uk.co.md87.evetool.ui.dialogs.listableconfig.ListableConfigDialog;
 import uk.co.md87.evetool.ui.listable.Listable;
+import uk.co.md87.evetool.ui.listable.ListableComparator;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
 import uk.co.md87.evetool.ui.listable.ListableParser;
 
@@ -81,6 +84,12 @@ public class SkillPage extends Page implements ActionListener {
         config.bottomLeft = new ListableConfig.BasicConfigElement("group name");
         config.bottomRight = new ListableConfig.BasicConfigElement("time to next level");
         config.group = new ListableConfig.BasicConfigElement("group name");
+
+        config.sortOrder = new ListableConfig.ConfigElement[]{
+            new ListableConfig.BasicConfigElement("group name"),
+            new ListableConfig.BasicConfigElement("current level"),
+            new ListableConfig.BasicConfigElement("trained skillpoints"),
+        };
     }
 
     /** {@inheritDoc} */
@@ -99,19 +108,23 @@ public class SkillPage extends Page implements ActionListener {
 
         removeAll();
 
-        Collections.sort(character.getSheet().getResult().getSkills(),
-                new TrainingTimeComparator(true));
-
         final ListableParser parser = new ListableParser(TrainedSkillInfoSurrogate.class);
+        final List<TrainedSkillInfoSurrogate> list = new ArrayList<TrainedSkillInfoSurrogate>();
+
+        for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills()) {
+            list.add(new TrainedSkillInfoSurrogate(skill));
+        }
+
+        if (config.sortOrder != null) {
+            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
+        }
 
         String lastGroup = null;
         boolean first = true;
         
-        for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills()) {
-            final Listable wrapper = new TrainedSkillInfoSurrogate(skill);
-
+        for (TrainedSkillInfoSurrogate skill : list) {
             if (config.group != null) {
-                final String thisGroup = config.group.getValue(wrapper, parser);
+                final String thisGroup = config.group.getValue(skill, parser);
 
                 if (lastGroup == null || !thisGroup.equals(lastGroup)) {
                     first = true;
@@ -126,7 +139,7 @@ public class SkillPage extends Page implements ActionListener {
                 add(new JSeparator(), "growx, pushx");
             }
 
-            add(new ListablePanel(wrapper, parser, config),
+            add(new ListablePanel(skill, parser, config),
                     "growx, pushx");
         }
     }