Abstract look and feel fixes from MapEntryRenderer.

Change-Id: Icafa0120b789de2fcbe6abdc47db17896ec4b5ca
Reviewed-on: http://gerrit.dmdirc.com/2621
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/FontPicker.java

@@ -58,7 +58,7 @@ public class FontPicker extends JComboBox {
         setPrototypeDisplayValue("test");
         this.fontFamily = fontFamily;
 
-        setRenderer(new FontListCellRenderer());
+        setRenderer(new FontListCellRenderer(getRenderer()));
         new LoggingSwingWorker<String[], String[]>() {
 
             /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/expandingsettings/AddOptionPanel.java

@@ -84,7 +84,8 @@ public class AddOptionPanel extends JPanel implements ActionListener {
         addOptionComboBox = new JComboBox(new DefaultComboBoxModel());
         addOptionButton = new JButton("Add");
 
-        addOptionComboBox.setRenderer(new AddOptionCellRenderer(parent));
+        addOptionComboBox.setRenderer(new AddOptionCellRenderer(parent,
+                addOptionComboBox.getRenderer()));
 
         addInputNone = new JLabel("");
         addInputCurrent = addInputNone;

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

@@ -26,46 +26,46 @@ import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Displays actions using getName not toString.
  */
-public class ActionCellRenderer extends DefaultListCellRenderer {
+public class ActionCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ActionCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
-
         if (value instanceof ActionComparison) {
-            setText(((ActionComparison) value).getName());
+            label.setText(((ActionComparison) value).getName());
         } else if (value instanceof ActionComponent) {
-            setText(((ActionComponent) value).getName());
+            label.setText(((ActionComponent) value).getName());
         } else if (value instanceof ActionType) {
-            setText(((ActionType) value).getName());
+            label.setText(((ActionType) value).getName());
         } else if (value instanceof Class<?>) {
-            setText(((Class<?>) value).getSimpleName());
+            label.setText(((Class<?>) value).getSimpleName());
         } else if (value == null) {
-            setText("");
+            label.setText("");
         } else {
-            setText(value.toString());
+            label.setText(value.toString());
         }
-
-        return this;
     }
 
 }

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

@@ -24,38 +24,38 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.interfaces.actions.ActionComparison;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Renders an action comparison in plain english.
  */
-public final class ActionComparisonCellRenderer extends DefaultListCellRenderer {
+public final class ActionComparisonCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ActionComparisonCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-
-        super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
         if (value == null) {
-            setText("Any");
+            label.setText("Any");
         } else {
-            setText(((ActionComparison) value).getName());
+            label.setText(((ActionComparison) value).getName());
         }
-
-        return this;
     }
 
 }

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

@@ -24,38 +24,37 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.actions.ActionGroup;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Action group list cell renderer.
  */
-public class ActionGroupListCellRenderer extends DefaultListCellRenderer {
+public class ActionGroupListCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ActionGroupListCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
-
         if (value instanceof ActionGroup) {
-            setText(((ActionGroup) value).getName());
+            label.setText(((ActionGroup) value).getName());
         } else {
-            setText(value.toString());
+            label.setText(value.toString());
         }
-
-        return this;
     }
 }

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

@@ -25,33 +25,34 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Displays actions using getName not toString.
  */
-public final class ActionSubstititionRenderer extends DefaultListCellRenderer {
+public final class ActionSubstititionRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ActionSubstititionRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
-        setText(((Substitution) value).getValue());
-
-        return this;
+        label.setText(((Substitution) value).getValue());
     }
 
 }

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

@@ -24,41 +24,42 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.interfaces.actions.ActionType;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Displays actions types and headers in a pretty fashion.
  */
