Remove some warnings

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

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryLabel.java

@@ -45,7 +45,7 @@ public class CategoryLabel extends JLabel {
     /** Panel gap. */
     private final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX("related").getValue());
     /** Parent list. */
-    private final JList parentList;
+    private final JList<? extends PreferencesCategory> parentList;
 
     /**
      * Creates a new category label.
@@ -57,7 +57,7 @@ public class CategoryLabel extends JLabel {
      * @param index       Index of this label
      */
     public CategoryLabel(final IconManager iconManager,
-            final JList parentList,
+            final JList<? extends PreferencesCategory> parentList,
             final PreferencesCategory category, final int numCats,
             final int index) {
         super();

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PreferencesListCellRenderer.java

@@ -36,16 +36,11 @@ import javax.swing.ListCellRenderer;
 
 /**
  * Prefs dialog list cell renderer.
- *
- * @since 0.6.3m1
  */
-public class PreferencesListCellRenderer extends JLabel implements ListCellRenderer {
+public class PreferencesListCellRenderer extends JLabel implements
+        ListCellRenderer<PreferencesCategory> {
 
-    /**
-     * 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;
     /** Number of categories shown. */
     private final int numCats;
@@ -67,17 +62,15 @@ public class PreferencesListCellRenderer extends JLabel implements ListCellRende
         this.iconManager = iconManager;
     }
 
-    /** {@inheritDoc} */
     @Override
-    public Component getListCellRendererComponent(final JList list,
-            final Object value, final int index, final boolean isSelected,
+    public Component getListCellRendererComponent(final JList<? extends PreferencesCategory> list,
+            final PreferencesCategory value, final int index, final boolean isSelected,
             final boolean cellHasFocus) {
-        final PreferencesCategory cat = (PreferencesCategory) value;
-        if (!labelMap.containsKey(cat)) {
-            labelMap.put(cat, new CategoryLabel(iconManager,
-                    list, cat, numCats, index));
+        if (!labelMap.containsKey(value)) {
+            labelMap.put(value, new CategoryLabel(iconManager,
+                    list, value, numCats, index));
         }
-        final JLabel label = labelMap.get(cat);
+        final JLabel label = labelMap.get(value);
 
         if (isSelected) {
             label.setFont(getFont().deriveFont(Font.BOLD));

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -66,7 +66,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Serial version UID. */
     private static final long serialVersionUID = 9;
     /** Preferences tab list, used to switch option types. */
-    private JList tabList;
+    private JList<PreferencesCategory> tabList;
     /** Main panel. */
     private CategoryPanel mainPanel;
     /** Previously selected category. */
@@ -161,7 +161,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private void initComponents() {
         mainPanel = categoryPanelProvider.get();
 
-        tabList = new JList(new DefaultListModel());
+        tabList = new JList<>(new DefaultListModel<PreferencesCategory>());
         tabList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         tabList.addListSelectionListener(this);
         ListScroller.register(tabList);
@@ -199,7 +199,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 tabList.removeListSelectionListener(SwingPreferencesDialog.this);
                 for (PreferencesCategory category : categories) {
                     if (!category.isInline()) {
-                        ((DefaultListModel) tabList.getModel()).addElement(
+                        ((DefaultListModel<PreferencesCategory>) tabList.getModel()).addElement(
                                 category);
                     }
                     addCategories(category.getSubcats());
@@ -233,11 +233,6 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         return count;
     }
 
-    /**
-     * Handles the actions for the dialog.
-     *
-     * @param actionEvent Action event
-     */
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (selected != null) {
@@ -262,19 +257,12 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         dispose();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e List selection event
-     *
-     * @since 0.6.3m1
-     */
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         if (!e.getValueIsAdjusting()) {
             PreferencesCategory node = null;
             try {
-                node = (PreferencesCategory) tabList.getSelectedValue();
+                node = tabList.getSelectedValue();
             } catch (ArrayIndexOutOfBoundsException ex) {
                 //I hate the JVM
             }