Move some logic into ListablePage

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

@@ -22,7 +22,16 @@
 
 package uk.co.md87.evetool.ui.pages;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import net.miginfocom.swing.MigLayout;
+
+import uk.co.md87.evetool.AccountManager;
+import uk.co.md87.evetool.ApiFactory;
 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.listable.ListableConfig;
 
 /**
@@ -30,7 +39,7 @@ import uk.co.md87.evetool.ui.listable.ListableConfig;
  * TODO: Document ListablePage
  * @author chris
  */
-public class ListablePage extends Page {
+public class ListablePage extends Page implements ActionListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -39,6 +48,35 @@ public class ListablePage extends Page {
      */
     private static final long serialVersionUID = 10;
 
+    protected final MainWindow window;
+    protected final ApiFactory factory;
+    protected final AccountManager manager;
+
+    protected ListableConfig config;
+
+    public ListablePage(final MainWindow window, final AccountManager manager,
+            final ApiFactory factory) {
+        this.window = window;
+        this.factory = factory;
+        this.manager = manager;
+
+        setLayout(new MigLayout("fillx, wrap 1"));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void activated(final ContextPanel context) {
+        final FilterButton button = new FilterButton();
+        button.addActionListener(this);
+        context.add(button, "growy, al right");
+
+        updatePage();
+    }
+
     public void setConfig(final ListableConfig config) {}
 
+    protected void updatePage() {}
+
+    public void actionPerformed(final ActionEvent e) {}
+
 }

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

@@ -30,19 +30,13 @@ import java.util.Collections;
 import java.util.List;
 import javax.swing.JSeparator;
 
-import net.miginfocom.swing.MigLayout;
-
 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.api.wrappers.data.TrainedSkillInfo;
-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.data.BasicShipInfoSurrogate;
-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;
@@ -62,17 +56,9 @@ public class ShipsPage extends ListablePage implements ActionListener {
      */
     private static final long serialVersionUID = 10;
 
-    private final MainWindow window;
-    private final ApiFactory factory;
-
-    private ListableConfig config;
-
     public ShipsPage(final MainWindow window, final AccountManager manager,
             final ApiFactory factory) {
-        this.window = window;
-        this.factory = factory;
-
-        setLayout(new MigLayout("fillx, wrap 1"));
+        super(window, manager, factory);
 
         config = new ListableConfig();
         config.topLeft = new ListableConfig.BasicConfigElement("name");
@@ -94,17 +80,6 @@ public class ShipsPage extends ListablePage implements ActionListener {
                 && character.getSheet().wasSuccessful();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void activated(final ContextPanel context) {
-        final FilterButton button = new FilterButton();
-        button.addActionListener(this);
-        context.add(button, "growy, al right");
-        
-        updatePage();
-    }
-
-
     protected void updatePage() {
         removeAll();
 

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

@@ -26,18 +26,14 @@ 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;
+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.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.data.TrainedSkillInfoSurrogate;
@@ -60,17 +56,9 @@ public class SkillPage extends ListablePage implements ActionListener {
      */
     private static final long serialVersionUID = 10;
 
-    private final MainWindow window;
-    private final ApiFactory factory;
-
-    private ListableConfig config;
-
     public SkillPage(final MainWindow window, final AccountManager manager,
             final ApiFactory factory) {
-        this.window = window;
-        this.factory = factory;
-
-        setLayout(new MigLayout("fillx, wrap 1"));
+        super(window, manager, factory);
 
         config = new ListableConfig();
         config.topLeft = new ListableConfig.BasicConfigElement("name");
@@ -96,17 +84,6 @@ public class SkillPage extends ListablePage implements ActionListener {
                 && character.getSheet().wasSuccessful();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void activated(final ContextPanel context) {
-        final FilterButton button = new FilterButton();
-        button.addActionListener(this);
-        context.add(button, "growy, al right");
-        
-        updatePage();
-    }
-
-
     protected void updatePage() {
         removeAll();