Remove warnings in actions and aliases

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

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

@@ -31,13 +31,9 @@ import javax.swing.DefaultListModel;
  *
  * @param <T> Comparator type
  */
-public class SortedListModel<T> extends DefaultListModel {
+public class SortedListModel<T> extends DefaultListModel<T> {
 
-    /**
-     * 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 = 1L;
     /** Comparator. */
     private final Comparator<T> comparator;
@@ -53,15 +49,12 @@ public class SortedListModel<T> extends DefaultListModel {
         this.comparator = comparator;
     }
 
-    /** {@inheritDoc} */
     @Override
-    @SuppressWarnings("unchecked")
-    public void addElement(final Object obj) {
-        final T object = (T) obj;
+    public void addElement(final T obj) {
         boolean added = false;
         for (int i = 0; i < getSize(); i++) {
-            final T currentObj = (T) getElementAt(i);
-            if (comparator.compare(currentObj, object) > 0) {
+            final T currentObj = getElementAt(i);
+            if (comparator.compare(currentObj, obj) > 0) {
                 add(i, obj);
                 added = true;
                 break;

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

@@ -28,9 +28,9 @@ import javax.swing.JLabel;
 import javax.swing.ListCellRenderer;
 
 /**
- * Renders an action comparison in plain english.
+ * Renders an action comparison in plain English.
  */
-public final class ActionComparisonCellRenderer extends DMDircListCellRenderer {
+public final class ActionComparisonCellRenderer extends DMDircListCellRenderer<Object> {
 
     /**
      * A version number for this class.
@@ -42,11 +42,10 @@ public final class ActionComparisonCellRenderer extends DMDircListCellRenderer {
      *
      * @param renderer RendereParent renderer
      */
-    public ActionComparisonCellRenderer(final ListCellRenderer renderer) {
+    public ActionComparisonCellRenderer(final ListCellRenderer<? super 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/ActionGroupListCellRenderer.java

@@ -1,61 +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.actions.ActionGroup;
-
-import javax.swing.JLabel;
-import javax.swing.ListCellRenderer;
-
-/**
- * Action group list cell renderer.
- */
-public class ActionGroupListCellRenderer 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 ActionGroupListCellRenderer(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) {
-        if (value instanceof ActionGroup) {
-            label.setText(((ActionGroup) value).getName());
-        } else {
-            label.setText(value.toString());
-        }
-    }
-
-}

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

@@ -29,9 +29,9 @@ import javax.swing.DefaultListModel;
 import javax.swing.JList;
 
 /**
- * No duplicates list validator, overriden to work with action groups.
+ * No duplicates list validator, overridden to work with action groups.
  */
-class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator {
+class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator<ActionGroup> {
 
     /**
      * Creates a new validator.
@@ -39,8 +39,8 @@ class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator
      * @param list  List
      * @param model Model to validate
      */
-    public ActionGroupNoDuplicatesInListValidator(final JList list,
-            final DefaultListModel model) {
+    public ActionGroupNoDuplicatesInListValidator(final JList<ActionGroup> list,
+            final DefaultListModel<ActionGroup> model) {
         super(true, list, model);
     }
 
@@ -52,7 +52,7 @@ class ActionGroupNoDuplicatesInListValidator extends NoDuplicatesInListValidator
      * @param model         Model to validate
      */
     public ActionGroupNoDuplicatesInListValidator(final boolean caseSensitive,
-            final JList list, final DefaultListModel model) {
+            final JList<ActionGroup> list, final DefaultListModel<ActionGroup> model) {
         super(caseSensitive, list, model);
     }
 

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

@@ -35,7 +35,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.SortedListModel;
 import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
-import com.dmdirc.addons.ui_swing.components.renderers.ActionGroupListCellRenderer;
+import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
@@ -73,11 +73,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         ActionListener, com.dmdirc.interfaces.ActionListener,
         ListSelectionListener {
 
-    /**
-     * 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;
     /** Config instance. */
     private final ConfigProvider config;
@@ -90,7 +86,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     /** Info label. */
     private TextLabel infoLabel;
     /** Group list. */
-    private JList groups;
+    private JList<ActionGroup> groups;
     /** Add button. */
     private JButton add;
     /** Edit button. */
@@ -123,6 +119,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      * @param groupPanelFactory Factory to use to create group panels.
      */
     @Inject
+    @SuppressWarnings("unchecked")
     public ActionsManagerDialog(
             final MainFrame parentWindow,
             final SwingController controller,
@@ -160,7 +157,7 @@ public class ActionsManagerDialog extends StandardDialog implements
                 + " intelligently respond to various events.  Action groups are"
                 + " there for you to organise groups, add or remove them"
                 + " to suit your needs.");
-        groups = new JList(new SortedListModel<>(new ActionGroupNameComparator()));
+        groups = new JList<>(new SortedListModel<>(new ActionGroupNameComparator()));
         actions = groupPanelFactory.getActionsGroupPanel(this, null);
         info = new ActionGroupInformationPanel(null);
         settings = new HashMap<>();
@@ -179,7 +176,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Actions"));
 
-        groups.setCellRenderer(new ActionGroupListCellRenderer(groups.getCellRenderer()));
+        groups.setCellRenderer(new PropertyListCellRenderer<>(groups.getCellRenderer(), ActionGroup.class, "name"));
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         edit.setEnabled(false);
         delete.setEnabled(false);
@@ -256,7 +253,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     private void reloadGroups(final ActionGroup selectedGroup) {
         ((DefaultListModel) groups.getModel()).clear();
         for (ActionGroup group : ActionManager.getActionManager().getGroupsMap().values()) {
-            ((DefaultListModel) groups.getModel()).addElement(group);
+            ((DefaultListModel<ActionGroup>) groups.getModel()).addElement(group);
         }
         groups.setSelectedValue(selectedGroup, true);
     }
@@ -354,8 +351,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      * Prompts then edits an action group.
      */
     private void editGroup() {
-        final String oldName =
-                ((ActionGroup) groups.getSelectedValue()).getName();
+        final String oldName = groups.getSelectedValue().getName();
         final StandardInputDialog inputDialog = new StandardInputDialog(
                 this, ModalityType.DOCUMENT_MODAL, iconManager, "Edit action group",
                 "Please enter the new name of the action group", validator) {
@@ -392,8 +388,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      * Prompts then deletes an action group.
      */
     private void delGroup() {
-        final String group =
-                ((ActionGroup) groups.getSelectedValue()).getName();
+        final String group = groups.getSelectedValue().getName();
         new StandardQuestionDialog(this,
                 ModalityType.APPLICATION_MODAL,
                 "Confirm deletion",
@@ -436,9 +431,8 @@ public class ActionsManagerDialog extends StandardDialog implements
             return;
         }
 
-        changeActiveGroup((ActionGroup) groups.getSelectedValue());
-        if (groups.getSelectedIndex() == -1 || !((ActionGroup) groups.
-                getSelectedValue()).isDelible()) {
+        changeActiveGroup(groups.getSelectedValue());
+        if (groups.getSelectedIndex() == -1 || !groups.getSelectedValue().isDelible()) {
             edit.setEnabled(false);
             delete.setEnabled(false);
         } else {
@@ -457,13 +451,11 @@ public class ActionsManagerDialog extends StandardDialog implements
         if (type.equals(CoreActionType.ACTION_CREATED) || type.equals(
                 CoreActionType.ACTION_UPDATED)) {
             final Action action = (Action) arguments[0];
-            if (action.getGroup().equals(((ActionGroup) groups.getSelectedValue()).
-                    getName())) {
+            if (action.getGroup().equals(groups.getSelectedValue().getName())) {
                 actions.actionChanged(action);
             }
         } else {
-            if (arguments[0].equals(((ActionGroup) groups.getSelectedValue()).
-                    getName())) {
+            if (arguments[0].equals(groups.getSelectedValue().getName())) {
                 actions.actionDeleted((String) arguments[1]);
             }
         }

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

@@ -60,18 +60,14 @@ import net.miginfocom.swing.MigLayout;
  */
 public class AliasPanel 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;
     /** Factory to use when creating aliases. */
     private final ActionFactory actionFactory;
     /** Name field. */
     private final ValidatingTextFieldInputField command;
     /** argument component combo box. */
-    private final JComboBox argumentComponent;
+    private final JComboBox<Object> argumentComponent;
     /** Argument number spinner. */
     private final JSpinner argumentNumber;
     /** Response field. */
@@ -99,20 +95,17 @@ public class AliasPanel extends JPanel implements ActionListener {
 
         this.actionFactory = actionFactory;
 
-        command = new ValidatingTextFieldInputField(
-                iconManager,
-                colourManager,
-                globalConfig,
-                new ValidatorChain<>(
+        @SuppressWarnings("unchecked")
+        final ValidatorChain<String> chain = new ValidatorChain<>(
                 new CommandNameValidator(commandController.getCommandChar()),
-                new FileNameValidator()));
+                new FileNameValidator());
+        command = new ValidatingTextFieldInputField(iconManager, colourManager, globalConfig, chain);
         command.setEnabled(false);
 
-        argumentComponent = new JComboBox(new CoreActionComparison[]{null,
+        argumentComponent = new JComboBox<Object>(new CoreActionComparison[]{null,
             CoreActionComparison.INT_GREATER, CoreActionComparison.INT_EQUALS,
             CoreActionComparison.INT_LESS,});
-        argumentNumber = new JSpinner(new SpinnerNumberModel(0, 0,
-                Integer.MAX_VALUE, 1));
+        argumentNumber = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
         response = new JTextArea();
 
         argumentNumber.setEnabled(false);