Switch pluginPanel to use a table not a list, same for themes.

Fixes CLIENT-171

Depends-On:Iecb3ea2067a398bb7ce26a8803f5678ec38e73b9
Change-Id: Ic451ad093b870ce9a69f64aa28049020fe02dc3b
Reviewed-on: http://gerrit.dmdirc.com/1793
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -32,10 +32,11 @@ import com.dmdirc.addons.ui_swing.components.frames.CustomFrame;
 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrame;
 import com.dmdirc.addons.ui_swing.components.frames.QueryFrame;
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrame;
-import com.dmdirc.addons.ui_swing.components.pluginpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.addonpanel.AddonPanel;
+import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.addons.ui_swing.components.themepanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardMessageDialog;
@@ -631,7 +632,7 @@ public class SwingController extends Plugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public PreferencesInterface getPluginPrefsPanel() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<PluginPanel>() {
+        return UIUtilities.invokeAndWait(new ReturnableThread<AddonPanel>() {
 
             /** {@inheritDoc} */
             @Override
@@ -678,7 +679,7 @@ public class SwingController extends Plugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(new ThemePanel(urlHandler));
+                setObject(new ThemePanel(me, SwingController.this));
             }
         });
     }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -36,7 +36,7 @@ import javax.swing.ImageIcon;
 /**
  * Describes an addon.
  */