-public final class ActionTypeRenderer extends DefaultListCellRenderer {
+public final class ActionTypeRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ActionTypeRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
         if (value == null) {
-            setText("Select a value");
+            label.setText("Select a value");
         } else if (value instanceof String && !((String) value).isEmpty()) {
-            setText(value.toString());
+            label.setText(value.toString());
         } else if (value instanceof ActionType) {
-            setText(((ActionType) value).getName());
+            label.setText(((ActionType) value).getName());
         } else {
-            setText(value.toString());
+            label.setText(value.toString());
         }
-
-        return this;
     }
 
 }

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

@@ -25,21 +25,17 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.JComponent;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Add option combo box cell renderer.
  */
-public final class AddOptionCellRenderer extends DefaultListCellRenderer {
+public final class AddOptionCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
     /** Parent settings panel. */
@@ -49,24 +45,20 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
      * Creates a new add option cell renderer.
      *
      * @param settingsPanel Parent settings panel
+     * @param renderer Parent renderer
      */
-    public AddOptionCellRenderer(final SettingsPanel settingsPanel) {
-        super();
+    public AddOptionCellRenderer(final SettingsPanel settingsPanel,
+            final ListCellRenderer renderer) {
+        super(renderer);
 
         this.settingsPanel = settingsPanel;
     }
 
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(
-            final JList list,
-            final Object value,
-            final int index,
-            final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
-
         final PreferencesSetting setting;
         if (value instanceof JComponent) {
             setting = settingsPanel.getSettingForComponent((JComponent) value);
@@ -74,11 +66,9 @@ public final class AddOptionCellRenderer extends DefaultListCellRenderer {
             setting = null;
         }
         if (setting == null) {
-           setText((String) value);
+           label.setText((String) value);
         } else {
-            setText(setting.getTitle());
+            label.setText(setting.getTitle());
         }
-
-        return this;
     }
 }

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

@@ -25,16 +25,14 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.Icon;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Renderer for Certificate chain entries, shows the verified icon and name.
  */
-public class CertificateChainEntryCellRenderer extends DefaultListCellRenderer {
+public class CertificateChainEntryCellRenderer extends DMDircListCellRenderer {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
@@ -50,7 +48,9 @@ public class CertificateChainEntryCellRenderer extends DefaultListCellRenderer {
      *
      * @param iconManager Icon manager
      */
-    public CertificateChainEntryCellRenderer(final IconManager iconManager) {
+    public CertificateChainEntryCellRenderer(final IconManager iconManager,
+            final ListCellRenderer renderer) {
+        super(renderer);
         icon = iconManager.getIcon("nothing");
         trustedIcon = iconManager.getIcon("tick");
         invalidIcon = iconManager.getIcon("cross");
@@ -58,23 +58,20 @@ public class CertificateChainEntryCellRenderer extends DefaultListCellRenderer {
 
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
         if (value instanceof CertificateChainEntry) {
             final CertificateChainEntry entry = (CertificateChainEntry) value;
 
-            setText(entry.getName());
+            label.setText(entry.getName());
             if (entry.isInvalid()) {
-                setIcon(invalidIcon);
+                label.setIcon(invalidIcon);
             } else if (entry.isTrusted()) {
-                setIcon(trustedIcon);
+                label.setIcon(trustedIcon);
             } else {
-                setIcon(icon);
+                label.setIcon(icon);
             }
         }
-        return this;
     }
 }

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

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * 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.renderers;
+
+import java.awt.Component;
+
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Simplifies implementing a cell renderer, works around oddities in look and
+ * feels.
+ */
+@RequiredArgsConstructor(callSuper = false)
+public abstract class DMDircListCellRenderer implements ListCellRenderer {
+
+    /**
+     * A version number for this class.
+     */
+    private static final long serialVersionUID = 1;
+    /**
+     * Parent cell renderer.
+     */
+    private final ListCellRenderer parentRenderer;
+    /**
+     * Label to use if parent doesn't supply one.
+     */
+    private JLabel label;
+
+    /**
+     * Renders the cell on the given label.
+     *
+     * @param label Label to render
+     * @param value Object to render
+     * @param index Index of the cell in the list
+     * @param isSelected Is the cell selected
+     * @param hasFocus Does the cell have focus
+     */
+    protected abstract void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected, final boolean hasFocus);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Component getListCellRendererComponent(final JList list,
+            final Object value, final int index, final boolean isSelected,
+            final boolean cellHasFocus) {
+        final Component component = parentRenderer.getListCellRendererComponent(
+                list, value, index, isSelected,
+                cellHasFocus);
+        if (component instanceof JLabel) {
+            renderValue((JLabel) component, value, index, isSelected, cellHasFocus);
+            return component;
+        } else {
+            if (label == null) {
+                label = new JLabel();
+            }
+            renderValue(label, value, index, isSelected, cellHasFocus);
+            return label;
+        }
+    }
+}

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

@@ -21,41 +21,40 @@
  */
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import java.awt.Component;
 import java.awt.Font;
 
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Font list cell renderer.
  */
-public class FontListCellRenderer extends DefaultListCellRenderer {
+public class FontListCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
+
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
      */
-    private static final long serialVersionUID = -3559254527228184993L;
+    public FontListCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
 
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
         if (value == null) {
-            setText("Default");
+            label.setText("Default");
         } else if (value instanceof Font) {
-            setFont((Font) value);
-            setText(((Font) value).getFamily());
+            label.setFont((Font) value);
+            label.setText(((Font) value).getFamily());
         } else {
-            setText(value.toString());
+            label.setText(value.toString());
         }
-
-        return this;
     }
 }

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

@@ -24,36 +24,37 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.parser.common.ChannelListModeItem;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /** List mode cell renderer. */
-public class ListModeCellRenderer extends DefaultListCellRenderer {
+public class ListModeCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ListModeCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
         if (value == null) {
-            setText("");
+            label.setText("");
         } else if (value instanceof ChannelListModeItem) {
-            setText(((ChannelListModeItem) value).getItem());
+            label.setText(((ChannelListModeItem) value).getItem());
         } else {
-            setText(value.toString());
+            label.setText(value.toString());
         }
-
-        return this;
     }
 }

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

@@ -22,60 +22,35 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
-import java.awt.Component;
 import java.util.Map.Entry;
 
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 
 /**
- * Map entry renderer.
+ *  Renders a map entry as its value.
  */
-public final class MapEntryRenderer extends DefaultListCellRenderer {
+public final class MapEntryRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
-    /** Current list cell renderer. */
-    private final ListCellRenderer renderer;
-    /** Renderer cast to JLabel. */
-    private final JLabel label;
 
     /**
-     * Creates a new map entry renderer. Renders a map entry as its value.
+     * Creates a new instance of this renderer.
      *
-     * @param renderer Renderer
+     * @param renderer RendereParent renderer
      */
     public MapEntryRenderer(final ListCellRenderer renderer) {
-        /*
-         * All List cell renderers in Swing are JLabels, as checked by asserts
-         * in odd UI delegates.  Check and cast here to access nice convenience
-         * methods of a jabel, if not create a jabel and return that as the
-         * component.  This is mainly a workaround for look and feel's based on
-         * synth and add their own rendering.
-         */
-        if (renderer instanceof JLabel) {
-            this.label = (JLabel) renderer;
-        } else {
-            this.label = new JLabel();
-        }
-        this.renderer = renderer;
+        super(renderer);
     }
 
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-
-        renderer.getListCellRendererComponent(
-                list, value, index, isSelected,
-                cellHasFocus);
         if (value == null) {
             label.setText("Any");
         } else if (value instanceof Entry) {
@@ -83,7 +58,5 @@ public final class MapEntryRenderer extends DefaultListCellRenderer {
         } else {
             label.setText(value.toString());
         }
-
-        return label;
     }
 }

src/com/dmdirc/addons/ui_swing/components/performpanel/PerformRenderer.java → src/com/dmdirc/addons/ui_swing/components/renderers/PerformRenderer.java

@@ -20,36 +20,40 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components.performpanel;
+package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 
-import java.awt.Component;
 
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /**
  * Custom renderer for PerformDescriptions.
  *
- * @author Simon Mott
  * @since 0.6.4
  */
-public class PerformRenderer extends DefaultListCellRenderer {
+public class PerformRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public PerformRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-
         final PerformDescription perform = (PerformDescription) value;
         final String target = perform.getTarget();
         final String profile = perform.getProfile();
@@ -61,9 +65,7 @@ public class PerformRenderer extends DefaultListCellRenderer {
         } else {
             friendlyText += "Any profile";
         }
-
-        return super.getListCellRendererComponent(list, friendlyText, index,
-                isSelected, cellHasFocus);
+        label.setText(friendlyText);
     }
 
 }

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

@@ -24,35 +24,35 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.addons.ui_swing.dialogs.profiles.Profile;
 
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
+import javax.swing.JLabel;
+import javax.swing.ListCellRenderer;
 
 /** Profile list renderer. */
-public class ProfileListCellRenderer extends DefaultListCellRenderer {
+public class ProfileListCellRenderer extends DMDircListCellRenderer {
 
     /**
-     * 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).
+     * A version number for this class.
      */
     private static final long serialVersionUID = 1;
 
+    /**
+     * Creates a new instance of this renderer.
+     *
+     * @param renderer RendereParent renderer
+     */
+    public ProfileListCellRenderer(final ListCellRenderer renderer) {
+        super(renderer);
+    }
+
     /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    protected void renderValue(final JLabel label, final Object value,
+            final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        super.getListCellRendererComponent(list, value, index, isSelected,
-                cellHasFocus);
-
         if (!(value instanceof Profile)) {
-            setText("");
+            label.setText("");
         } else {
-            setText(((Profile) value).getName());
+            label.setText(((Profile) value).getName());
         }
-
-        return this;
     }
 }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionEditorPanel.java

@@ -133,9 +133,9 @@ public class ActionConditionEditorPanel extends JPanel implements
             }
         };
 
-        arguments.setRenderer(new ActionCellRenderer());
-        components.setRenderer(new ActionCellRenderer());
-        comparisons.setRenderer(new ActionCellRenderer());
+        arguments.setRenderer(new ActionCellRenderer(arguments.getRenderer()));
+        components.setRenderer(new ActionCellRenderer(components.getRenderer()));
+        comparisons.setRenderer(new ActionCellRenderer(comparisons.getRenderer()));
 
         components.setEnabled(false);
         comparisons.setEnabled(false);

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

@@ -99,14 +99,14 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         // Only fire events on selection not on highlight
         triggerGroup.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
-        triggerGroup.setRenderer(new ActionTypeRenderer());
+        triggerGroup.setRenderer(new ActionTypeRenderer(triggerGroup.getRenderer()));
         triggerGroup.addPopupMenuListener(new ComboBoxWidthModifier());
 
         triggerItem = new JComboBox(new DefaultComboBoxModel());
         // Only fire events on selection not on highlight
         triggerItem.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
-        triggerItem.setRenderer(new ActionTypeRenderer());
+        triggerItem.setRenderer(new ActionTypeRenderer(triggerItem.getRenderer()));
         triggerItem.addPopupMenuListener(new ComboBoxWidthModifier());
 
         triggerList = new ActionTriggersListPanel(iconManager);

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -152,7 +152,8 @@ public final class ActionsManagerDialog extends StandardDialog implements
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Actions"));
 
-        groups.setCellRenderer(new ActionGroupListCellRenderer());
+        groups.setCellRenderer(new ActionGroupListCellRenderer(
+                groups.getCellRenderer()));
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         edit.setEnabled(false);
         delete.setEnabled(false);

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasPanel.java

@@ -99,7 +99,8 @@ public final class AliasPanel extends JPanel implements ActionListener {
         argumentNumber.setEnabled(false);
         response.setRows(5);
 
-        argumentComponent.setRenderer(new ActionComparisonCellRenderer());
+        argumentComponent.setRenderer(new ActionComparisonCellRenderer(
+                argumentComponent.getRenderer()));
         argumentComponent.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
         argumentComponent.addActionListener(this);

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -94,8 +94,12 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private final Window parentWindow;
     /** Swing controller. */
     private final SwingController controller;
+    /** Native cell renderer. */
+    private final ListCellRenderer nativeRenderer;
     /** Cell renderer. */
     private ListCellRenderer renderer;
+    /** Mode list. */
+    private JList list;
 
     /**
      * Creates a new instance of ChannelListModePane.
@@ -113,11 +117,13 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         this.channel = channel;
         this.parentWindow = parentWindow;
 
+        list = new JList();
+        nativeRenderer = list.getCellRenderer();
         if (channel.getConfigManager().getOptionBool("general",
                 "extendedListModes")) {
             renderer = new ExtendedListModeCellRenderer();
         } else {
-            renderer = new ListModeCellRenderer();
+            renderer = new ListModeCellRenderer(nativeRenderer);
         }
         listModesPanel = new JScrollPane();
         listModesPanels = new ArrayList<JList>();
@@ -185,8 +191,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             }
             model.addElement(modeText);
 
-            final JList list =
-                    new JList(new DefaultListModel());
+            list = new JList(new DefaultListModel());
             list.setCellRenderer(renderer);
             list.setVisibleRowCount(8);
             list.addListSelectionListener(this);
@@ -351,7 +356,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             if (toggle.isSelected()) {
                 renderer = new ExtendedListModeCellRenderer();
             } else {
-                renderer = new ListModeCellRenderer();
+                renderer = new ListModeCellRenderer(nativeRenderer);
             }
             for (JList list : listModesPanels) {
                 list.setCellRenderer(renderer);
@@ -403,7 +408,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     public void configChanged(final String domain, final String key) {
         if (controller.getGlobalConfig().getOptionBool("general",
                 "extendedListModes")) {
-            renderer = new ListModeCellRenderer();
+            renderer = new ListModeCellRenderer(nativeRenderer);
         } else {
             renderer = new ExtendedListModeCellRenderer();
         }

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java

@@ -143,7 +143,8 @@ public class ProfileManagerDialog extends StandardDialog {
     private void initComponents() {
         profileList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         nicknames.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        profileList.setCellRenderer(new ProfileListCellRenderer());
+        profileList.setCellRenderer(new ProfileListCellRenderer(
+                profileList.getCellRenderer()));
 
         setLayout(new MigLayout("fill, wmin 700, wmax 700, flowy"));
 

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/PerformTab.java

@@ -28,7 +28,7 @@ import com.dmdirc.actions.wrappers.PerformWrapper.PerformDescription;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.performpanel.PerformPanel;
-import com.dmdirc.addons.ui_swing.components.performpanel.PerformRenderer;
+import com.dmdirc.addons.ui_swing.components.renderers.PerformRenderer;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -100,7 +100,7 @@ public final class PerformTab extends JPanel implements ActionListener {
         model.addElement(serverPerform);
         model.addElement(serverProfilePerform);
 
-        target.setRenderer(new PerformRenderer());
+        target.setRenderer(new PerformRenderer(target.getRenderer()));
 
         performList.add(networkPerform);
         performList.add(networkProfilePerform);

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/CertificateChainPanel.java

@@ -69,7 +69,8 @@ public class CertificateChainPanel extends JPanel {
     private void initComponents() {
         model = new DefaultListModel();
         list = new JList(model);
-        list.setCellRenderer(new CertificateChainEntryCellRenderer(iconManager));
+        list.setCellRenderer(new CertificateChainEntryCellRenderer(iconManager,
+                list.getCellRenderer()));
         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         ListScroller.register(list);
     }