Listable grouping

src/uk/co/md87/evetool/ui/components/HeaderPanel.java

@@ -0,0 +1,63 @@
+/*
+ * 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.components;
+
+import java.awt.Font;
+
+import javax.swing.BorderFactory;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.BevelBorder;
+
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Displays a header for grouped listables.
+ *
+ * @author chris
+ */
+public class HeaderPanel extends JPanel {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 10;
+
+    /**
+     * Creates a new header panel with the specified text.
+     *
+     * @param text The text to be displayed
+     */
+    public HeaderPanel(final String text) {
+        super(new MigLayout("fillx"));
+
+        final JLabel header = new JLabel(text);
+        header.setFont(header.getFont().deriveFont(14f).deriveFont(Font.BOLD));
+        setBorder(BorderFactory.createCompoundBorder(
+                BorderFactory.createBevelBorder(BevelBorder.RAISED),
+                BorderFactory.createEmptyBorder(0, 5, 0, 5)));
+        add(header, "growx");
+    }
+}

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

@@ -30,7 +30,7 @@ public class ListableConfig {
 
     public ConfigElement topLeft, topRight, bottomLeft, bottomRight;
     public String[] sortOrder;
-    public String group;
+    public ConfigElement group;
 
     public static interface ConfigElement {
 

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

@@ -38,9 +38,11 @@ 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.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.ListableConfig;
 import uk.co.md87.evetool.ui.listable.ListableParser;
 
@@ -78,6 +80,7 @@ public class SkillPage extends Page implements ActionListener {
                 new ListableConfig.BasicConfigElement("max skillpoints"));
         config.bottomLeft = new ListableConfig.BasicConfigElement("group name");
         config.bottomRight = new ListableConfig.BasicConfigElement("time to next level");
+        config.group = new ListableConfig.BasicConfigElement("group name");
     }
 
     /** {@inheritDoc} */
@@ -100,16 +103,30 @@ public class SkillPage extends Page implements ActionListener {
                 new TrainingTimeComparator(true));
 
         final ListableParser parser = new ListableParser(TrainedSkillInfoSurrogate.class);
-        
+
+        String lastGroup = null;
         boolean first = true;
+        
         for (TrainedSkillInfo skill : character.getSheet().getResult().getSkills()) {
+            final Listable wrapper = new TrainedSkillInfoSurrogate(skill);
+
+            if (config.group != null) {
+                final String thisGroup = config.group.getValue(wrapper, 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(new TrainedSkillInfoSurrogate(skill), parser, config),
+            add(new ListablePanel(wrapper, parser, config),
                     "growx, pushx");
         }
     }