Add support for identifying sub plugins to plugin prefs panel.

The sub plugins are now listed, indented, underneath their parent plugin
in the plugins prefs dialog.

Issue CLIENT-33

Change-Id: I71ab1c874ed1359fbce6f2da2e0a46ec5cf899e1
Reviewed-on: http://gerrit.dmdirc.com/2152
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonCell.java

@@ -88,12 +88,18 @@ public class AddonCell extends JPanel implements AddonToggleListener {
         name.setFont(name.getFont().deriveFont(Font.BOLD));
         status.setForeground(foreground);
 
+        final int initialPadding;
+        if (info.getPluginInfo().getMetaData().getParent() == null) {
+            initialPadding = 20;
+        } else {
+            initialPadding = 30;
+        }
         add(icon, "gaptop rel, gapbottom rel, gapleft rel, "
-                + "wmin 20, wmax 20");
-        add(name, "gaptop rel, gapbottom rel, "
-                + "wmin 50% - 20, wmax 50% - 20");
-        add(status, "gaptop rel, gapbottom rel, gapright rel, "
-                + "wmin 50% - 20, wmax 50% - 20");
+                    + "wmin " + initialPadding + ", wmax " + initialPadding);
+        add(name, "gaptop rel, gapbottom rel, " + "wmin 50% - "
+                + initialPadding + ", wmax 50% - " + initialPadding);
+        add(status, "gaptop rel, gapbottom rel, gapright rel, " + "wmin 50% - "
+                + initialPadding + ", wmax 50% - " + initialPadding);
         add(new JSeparator(), "newline, spanx, growx, pushx");
     }
 

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -71,8 +71,21 @@ public class PluginPanel extends AddonPanel implements ActionListener {
     @Override
     protected JTable populateList(final JTable table) {
         final List<PluginInfo> list = new ArrayList<PluginInfo>();
+        final List<PluginInfo> sortedList = new ArrayList<PluginInfo>();
         list.addAll(PluginManager.getPluginManager().getPluginInfos());
         Collections.sort(list);
+        for (PluginInfo plugin : list) {
+            if (plugin.getMetaData().getParent() == null) {
+                final List<PluginInfo> childList = new ArrayList<PluginInfo>();
+                sortedList.add(plugin);
+                for (PluginInfo child : plugin.getChildren()) {
+                    childList.add(child);
+                }
+                Collections.sort(childList);
+                sortedList.addAll(childList);
+            }
+        }
+
 
         UIUtilities.invokeLater(new Runnable() {
 
@@ -80,7 +93,7 @@ public class PluginPanel extends AddonPanel implements ActionListener {
             @Override
             public void run() {
                 ((DefaultTableModel) table.getModel()).setNumRows(0);
-                for (PluginInfo plugin : list) {
+                for (PluginInfo plugin : sortedList) {
                     ((DefaultTableModel) table.getModel()).addRow(
                             new AddonCell[]{
                         new AddonCell(new AddonToggle(plugin, null)), });