Lots of listable abstraction

src/uk/co/md87/evetool/ui/ContentPanel.java

@@ -66,7 +66,6 @@ public class ContentPanel extends JPanel {
 
         protected AccountChar character;
 
-        // TODO: Add method for activation
         public boolean isReady() {
             return false;
         }

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

@@ -24,6 +24,11 @@ package uk.co.md87.evetool.ui.pages;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JSeparator;
+
 import net.miginfocom.swing.MigLayout;
 
 import uk.co.md87.evetool.AccountManager;
@@ -32,14 +37,21 @@ import uk.co.md87.evetool.ui.ContentPanel.Page;
 import uk.co.md87.evetool.ui.ContextPanel;
 import uk.co.md87.evetool.ui.MainWindow;
 import uk.co.md87.evetool.ui.components.FilterButton;
+import uk.co.md87.evetool.ui.components.HeaderPanel;
+import uk.co.md87.evetool.ui.components.ListablePanel;
+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.ListableConfig.CompoundConfigElement;
+import uk.co.md87.evetool.ui.listable.ListableParser;
 
 /**
  *
  * TODO: Document ListablePage
  * @author chris
  */
-public class ListablePage extends Page implements ActionListener {
+public abstract class ListablePage<T extends Listable> extends Page implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -73,10 +85,56 @@ public class ListablePage extends Page implements ActionListener {
         updatePage();
     }
 
-    public void setConfig(final ListableConfig config) {}
+    public void setConfig(final ListableConfig config) {
+        this.config = config;
+
+        updatePage();
+    }
+
+    protected void updatePage() {
+        removeAll();
+
+        final List<T> list = getListables();
+        final ListableParser parser = new ListableParser(list.get(0).getClass());
+
+        if (config.sortOrder != null) {
+            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
+        }
+
+        String lastGroup = null;
+        boolean first = true;
 
-    protected void updatePage() {}
+        for (T listable : list) {
+            if (config.group != null &&
+                    (!(config.group instanceof CompoundConfigElement)
+                    || ((CompoundConfigElement) config.group).getElements().length > 0)) {
+                final String thisGroup = config.group.getValue(listable, parser);
 
-    public void actionPerformed(final ActionEvent e) {}
+                if (lastGroup == null || !thisGroup.equals(lastGroup)) {
+                    first = true;
+                    lastGroup = thisGroup;
+                    add(new HeaderPanel(lastGroup), "growx, pushx");
+                }
+            }
+
+            if (first) {
+                first = false;
+            } else {
+                add(new JSeparator(), "growx, pushx");
+            }
+
+            add(new ListablePanel(listable, parser, config), "growx, pushx");
+        }
+
+        revalidate();
+    }
+
+    protected abstract List<T> getListables();
+
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        new ListableConfigDialog(window, this, config, getListables().get(0)).setVisible(true);
+    }
 
 }

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

@@ -22,32 +22,23 @@
 
 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 uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.api.wrappers.data.BasicShipInfo;
 import uk.co.md87.evetool.ui.MainWindow;
-import uk.co.md87.evetool.ui.components.HeaderPanel;
-import uk.co.md87.evetool.ui.components.ListablePanel;
 import uk.co.md87.evetool.ui.data.BasicShipInfoSurrogate;
-import uk.co.md87.evetool.ui.dialogs.listableconfig.ListableConfigDialog;
-import uk.co.md87.evetool.ui.listable.ListableComparator;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
-import uk.co.md87.evetool.ui.listable.ListableParser;
 
 /**
  *
  * TODO: Document ShipsPage
  * @author chris
  */