-public class AddonInfo {    
+public class AddonInfo {
     private final int id;
     private final String stableDownload;
     private final String unstableDownload;

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

@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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 com.dmdirc.addons.ui_swing.components.addonpanel;
+
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+
+import java.awt.Color;
+import java.awt.Font;
+
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JSeparator;
+import javax.swing.UIManager;
+
+import net.miginfocom.layout.PlatformDefaults;
+import net.miginfocom.swing.MigLayout;
+
+/**
+ * Renders an addon for display in the plugin panel.
+ */
+public class AddonCell extends JPanel {
+
+    /** Addon toggle object. */
+    private final Object info;
+    /** Name of the addon. */
+    private final TextLabel name;
+    /** Version of the addon. */
+    private final TextLabel version;
+    /** Author of the addon. */
+    private final TextLabel author;
+    /** Description of the addon. */
+    private final TextLabel desc;
+
+    /**
+     * Creates a new addon cell representing the specified addon info.
+     *
+     * @param info PluginInfoToggle or ThemeToggle
+     */
+    public AddonCell(final Object info) {
+        super();
+
+        name = new TextLabel();
+        version = new TextLabel();
+        author = new TextLabel();
+        desc = new TextLabel();
+
+        this.info = info;
+        init();
+    }
+
+    /**
+     * Initialises the addon cell.
+     */
+    private void init() {
+        setLayout(new MigLayout("fill, ins 3 0 0 0"));
+
+        Color foreground = UIManager.getColor("Table.foreground");
+        if (info instanceof AddonToggle) {
+            final AddonToggle plugin = (AddonToggle) info;
+
+            if (!plugin.getState()) {
+                foreground = foreground.brighter().brighter().brighter();
+            }
+
+            name.setText(plugin.getPluginInfo().getNiceName());
+            version.setText(plugin.getPluginInfo().getFriendlyVersion());
+            author.setText(plugin.getPluginInfo().getAuthor());
+            desc.setText(plugin.getPluginInfo().getDescription());
+        }
+
+        name.setForeground(foreground);
+        name.setFont(name.getFont().deriveFont(Font.BOLD));
+        version.setForeground(foreground);
+        author.setForeground(foreground);
+        desc.setForeground(foreground);
+        desc.setBorder(BorderFactory.createEmptyBorder((int) PlatformDefaults.
+                getPanelInsets(0).getValue(), 0, 0, 0));
+
+        add(name, "gapleft 3, wmin 50%, wmax 50%");
+        add(version, "wmin 25%, wmax 25%");
+        add(author, "gapright 3, wmin 24.9%, wmax 24.9%, alignx right");
+        add(desc, "newline, span, grow, pushy, gapleft 3, gapright 3, wmax 99%");
+        add(new JSeparator(), "newline, span, growx, pushx");
+    }
+
+    /**
+     * Returns the addon toggle object associated with this cell.
+     *
+     * @return Addon toggle
+     */
+    public Object getObject() {
+        return info;
+    }
+
+    /**
+     * Is this addon enabled or disabled?
+     *
+     * @return true iif enabled
+     */
+    public boolean isToggled() {
+        if (info instanceof AddonToggle) {
+            return ((AddonToggle) info).getState();
+        }
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setForeground(final Color color) {
+        if (name != null) {
+            name.setForeground(color);
+        }
+        if (version != null) {
+            version.setForeground(color);
+        }
+        if (author != null) {
+            author.setForeground(color);
+        }
+        if (desc != null) {
+            desc.setForeground(color);
+        }
+    }
+}

src/com/dmdirc/addons/ui_swing/components/pluginpanel/PluginPanel.java → src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -20,45 +20,42 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components.pluginpanel;
+package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DownloaderWindow;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.plugins.PluginManager;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Collections;
 import java.util.List;
 
-import javax.swing.DefaultListModel;
 import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableModel;
 
 import net.miginfocom.swing.MigLayout;
 
 /**
- * Plugin manager dialog. Allows the user to manage their plugins.
+ * Addon panel, base class for displaying and managing addons.
  */
-public final class PluginPanel extends JPanel implements
-        ActionListener, ListSelectionListener, PreferencesInterface,
-        com.dmdirc.interfaces.ActionListener {
+public abstract class AddonPanel extends JPanel implements
+        ActionListener, ListSelectionListener, PreferencesInterface {
 
+    /** Button to enable/disable addon. */
+    protected JButton toggleButton;
+    /** List of addons. */
+    protected JTable addonList;
     /**
      * A version number for this class. It should be changed whenever the class
      * structure is changed (or anything else that would prevent serialized
@@ -69,26 +66,20 @@ public final class PluginPanel extends JPanel implements
     private final Window parentWindow;
     /** Swing Controller. */
     private final SwingController controller;
-    /** List of plugins. */
-    private JList pluginList;
-    /** plugin list scroll pane. */
+    /** Addon list scroll pane. */
     private JScrollPane scrollPane;
-    /** Button to enable/disable plugin. */
-    private JButton toggleButton;
-    /** Currently selected plugin. */
-    private int selectedPlugin;
+    /** Currently selected addon. */
+    private int selectedAddon;
     /** Blurb label. */
     private TextLabel blurbLabel;
-    /** Do we refresh on plugin reload? */
-    private boolean pluginRefresh = true;
 
     /**
-     * Creates a new instance of PluginDialog.
+     * Creates a new instance of AddonPanel
      *
      * @param parentWindow Parent window
      * @param controller Swing Controller
      */
-    public PluginPanel(final Window parentWindow,
+    public AddonPanel(final Window parentWindow,
             final SwingController controller) {
         super();
 
@@ -99,16 +90,32 @@ public final class PluginPanel extends JPanel implements
         addListeners();
         layoutComponents();
 
-        pluginList.setSelectedIndex(0);
-        selectedPlugin = 0;
+        addonList.getSelectionModel().setSelectionInterval(0, 0);
+        selectedAddon = 0;
     }
 
     /** Initialises the components. */
     private void initComponents() {
-        pluginList = new JList(new DefaultListModel());
-        pluginList.setCellRenderer(new AddonCellRenderer());
+        addonList = new JTable(new DefaultTableModel(
+                new Object[]{"Addon", }, 0)) {
 
-        scrollPane = new JScrollPane(new JLabel("Loading plugins..."));
+            /** {@inheritDoc} */
+            @Override
+            public boolean isCellEditable(final int row, final int column) {
+                return false;
+            }
+
+        };
+        addonList.setDefaultRenderer(Object.class,
+                new AddonCellRenderer());
+        addonList.setTableHeader(null);
+        addonList.setShowGrid(false);
+        addonList.getSelectionModel().setSelectionMode(
+                ListSelectionModel.SINGLE_SELECTION);
+        addonList.getSelectionModel().clearSelection();
+
+        scrollPane = new JScrollPane(new JLabel("Loading " + getTypeName()
+                + "..."));
         scrollPane.setHorizontalScrollBarPolicy(
                 JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         scrollPane.setVerticalScrollBarPolicy(
@@ -117,8 +124,9 @@ public final class PluginPanel extends JPanel implements
         toggleButton = new JButton("Enable");
         toggleButton.setEnabled(false);
 
-        blurbLabel = new TextLabel(
-                "Plugins allow you to extend the functionality of DMDirc.");
+        blurbLabel = new TextLabel(getTypeName().substring(0, 1).toUpperCase()
+                + getTypeName().substring(1) + " allow you to extend the "
+                + "functionality of DMDirc.");
 
         /** {@inheritDoc}. */
         new LoggingSwingWorker<Object, Object>() {
@@ -126,14 +134,14 @@ public final class PluginPanel extends JPanel implements
             /** {@inheritDoc}. */
             @Override
             protected Object doInBackground() {
-                return populateList();
+                return populateList(addonList);
             }
 
             /** {@inheritDoc}. */
             @Override
             protected void done() {
                 super.done();
-                scrollPane.setViewportView(pluginList);
+                scrollPane.setViewportView(addonList);
             }
         }.executeInExecutor();
     }
@@ -153,43 +161,29 @@ public final class PluginPanel extends JPanel implements
 
         add(toggleButton, "split 2, growx, pushx, sg button");
 
-        final JButton button = new JButton("Get more plugins");
+        final JButton button = new JButton("Get more " + getTypeName());
         button.addActionListener(this);
         add(button, "growx, pushx, sg button");
     }
 
     /**
-     * Populates the plugins list with plugins from the plugin manager.
+     * Populates the addon list returning it when complete.
      *
-     * @return Populated list
+     * @return Populated table
      */
-    private JList populateList() {
-        pluginRefresh = false;
-        final List<PluginInfo> list =
-                PluginManager.getPluginManager().getPossiblePluginInfos(true);
-        pluginRefresh = true;
-        Collections.sort(list);
+    protected abstract JTable populateList(final JTable table);
 
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                ((DefaultListModel) pluginList.getModel()).clear();
-                for (PluginInfo plugin : list) {
-                    ((DefaultListModel) pluginList.getModel()).addElement(
-                            new PluginInfoToggle(plugin));
-                }
-                pluginList.repaint();
-            }
-        });
-        return pluginList;
-    }
+    /**
+     * Returns the name of the type of addon being handled.
+     *
+     * @return Addon type name
+     */
+    protected abstract String getTypeName();
 
     /** Adds listeners to components. */
     private void addListeners() {
         toggleButton.addActionListener(this);
-        pluginList.addListSelectionListener(this);
-        ActionManager.addListener(this, CoreActionType.PLUGIN_REFRESH);
+        addonList.getSelectionModel().addListSelectionListener(this);
     }
 
     /**
@@ -199,19 +193,20 @@ public final class PluginPanel extends JPanel implements
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == toggleButton && selectedPlugin >= 0) {
-            final PluginInfoToggle pluginInfo = (PluginInfoToggle) pluginList.
-                    getSelectedValue();
+        if (e.getSource() == toggleButton && selectedAddon >= 0) {
+            final AddonToggle addonToggle = (AddonToggle) ((AddonCell)
+                    addonList.getModel().getValueAt(addonList
+                    .getSelectedRow(), 0)).getObject();
 
-            pluginInfo.toggle();
+            addonToggle.toggle();
 
-            if (pluginInfo.getState()) {
+            if (addonToggle.getState()) {
                 toggleButton.setText("Disable");
             } else {
                 toggleButton.setText("Enable");
             }
 
-            pluginList.repaint();
+            addonList.repaint();
         } else if (e.getSource() != toggleButton) {
             new DownloaderWindow(parentWindow, controller);
         }
@@ -221,40 +216,37 @@ public final class PluginPanel extends JPanel implements
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         if (!e.getValueIsAdjusting()) {
-            final int selected = ((JList) e.getSource()).getSelectedIndex();
-            if (selected >= 0) {
-                final PluginInfoToggle pluginInfo =
-                        (PluginInfoToggle) ((JList) e.getSource()).
-                        getSelectedValue();
-                toggleButton.setEnabled(true);
-
-                if (pluginInfo.getState()) {
-                    toggleButton.setEnabled(pluginInfo.getPluginInfo().
-                            isUnloadable());
-                    toggleButton.setText("Disable");
-                } else {
-                    toggleButton.setText("Enable");
-                }
-            }
-            selectedPlugin = selected;
+            return;
+        }
+        final int selected = addonList.getSelectionModel()
+                .getLeadSelectionIndex();
+        if (selected == -1) {
+            return;
+        }
+        final AddonToggle addonToggle = (AddonToggle) ((AddonCell)
+                ((List) ((DefaultTableModel) addonList.getModel())
+                .getDataVector().elementAt(selected)).get(0)).getObject();
+        toggleButton.setEnabled(true);
+
+        if (addonToggle.getState()) {
+            toggleButton.setEnabled(addonToggle.isUnloadable());
+            toggleButton.setText("Disable");
+        } else {
+            toggleButton.setText("Enable");
         }
+        selectedAddon = selected;
     }
 
     /** {@inheritDoc} */
     @Override
     public void save() {
-        for (Object pit : ((DefaultListModel) pluginList.getModel())
-                .toArray()) {
-            ((PluginInfoToggle) pit).apply();
+        if (addonList.getRowCount() == 0) {
+            return;
         }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (pluginRefresh) {
-            populateList();
+        for (int i = 1; i < addonList.getRowCount(); i++) {
+            addonList.getModel().getColumnCount();
+            ((AddonToggle) ((AddonCell) addonList.getModel()
+                    .getValueAt(i, 0)).getObject()).apply();
         }
     }
 }

src/com/dmdirc/addons/ui_swing/components/pluginpanel/PluginInfoToggle.java → src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -19,74 +19,115 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.dmdirc.addons.ui_swing.components.pluginpanel;
+package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.themes.Theme;
+import com.dmdirc.ui.themes.ThemeManager;
 
 /**
- * Wraps a PluginInfo object with a boolean to indicate whether it should be
- * toggled or not.
- * 
- * @author chris
+ * Wraps a Addon object (Theme or Plugin) with a boolean to indicate whether
+ * it should be toggled or not.
  */
-public class PluginInfoToggle {
-    
+public class AddonToggle {
+
     /** The PluginInfo object we're wrapping. */
     private final PluginInfo pi;
-    
+    /** The Theme object we're wrapping. */
+    private final Theme theme;
     /** Whether or not to toggle it. */
-    private boolean toggle = false;
+    private boolean toggled = false;
 
     /**
-     * Creates a new instance of PluginInfoToggle to wrap the specified
-     * PluginInfo.
-     * 
-     * @param pi The PluginInfo to be wrapped
+     * Creates a new instance of AddonToggle to wrap the specified
+     * PluginInfo or Theme.
+     *
+     * @param pi The PluginInfo to be wrapped can be null
+     * @param theme The Theme to be wrapped can be null
      */
-    public PluginInfoToggle(final PluginInfo pi) {
+    public AddonToggle(final PluginInfo pi, final Theme theme) {
+        if ((pi == null) == (theme == null)) {
+            throw new IllegalArgumentException("You must wrap a plugin or "
+                    + "a theme.");
+        }
         this.pi = pi;
+        this.theme = theme;
     }
-    
+
     /**
      * Toggles this PluginInfoToggle.
      */
     public void toggle() {
-        toggle = !toggle;
+        toggled ^= true;
     }
-    
+
     /**
      * Gets the state of this PluginInfo, taking into account the state
      * of the toggle setting.
-     * 
+     *
      * @return True if the plugin is or should be loaded, false otherwise.
      */
     public boolean getState() {
-        return toggle ^ pi.isLoaded();
+        if (pi != null) {
+            return toggled ^ pi.isLoaded();
+        }
+        if (theme != null) {
+            return toggled ^ theme.isEnabled();
+        }
+        return false;
     }
 
     /**
      * Retrieves the PluginInfo object associated with this toggle.
-     * 
+     *
      * @return This toggle's PluginInfo object.
      */
     public PluginInfo getPluginInfo() {
         return pi;
     }
-    
+
+    /**
+     * Retrieves the Theme object associated with this toggle.
+     *
+     * @return This toggle's Theme object.
+     */
+    public Theme getTheme() {
+        return theme;
+    }
+
     /**
      * Applies the changes to the PluginInfo, if any.
      */
     public void apply() {
-        if (toggle) {
+        if (pi != null && toggled) {
             if (pi.isLoaded()) {
                 pi.unloadPlugin();
             } else {
                 pi.loadPlugin();
             }
-            
             PluginManager.getPluginManager().updateAutoLoad(pi);
         }
+        if (theme != null && toggled) {
+            if (theme.isEnabled()) {
+                theme.applyTheme();
+            } else {
+                theme.removeTheme();
+            }
+            ThemeManager.updateAutoLoad(theme);
+        }
+    }
+
+    /**
+     * Is this addon unloadable?
+     *
+     * @return true iff unloadable
+     */
+    public boolean isUnloadable() {
+        if (pi != null) {
+            return pi.isUnloadable();
+        }
+        return true;
     }
 
 }

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

@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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 com.dmdirc.addons.ui_swing.components.addonpanel;
+
+import com.dmdirc.actions.ActionManager;
+import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
+
+import java.awt.Window;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ * Lists known plugins, enabling the end user to enable/disable these as well
+ * as download new ones.
+ */
+public class PluginPanel extends AddonPanel implements ActionListener {
+
+    /** Do we refresh on plugin reload? */
+    private boolean pluginRefresh = true;
+
+    /**
+     * Creates a new instance of PluginPanel.
+     *
+     * @param parentWindow Parent window
+     * @param controller Swing Controller
+     */
+    public PluginPanel(final Window parentWindow,
+            final SwingController controller) {
+        super(parentWindow, controller);
+
+        ActionManager.addListener(this, CoreActionType.PLUGIN_REFRESH);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JTable populateList(final JTable table) {
+        pluginRefresh = false;
+        final List<PluginInfo> list =
+                PluginManager.getPluginManager().getPossiblePluginInfos(true);
+        pluginRefresh = true;
+        Collections.sort(list);
+
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                ((DefaultTableModel) table.getModel()).setNumRows(0);
+                for (PluginInfo plugin : list) {
+                    ((DefaultTableModel) table.getModel()).addRow(
+                            new AddonCell[]{
+                        new AddonCell(new AddonToggle(plugin, null)), });
+                }
+
+                if (((DefaultTableModel) table.getModel()).getRowCount()
+                        > 0) {
+                    toggleButton.setEnabled(true);
+                }
+
+                table.repaint();
+            }
+        });
+        return table;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
+        if (pluginRefresh) {
+            populateList(addonList);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected String getTypeName() {
+        return "plugins";
+    }
+}

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * 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 com.dmdirc.addons.ui_swing.components.addonpanel;
+
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.ui.themes.Theme;
+import com.dmdirc.ui.themes.ThemeManager;
+
+import java.awt.Window;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableModel;
+
+/**
+ * Lists known themes, enabling the end user to enable/disable these as well
+ * as download new ones.
+ */
+public class ThemePanel extends AddonPanel {
+
+    /**
+     * Creates a new instance of ThemePanel.
+     *
+     * @param parentWindow Parent window
+     * @param controller Swing Controller
+     */
+    public ThemePanel(final Window parentWindow,
+            final SwingController controller) {
+        super(parentWindow, controller);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected JTable populateList(final JTable table) {
+        final List<Theme> list = new ArrayList<Theme>(ThemeManager.
+                getAvailableThemes().values());
+        Collections.sort(list);
+
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                ((DefaultTableModel) addonList.getModel()).setRowCount(0);
+                for (Theme theme : list) {
+                    ((DefaultTableModel) addonList.getModel()).addRow(
+                            new AddonCell[]{
+                        new AddonCell(new AddonToggle(null, theme)), });
+                }
+
+                if (((DefaultTableModel) addonList.getModel()).getRowCount()
+                        > 0) {
+                    toggleButton.setEnabled(true);
+                }
+
+                addonList.repaint();
+            }
+        });
+        return addonList;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected String getTypeName() {
+        return "themes";
+    }
+
+}

src/com/dmdirc/addons/ui_swing/components/renderers/AddonCellRenderer.java

@@ -22,28 +22,19 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import com.dmdirc.addons.ui_swing.components.pluginpanel.PluginInfoToggle;
-import com.dmdirc.addons.ui_swing.components.themepanel.ThemeToggle;
+import com.dmdirc.addons.ui_swing.components.addonpanel.AddonCell;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 
-import javax.swing.BorderFactory;
 import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.ListCellRenderer;
-
-import net.miginfocom.layout.PlatformDefaults;
-import net.miginfocom.swing.MigLayout;
+import javax.swing.JTable;
+import javax.swing.table.TableCellRenderer;
 
 /**
- * Handles the rendering of the JList used for plugin and theme management.
- * @author chris
+ * Handles the rendering of the JTable used for plugin and theme management.
  */
-public class AddonCellRenderer extends JPanel implements ListCellRenderer {
+public class AddonCellRenderer implements TableCellRenderer {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -54,61 +45,37 @@ public class AddonCellRenderer extends JPanel implements ListCellRenderer {
 
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
-            final boolean cellHasFocus) {
-
-        removeAll();
-        setLayout(new MigLayout("fill, ins 3 0 0 0"));
-
-        if (isSelected) {
-            setBackground(list.getSelectionBackground());
-        } else {
-            setBackground(list.getBackground());
-        }
-        final JLabel name = new JLabel(), version = new JLabel(),
-                author = new JLabel(), desc = new JLabel();
-
-        Color foreground = Color.BLACK;
-        if (value instanceof PluginInfoToggle) {
-            final PluginInfoToggle plugin = (PluginInfoToggle) value;
-
-            if (!plugin.getState()) {
-                foreground = Color.GRAY;
+    public Component getTableCellRendererComponent(final JTable table,
+            final Object value, final boolean isSelected,
+            final boolean hasFocus, final int row, final int column) {
+        if (value instanceof AddonCell) {
+            final AddonCell label = (AddonCell) value;
+
+            if (isSelected) {
+                label.setBackground(table.getSelectionBackground());
+            } else {
+                label.setBackground(table.getBackground());
+                final Color colour = (row & 1)
+                        == 1 ? new Color(0xEE, 0xEE, 0xFF) : Color.WHITE;
+                if (!label.getBackground().equals(colour)) {
+                    label.setBackground(colour);
+                }
             }
 
-            name.setText(plugin.getPluginInfo().getNiceName());
-            version.setText(plugin.getPluginInfo().getFriendlyVersion());
-            author.setText(plugin.getPluginInfo().getAuthor());
-            desc.setText(plugin.getPluginInfo().getDescription());
-        } else if (value instanceof ThemeToggle) {
-            final ThemeToggle theme = (ThemeToggle) value;
+            final int height = label.getPreferredSize().height;
+            if (table.getRowHeight(row) != height) {
+                table.setRowHeight(row, height);
+            }
 
-            if (!theme.getState()) {
-                foreground = Color.GRAY;
+            if (label.isToggled()) {
+                label.setForeground(Color.BLACK);
+            } else {
+                label.setForeground(Color.GRAY);
             }
 
-            name.setText(theme.getTheme().getName());
-            version.setText(theme.getTheme().getVersion());
-            author.setText(theme.getTheme().getAuthor());
-            desc.setText(theme.getTheme().getDescription());
+            return label;
+        } else {
+            return new JLabel(value.toString());
         }
-
-        name.setForeground(foreground);
-        name.setFont(name.getFont().deriveFont(Font.BOLD));
-        version.setForeground(foreground);
-        version.setHorizontalAlignment(JLabel.CENTER);
-        author.setForeground(foreground);
-        desc.setForeground(foreground);
-        desc.setBorder(BorderFactory.createEmptyBorder((int) PlatformDefaults.
-                getPanelInsets(0).getValue(), 0, 0, 0));
-
-        add(name, "gapleft 3");
-        add(version, "pushx");
-        add(author, "wrap, gapright 3");
-        add(desc, "span 3, growx, pushx, wrap, gapleft 3, gapright 3");
-        add(new JSeparator(), "span 3, growx, pushx");
-
-        return this;
     }
 }

src/com/dmdirc/addons/ui_swing/components/text/TextLabel.java

@@ -48,7 +48,7 @@ public class TextLabel extends JTextPane {
      */
     private static final long serialVersionUID = 1;
     /** Simple attribute set. */
-    private SimpleAttributeSet sas;
+    private final SimpleAttributeSet sas = new SimpleAttributeSet();
 
     /**
      * Creates a new instance of TextLabel.
@@ -92,7 +92,6 @@ public class TextLabel extends JTextPane {
         setHighlighter(null);
         setMargin(new Insets(0, 0, 0, 0));
 
-        sas = new SimpleAttributeSet();
         if (justified) {
             StyleConstants.setAlignment(sas, StyleConstants.ALIGN_JUSTIFIED);
         }
@@ -102,16 +101,29 @@ public class TextLabel extends JTextPane {
 
     /** {@inheritDoc} */
     @Override
-    public StyledDocument getDocument() {
+    public final StyledDocument getDocument() {
         return (StyledDocument) super.getDocument();
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setText(final String t) {
+    public final void setText(final String t) {
         super.setText(t);
         if (t != null && !t.isEmpty()) {
             getDocument().setParagraphAttributes(0, t.length(), sas, false);
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setForeground(final Color colour) {
+        if (sas == null) {
+            return;
+        }
+        if (colour != null) {
+            StyleConstants.setForeground(sas, colour);
+            getDocument().setParagraphAttributes(0, getDocument().getLength(),
+                    sas, false);
+        }
+    }
 }

src/com/dmdirc/addons/ui_swing/components/themepanel/ThemePanel.java

@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.addons.ui_swing.components.themepanel;
-
-import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.ui.themes.Theme;
-import com.dmdirc.ui.themes.ThemeManager;
-
-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.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import net.miginfocom.swing.MigLayout;
-
-/**
- * Theme panel. Shows users available themes and allows them to enable/disbale
- * them.
- */
-public final class ThemePanel extends JPanel implements
-        ActionListener, ListSelectionListener, PreferencesInterface {
-
-    /**
-     * 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 = 3;
-    /** List of themes. */
-    private JList themeList;
-    /** plugin list scroll pane. */
-    private JScrollPane scrollPane;
-    /** Button to enable/disable theme. */
-    private JButton toggleButton;
-    /** Currently selected theme. */
-    private int selectedTheme;
-    /** Blurb label. */
-    private TextLabel blurbLabel;
-    /** The URL handler to use to open links. */
-    private final URLHandler urlHandler;
-
-    /**
-     * Creates a new instance of ThemePanel.
-     *
-     * @param urlHandler A {@link URLHandler} to use to open links
-     */
-    public ThemePanel(final URLHandler urlHandler) {
-        super();
-
-        this.urlHandler = urlHandler;
-
-        initComponents();
-        addListeners();
-        layoutComponents();
-
-        themeList.setSelectedIndex(0);
-        selectedTheme = 0;
-    }
-
-    /** Initialises the components. */
-    private void initComponents() {
-        themeList = new JList(new DefaultListModel());
-        themeList.setCellRenderer(new AddonCellRenderer());
-
-        scrollPane = new JScrollPane(new JLabel("Loading plugins..."));
-        scrollPane.setHorizontalScrollBarPolicy(
-                JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-        scrollPane.setVerticalScrollBarPolicy(
-                JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
-
-        toggleButton = new JButton("Enable");
-        toggleButton.setEnabled(false);
-
-        blurbLabel = new TextLabel("Themes alter the appearance of DMDirc");
-
-        /** {@inheritDoc}. */
-        new LoggingSwingWorker() {
-
-            /** {@inheritDoc}. */
-            @Override
-            protected Object doInBackground() {
-                return populateList();
-            }
-
-            /** {@inheritDoc}. */
-            @Override
-            protected void done() {
-                super.done();
-                scrollPane.setViewportView(themeList);
-            }
-        }.executeInExecutor();
-    }
-
-    /** Lays out the dialog. */
-    private void layoutComponents() {
-        setLayout(new MigLayout("ins 0, fill"));
-
-        add(blurbLabel, "wrap 10, growx, pushx");
-
-        add(scrollPane, "wrap 5, grow, push");
-
-        add(toggleButton, "split 2, growx, pushx, sg button");
-
-        final JButton button = new JButton("Get more themes");
-        button.addActionListener(this);
-        add(button, "growx, pushx, sg button");
-    }
-
-    /**
-     * Populates the plugins list with plugins from the plugin manager.
-     *
-     * @return Populated list
-     */
-    private JList populateList() {
-        final List<Theme> list = new ArrayList<Theme>(ThemeManager.
-                getAvailableThemes().values());
-        Collections.sort(list);
-
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                ((DefaultListModel) themeList.getModel()).clear();
-                for (Theme plugin : list) {
-                    ((DefaultListModel) themeList.getModel()).addElement(
-                            new ThemeToggle(plugin));
-                }
-
-                if (((DefaultListModel) themeList.getModel()).size() > 0) {
-                    toggleButton.setEnabled(true);
-                }
-
-                themeList.repaint();
-            }
-        });
-        return themeList;
-    }
-
-    /** Adds listeners to components. */
-    private void addListeners() {
-        toggleButton.addActionListener(this);
-        themeList.addListSelectionListener(this);
-    }
-
-    /**
-     * Invoked when an action occurs.
-     *
-     * @param e The event related to this action.
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        if (e.getSource() == toggleButton && selectedTheme >= 0) {
-            final ThemeToggle theme = (ThemeToggle) themeList.getSelectedValue();
-
-            theme.toggle();
-
-            if (theme.getState()) {
-                toggleButton.setText("Disable");
-            } else {
-                toggleButton.setText("Enable");
-            }
-
-            themeList.repaint();
-        } else if (e.getSource() != toggleButton) {
-            urlHandler.launchApp("http://addons.dmdirc.com/");
-        }
-    }
-
-    /** {@inheritDoc}. */
-    @Override
-    public void valueChanged(final ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) {
-            final int selected = ((JList) e.getSource()).getSelectedIndex();
-            if (selected >= 0) {
-                final ThemeToggle theme = (ThemeToggle) ((JList) e.getSource()).
-                        getSelectedValue();
-                toggleButton.setEnabled(true);
-
-                if (theme.getState()) {
-                    toggleButton.setText("Disable");
-                } else {
-                    toggleButton.setText("Enable");
-                }
-            }
-            selectedTheme = selected;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void save() {
-        final List<String> enabled = new ArrayList<String>();
-
-        for (Object pit : ((DefaultListModel) themeList.getModel()).toArray()) {
-            if (((ThemeToggle) pit).getState()) {
-                enabled.add(((ThemeToggle) pit).getTheme().getFileName());
-            }
-        }
-
-        IdentityManager.getConfigIdentity().setOption("themes", "enabled",
-                enabled);
-    }
-}

src/com/dmdirc/addons/ui_swing/components/themepanel/ThemeToggle.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.addons.ui_swing.components.themepanel;
-
-import com.dmdirc.ui.themes.Theme;
-
-/**
- * Wraps a Theme object with a boolean to indicate whether it should be
- * enabled or not.
- * 
- * @author chris
- */
-public class ThemeToggle {
-    
-    /** The Theme object we're wrapping. */
-    private final Theme theme;
-    
-    /** Whether or not to enable it. */
-    private boolean enable;
-
-    /**
-     * Creates a new instance of ThemeToggle to wrap the specified
-     * Theme.
-     * 
-     * @param theme The theme to be wrapped
-     */
-    public ThemeToggle(final Theme theme) {
-        this.theme = theme;
-        enable = theme.isEnabled();
-    }
-    
-    /**
-     * Toggles this theme.
-     */
-    public void toggle() {
-        enable = !enable;
-    }
-    
-    /**
-     * Gets the state of this ThemeToggle.
-     * 
-     * @return True if the theme is or should be loaded, false otherwise.
-     */
-    public boolean getState() {
-        return enable;
-    }
-
-    /**
-     * Retrieves the Theme object associated with this toggle.
-     * 
-     * @return This toggle's theme object.
-     */
-    public Theme getTheme() {
-        return theme;
-    }
-
-}