Remove warnings from renderers

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

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

@@ -43,16 +43,12 @@ import net.miginfocom.swing.MigLayout;
  */
 public class AddOptionPanel extends JPanel implements ActionListener {
 
-    /**
-     * 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 = 2;
     /** Parent settings panel. */
     private final SettingsPanel parent;
     /** Add options combobox. */
-    private JComboBox addOptionComboBox;
+    private JComboBox<Object> addOptionComboBox;
     /** Add option button. */
     private JButton addOptionButton;
     /** Current add option input. */
@@ -79,7 +75,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
 
     /** Initialises the components. */
     private void initComponents() {
-        addOptionComboBox = new JComboBox(new DefaultComboBoxModel());
+        addOptionComboBox = new JComboBox<>(new DefaultComboBoxModel<>());
         addOptionButton = new JButton("Add");
 
         addOptionComboBox.setRenderer(new AddOptionCellRenderer(parent,
@@ -120,8 +116,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      * @param setting Setting to add
      */
     protected void addOption(final JComponent setting) {
-        ((DefaultComboBoxModel) addOptionComboBox.getModel())
-                .addElement(setting);
+        ((DefaultComboBoxModel<Object>) addOptionComboBox.getModel()).addElement(setting);
         addOptionButton.setEnabled(true);
         addOptionComboBox.setEnabled(true);
     }

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

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2006-2014 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 com.dmdirc.addons.ui_swing.components.substitutions.Substitution;
-
-import javax.swing.JLabel;
-import javax.swing.ListCellRenderer;
-
-/**
- * Displays actions using getName not toString.
- */
-public final class ActionSubstititionRenderer extends DMDircListCellRenderer {
-
-    /**
-     * 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
-    protected void renderValue(final JLabel label, final Object value,
-            final int index, final boolean isSelected,
-            final boolean cellHasFocus) {
-        label.setText(((Substitution) value).getValue());
-    }
-
-}

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

@@ -32,7 +32,7 @@ import javax.swing.ListCellRenderer;
 /**
  * Add option combo box cell renderer.
  */
-public final class AddOptionCellRenderer extends DMDircListCellRenderer {
+public final class AddOptionCellRenderer extends DMDircListCellRenderer<Object> {
 
     /**
      * A version number for this class.
@@ -48,13 +48,12 @@ public final class AddOptionCellRenderer extends DMDircListCellRenderer {
      * @param renderer      Parent renderer
      */
     public AddOptionCellRenderer(final SettingsPanel settingsPanel,
-            final ListCellRenderer renderer) {
+            final ListCellRenderer<? super Object> renderer) {
         super(renderer);
 
         this.settingsPanel = settingsPanel;
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void renderValue(final JLabel label, final Object value,
             final int index, final boolean isSelected,

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

@@ -36,7 +36,6 @@ import javax.swing.table.TableCellRenderer;
  */
 public class AddonCellRenderer implements TableCellRenderer {
 
-    /** {@inheritDoc} */
     @Override
     public Component getTableCellRendererComponent(final JTable table,
             final Object value, final boolean isSelected,

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

@@ -30,21 +30,17 @@ import javax.swing.ListCellRenderer;
 /**
  * Font list cell renderer.
  */
-public class FontListCellRenderer extends DMDircListCellRenderer {
+public class FontListCellRenderer extends DMDircListCellRenderer<Object> {
 
     /**
-     * A version number for this class.
-     *
-     * /**
      * Creates a new instance of this renderer.
      *
      * @param renderer RendereParent renderer
      */
-    public FontListCellRenderer(final ListCellRenderer renderer) {
+    public FontListCellRenderer(final ListCellRenderer<Object> renderer) {
         super(renderer);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void renderValue(final JLabel label, final Object value,
             final int index, final boolean isSelected,

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

@@ -30,7 +30,7 @@ import javax.swing.ListCellRenderer;
 /**
  * Renders a map entry as its value.
  */
-public final class MapEntryRenderer extends DMDircListCellRenderer {
+public final class MapEntryRenderer extends DMDircListCellRenderer<Object> {
 
     /**
      * A version number for this class.
@@ -42,11 +42,10 @@ public final class MapEntryRenderer extends DMDircListCellRenderer {
      *
      * @param renderer RendereParent renderer
      */
-    public MapEntryRenderer(final ListCellRenderer renderer) {
+    public MapEntryRenderer(final ListCellRenderer<Object> renderer) {
         super(renderer);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void renderValue(final JLabel label, final Object value,
             final int index, final boolean isSelected,

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

@@ -41,11 +41,7 @@ import javax.swing.JList;
 public final class NicklistRenderer extends DefaultListCellRenderer implements
         ConfigChangeListener {
 
-    /**
-     * 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 = 5;
     /** Config manager. */
     private final AggregateConfigProvider config;
@@ -54,7 +50,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
     /** Show nick colours. */
     private boolean showColours;
     /** The list that we're using for the nicklist. */
-    private final JList nicklist;
+    private final JList<ChannelClientInfo> nicklist;
     /** Colour manager to use to resolve colours. */
     private final ColourManager colourManager;
 
@@ -67,10 +63,8 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
      */
     public NicklistRenderer(
             final AggregateConfigProvider config,
-            final JList nicklist,
+            final JList<ChannelClientInfo> nicklist,
             final ColourManager colourManager) {
-        super();
-
         this.config = config;
         this.nicklist = nicklist;
         this.colourManager = colourManager;
@@ -81,16 +75,15 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
         config.addChangeListener("ui", "nickListAltBackgroundColour", this);
         altBackgroundColour = UIUtilities.convertColour(
                 colourManager.getColourFromString(
-                config.getOptionString(
-                "ui", "nickListAltBackgroundColour",
-                "ui", "nicklistbackgroundcolour",
-                "ui", "backgroundcolour"), null));
+                        config.getOptionString(
+                                "ui", "nickListAltBackgroundColour",
+                                "ui", "nicklistbackgroundcolour",
+                                "ui", "backgroundcolour"), null));
         showColours = config.getOptionBool("ui", "shownickcoloursinnicklist");
     }
 
-    /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
+    public Component getListCellRendererComponent(final JList<?> list,
             final Object value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
 
@@ -127,10 +120,10 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
         } else {
             altBackgroundColour = UIUtilities.convertColour(
                     colourManager.getColourFromString(
-                    config.getOptionString(
-                    "ui", "nickListAltBackgroundColour",
-                    "ui", "nicklistbackgroundcolour",
-                    "ui", "backgroundcolour"), null));
+                            config.getOptionString(
+                                    "ui", "nickListAltBackgroundColour",
+                                    "ui", "nicklistbackgroundcolour",
+                                    "ui", "backgroundcolour"), null));
         }
         nicklist.repaint();
     }

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

@@ -44,7 +44,6 @@ public class ServerGroupTreeRenderer extends DefaultTreeCellRenderer {
      */
     private static final long serialVersionUID = 1;
 
-    /** {@inheritDoc} */
     @Override
     public Component getTreeCellRendererComponent(final JTree tree,
             final Object value, final boolean sel, final boolean expanded,

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

@@ -41,7 +41,6 @@ public class UpdateComponentTableCellRenderer extends DefaultTableCellRenderer {
      */
     private static final long serialVersionUID = 1;
 
-    /** {@inheritDoc} */
     @Override
     public Component getTableCellRendererComponent(final JTable table,
             final Object value, final boolean isSelected,

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

@@ -41,7 +41,6 @@ public class UpdateStatusTableCellRenderer extends DefaultTableCellRenderer {
      */
     private static final long serialVersionUID = 1;
 
-    /** {@inheritDoc} */
     @Override
     public Component getTableCellRendererComponent(final JTable table,
             final Object value, final boolean isSelected,