Listable config dialogs

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

@@ -52,6 +52,7 @@ import javax.swing.JTextField;
 
 import net.miginfocom.swing.MigLayout;
 
+import uk.co.md87.evetool.ui.ContentPanel.Page;
 import uk.co.md87.evetool.ui.components.ListablePanel;
 import uk.co.md87.evetool.ui.listable.Listable;
 import uk.co.md87.evetool.ui.listable.ListableConfig;
@@ -60,13 +61,15 @@ import uk.co.md87.evetool.ui.listable.ListableConfig.CompoundConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableConfig.ConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableConfig.LiteralConfigElement;
 import uk.co.md87.evetool.ui.listable.ListableParser;
+import uk.co.md87.evetool.ui.pages.SkillPage;
 
 /**
  *
  * TODO: Document ListableConfigDialog
  * @author chris
  */
-public class ListableConfigDialog extends JDialog implements ItemListener, KeyListener {
+public class ListableConfigDialog extends JDialog implements ActionListener,
+        ItemListener, KeyListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -83,16 +86,21 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
     private final Map<String, List<JComponent>> components
             = new HashMap<String, List<JComponent>>();
 
+    private volatile boolean complete = false;
+
     private final JPanel configPanel, previewPanel;
     private final ListablePanel panel;
 
-    public ListableConfigDialog(final Window owner, final ListableConfig config,
-            final Listable sample) {
-        super(owner, "Display Configuration", ModalityType.APPLICATION_MODAL);
+    private final SkillPage page;
+
+    public ListableConfigDialog(final Window window, final SkillPage page,
+            final ListableConfig config, final Listable sample) {
+        super(window, "Display Configuration", ModalityType.APPLICATION_MODAL);
 
         setLayout(new MigLayout("wrap 1, fill", "[fill]", "[|fill|fill]"));
 
-        this.config = config;
+        this.page = page;
+        this.config = config.clone();
         this.sample = sample;
         this.parser = new ListableParser(sample.getClass());
         
@@ -101,22 +109,30 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
         this.configPanel = new JPanel(new MigLayout("fill", "[fill]"));
         this.previewPanel = new JPanel(new MigLayout("fill", "[fill]", "[fill]"));
 
-        configPanel.setBorder(BorderFactory.createTitledBorder("Information"));
+        configPanel.setBorder(BorderFactory.createTitledBorder("Configuration"));
         previewPanel.setBorder(BorderFactory.createTitledBorder("Preview"));
 
         this.panel = new ListablePanel(sample, parser, config);
         
         previewPanel.add(panel);
 
+        final JButton cancelButton = new JButton("Cancel");
+        final JButton okButton = new JButton("OK");
+
+        cancelButton.addActionListener(this);
+        okButton.addActionListener(this);
+
         add(configPanel);
         add(previewPanel);
+        add(cancelButton, "split");
+        add(okButton, "split");
 
         initConfigPanel();
         layoutConfigPanel();
 
         pack();
 
-        setLocationRelativeTo(owner);
+        setLocationRelativeTo(window);
         setResizable(false);
     }
 
@@ -130,6 +146,8 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
         for (int i = 0; i < config.sortOrder.length; i++) {
             components.put("+sort_" + i, getComponents(config.sortOrder[i]));
         }
+
+        complete = true;
     }
 
     protected void layoutConfigPanel() {
@@ -208,13 +226,11 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
     }
 
     protected void rebuildConfig() {
-        for (String loc : new String[]{"tl", "tr", "bl", "br"}) {
+        config.sortOrder = new ConfigElement[components.size() - 5];
+        
+        for (String loc : components.keySet()) {
             final List<ConfigElement> elements = new ArrayList<ConfigElement>();
 
-            if (!components.containsKey(loc)) {
-                continue;
-            }
-
             for (JComponent component : components.get(loc)) {
                 if (component instanceof JTextField) {
                     elements.add(new LiteralConfigElement(((JTextField) component).getText()));
@@ -235,6 +251,11 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
                 config.bottomRight = res;
             } else if (loc.equals("bl")) {
                 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;
             }
         }
     }
@@ -242,8 +263,10 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
     /** {@inheritDoc} */
     @Override
     public void itemStateChanged(final ItemEvent e) {
-        rebuildConfig();
-        panel.listableUpdated(sample);
+        if (complete) {
+            rebuildConfig();
+            panel.listableUpdated(sample);
+        }
     }
 
     /** {@inheritDoc} */
@@ -265,6 +288,16 @@ public class ListableConfigDialog extends JDialog implements ItemListener, KeyLi
         panel.listableUpdated(sample);
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void actionPerformed(final ActionEvent e) {
+        if (((JButton) e.getSource()).getText().equals("OK")) {
+            page.setConfig(config);
+        }
+
+        dispose();
+    }
+
     private class ButtonActionListener implements ActionListener {
 
         private final String location;

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

@@ -22,11 +22,14 @@
 
 package uk.co.md87.evetool.ui.listable;
 
+import java.util.Arrays;
+
 /**
  *
+ * TODO: Document ListableConfig
  * @author chris
  */
-public class ListableConfig {
+public class ListableConfig implements Cloneable {
 
     public ConfigElement topLeft, topRight, bottomLeft, bottomRight;
     public ConfigElement[] sortOrder;
@@ -95,4 +98,19 @@ public class ListableConfig {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public ListableConfig clone() {
+        final ListableConfig clone = new ListableConfig();
+
+        clone.bottomLeft = bottomLeft;
+        clone.bottomRight = bottomRight;
+        clone.topLeft = topLeft;
+        clone.topRight = topRight;
+        clone.group = group;
+        clone.sortOrder = Arrays.copyOf(sortOrder, sortOrder.length);
+
+        return clone;
+    }
+
 }

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

@@ -64,7 +64,7 @@ public class SkillPage extends Page implements ActionListener {
     private final MainWindow window;
     private final ApiFactory factory;
 
-    private final ListableConfig config;
+    private ListableConfig config;
 
     public SkillPage(final MainWindow window, final AccountManager manager,
             final ApiFactory factory) {
@@ -103,7 +103,12 @@ public class SkillPage extends Page implements ActionListener {
         final FilterButton button = new FilterButton();
         button.addActionListener(this);
         context.add(button, "growy, al right");
+        
+        updatePage();
+    }
 
+
+    protected void updatePage() {
         removeAll();
 
         final ListableParser parser = new ListableParser(TrainedSkillInfoSurrogate.class);
@@ -140,12 +145,20 @@ public class SkillPage extends Page implements ActionListener {
             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, config, new TrainedSkillInfoSurrogate(
+        new ListableConfigDialog(window, this, config, new TrainedSkillInfoSurrogate(
                 character.getSheet().getResult().getSkills().get(0))).setVisible(true);
     }