-public class ShipsPage extends ListablePage implements ActionListener {
+public class ShipsPage extends ListablePage<BasicShipInfoSurrogate> implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -80,10 +71,9 @@ public class ShipsPage extends ListablePage implements ActionListener {
                 && character.getSheet().wasSuccessful();
     }
 
-    protected void updatePage() {
-        removeAll();
-
-        final ListableParser parser = new ListableParser(BasicShipInfoSurrogate.class);
+    /** {@inheritDoc} */
+    @Override
+    protected List<BasicShipInfoSurrogate> getListables() {
         final List<BasicShipInfoSurrogate> list = new ArrayList<BasicShipInfoSurrogate>();
 
         for (BasicShipInfo ship : factory.getApi().getShipList().getResult()
@@ -91,50 +81,7 @@ public class ShipsPage extends ListablePage implements ActionListener {
             list.add(new BasicShipInfoSurrogate(ship, character.getSheet().getResult()));
         }
 
-        if (config.sortOrder != null) {
-            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
-        }
-
-        String lastGroup = null;
-        boolean first = true;
-        
-        for (BasicShipInfoSurrogate ship : list) {
-            if (config.group != null) {
-                final String thisGroup = config.group.getValue(ship, parser);
-
-                if (lastGroup == null || !thisGroup.equals(lastGroup)) {
-                    first = true;
-                    lastGroup = thisGroup;
-                    add(new HeaderPanel(lastGroup), "growx, pushx");
-                }
-            }
-
-            if (first) {
-                first = false;
-            } else {
-                add(new JSeparator(), "growx, pushx");
-            }
-
-            add(new ListablePanel(ship, parser, config),
-                    "growx, pushx");
-        }
-
-        revalidate();
-    }
-
-    public void setConfig(final ListableConfig config) {
-        this.config = config;
-        
-        updatePage();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        new ListableConfigDialog(window, this, config,
-                new BasicShipInfoSurrogate(factory.getApi().getShipList()
-                .getResult().getShips().values().iterator().next(),
-                character.getSheet().getResult())).setVisible(true);
+        return list;
     }
 
 }

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

@@ -22,32 +22,24 @@
 
 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 uk.co.md87.evetool.AccountManager;
 import uk.co.md87.evetool.ApiFactory;
 import uk.co.md87.evetool.api.wrappers.data.TrainedSkillInfo;
 import uk.co.md87.evetool.ui.MainWindow;
-import uk.co.md87.evetool.ui.components.HeaderPanel;
-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.ListableComparator;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
-import uk.co.md87.evetool.ui.listable.ListableParser;
 
 /**
  *
  * TODO: Document SkillPage
  * @author chris
  */
-public class SkillPage extends ListablePage implements ActionListener {
+public class SkillPage extends ListablePage<TrainedSkillInfoSurrogate>
+        implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -84,59 +76,16 @@ public class SkillPage extends ListablePage implements ActionListener {
                 && character.getSheet().wasSuccessful();
     }
 
-    protected void updatePage() {
-        removeAll();
-
-        final ListableParser parser = new ListableParser(TrainedSkillInfoSurrogate.class);
+    /** {@inheritDoc} */
+    @Override
+    protected List<TrainedSkillInfoSurrogate> getListables() {
         final List<TrainedSkillInfoSurrogate> list = new ArrayList<TrainedSkillInfoSurrogate>();
 
         for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills().values()) {
             list.add(new TrainedSkillInfoSurrogate(skill));
         }
 
-        if (config.sortOrder != null) {
-            Collections.sort(list, new ListableComparator(config.sortOrder, parser));
-        }
-
-        String lastGroup = null;
-        boolean first = true;
-        
-        for (TrainedSkillInfoSurrogate skill : list) {
-            if (config.group != null) {
-                final String thisGroup = config.group.getValue(skill, parser);
-
-                if (lastGroup == null || !thisGroup.equals(lastGroup)) {
-                    first = true;
-                    lastGroup = thisGroup;
-                    add(new HeaderPanel(lastGroup), "growx, pushx");
-                }
-            }
-
-            if (first) {
-                first = false;
-            } else {
-                add(new JSeparator(), "growx, pushx");
-            }
-
-            add(new ListablePanel(skill, parser, config),
-                    "growx, pushx");
-        }
-
-        revalidate();
-    }
-
-    public void setConfig(final ListableConfig config) {
-        this.config = config;
-        
-        updatePage();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        new ListableConfigDialog(window, this, config, new TrainedSkillInfoSurrogate(
-                character.getSheet().getResult().getSkills().values().iterator().next()))
-                .setVisible(true);
+        return list;
     }
 
 }