Can now sort by non-string fields in a sane manner

src/uk/co/md87/evetool/ui/data/BasicShipInfoSurrogate.java

@@ -23,14 +23,15 @@
 package uk.co.md87.evetool.ui.data;
 
 import java.awt.Image;
-import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
 import javax.swing.SwingWorker;
+
 import uk.co.md87.evetool.api.wrappers.CharacterSheet;
 import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
 import uk.co.md87.evetool.ui.listable.ListableImpl;

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

@@ -23,6 +23,7 @@
 package uk.co.md87.evetool.ui.listable;
 
 import java.util.Comparator;
+import java.util.List;
 import uk.co.md87.evetool.ui.listable.ListableConfig.ConfigElement;
 
 /**
@@ -42,7 +43,10 @@ public class ListableComparator implements Comparator<Object> {
 
     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));
+            final Object op1 = element.getUnformattedValue(o1, parser);
+            final Object op2 = element.getUnformattedValue(o2, parser);
+
+            int res = doCompare(op1, op2);
 
             if (res != 0) {
                 return res;
@@ -52,4 +56,28 @@ public class ListableComparator implements Comparator<Object> {
         return 0;
     }
 
+    @SuppressWarnings("unchecked")
+    protected int doCompare(Object op1, Object op2) {
+        int res = 0;
+
+        if (op1 instanceof Comparable) {
+            res = ((Comparable) op1).compareTo(op2);
+        } else if (op1 instanceof List) {
+            final List<?> objs1 = (List<?>) op1;
+            final List<?> objs2 = (List<?>) op2;
+
+            for (int i = 0; i < objs1.size(); i++) {
+                res = doCompare(objs1.get(i), objs2.get(i));
+
+                if (res != 0) {
+                    break;
+                }
+            }
+        } else {
+            res = String.valueOf(op1).compareTo(String.valueOf(op2));
+        }
+
+        return res;
+    }
+
 }

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

@@ -22,7 +22,9 @@
 
 package uk.co.md87.evetool.ui.listable;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  *
@@ -39,6 +41,8 @@ public class ListableConfig implements Cloneable {
 
         String getValue(final Object target, final ListableParser parser);
 
+        Object getUnformattedValue(final Object target, final ListableParser parser);
+
     }
 
     public static class BasicConfigElement implements ConfigElement {
@@ -53,6 +57,10 @@ public class ListableConfig implements Cloneable {
             return parser.getValue(target, name);
         }
 
+        public Object getUnformattedValue(final Object target, ListableParser parser) {
+            return parser.getUnformattedValue(target, name);
+        }
+
         public String getName() {
             return name;
         }
@@ -70,6 +78,10 @@ public class ListableConfig implements Cloneable {
             return text;
         }
 
+        public Object getUnformattedValue(Object target, ListableParser parser) {
+            return text;
+        }
+
         public String getText() {
             return text;
         }
@@ -93,6 +105,16 @@ public class ListableConfig implements Cloneable {
             return builder.toString();
         }
 
+        public List<Object> getUnformattedValue(Object target, ListableParser parser) {
+            final List<Object> res = new ArrayList<Object>();
+
+            for (ConfigElement element : elements) {
+                res.add(element.getUnformattedValue(target, parser));
+            }
+
+            return res;
+        }
+
         public ConfigElement[] getElements() {
             return elements;
         }

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

@@ -102,7 +102,7 @@ public class ListableParser {
         return methods.keySet();
     }
 
-    public String getValue(final Object target, final String name) {
+    public Object getUnformattedValue(final Object target, final String name) {
         if (methods.containsKey(name)) {
             Object result = target;
 
@@ -111,24 +111,38 @@ public class ListableParser {
                     result = method.invoke(result);
                 }
 
-                final Class<?> formatter = methods.get(name)
-                        .get(methods.get(name).size() - 1)
-                        .getAnnotation(Retrievable.class).formatWith();
-
-                return (String) formatter.getMethod("getValue", Object.class)
-                        .invoke(null, result);
+                return result;
             } catch (IllegalAccessException ex) {
                 LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
             } catch (IllegalArgumentException ex) {
                 LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
             } catch (InvocationTargetException ex) {
                 LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
-            } catch (NoSuchMethodException ex) {
-                LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
             }
         }
 
         return "Unknown";
     }
 
+    public String getValue(final Object target, final String name) {
+        try {
+            final Class<?> formatter = methods.get(name)
+                    .get(methods.get(name).size() - 1)
+                    .getAnnotation(Retrievable.class).formatWith();
+
+            return (String) formatter.getMethod("getValue", Object.class)
+                    .invoke(null, getUnformattedValue(target, name));
+        } catch (IllegalAccessException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
+        } catch (IllegalArgumentException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
+        } catch (InvocationTargetException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
+        } catch (NoSuchMethodException ex) {
+            LOGGER.log(Level.SEVERE, "Unable to retrieve value", ex);
+        }
+
+        return "Unknown";
+    }
+
 }