Tidy up action editor

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

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

@@ -30,7 +30,7 @@ import javax.swing.ListCellRenderer;
 /**
  * Displays actions types and headers in a pretty fashion.
  */
-public final class ActionTypeRenderer extends DMDircListCellRenderer {
+public final class ActionTypeRenderer extends DMDircListCellRenderer<Object> {
 
     /**
      * A version number for this class.
@@ -42,11 +42,10 @@ public final class ActionTypeRenderer extends DMDircListCellRenderer {
      *
      * @param renderer RendereParent renderer
      */
-    public ActionTypeRenderer(final ListCellRenderer renderer) {
+    public ActionTypeRenderer(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/dialogs/actioneditor/ActionResponsePanel.java

@@ -50,7 +50,7 @@ public class ActionResponsePanel extends JPanel {
     /** Response text area. */
     private JTextArea response;
     /** Formatter combo box. */
-    private JComboBox formatter;
+    private JComboBox<String> formatter;
     /** Response scrollpane. */
     private JScrollPane scrollPane;
 
@@ -77,20 +77,19 @@ public class ActionResponsePanel extends JPanel {
         response = new TextAreaInputField(iconManager, config, "");
         scrollPane = new JScrollPane(response);
         response.setRows(4);
-        //new SwingInputHandler(response, GlobalCommandParser
-        //        .getGlobalCommandParser(), inputWindow)
-        //        .setTypes(false, false, true,false);
-        formatter = new JComboBox(new DefaultComboBoxModel());
+        formatter = new JComboBox<>(new DefaultComboBoxModel<String>());
 
-        ((DefaultComboBoxModel) formatter.getModel()).addElement("No change");
-        ((DefaultComboBoxModel) formatter.getModel()).addElement("No response");
+        final DefaultComboBoxModel<String> model = (DefaultComboBoxModel<String>) formatter.
+                getModel();
+        model.addElement("No change");
+        model.addElement("No response");
 
         final TreeSet<String> formatters = new TreeSet<>(
                 String.CASE_INSENSITIVE_ORDER);
         formatters.addAll(config.getOptions("formatter").keySet());
 
         for (final String format : formatters) {
-            ((DefaultComboBoxModel) formatter.getModel()).addElement(format);
+            model.addElement(format);
         }
     }
 

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

@@ -61,9 +61,9 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
      */
     private static final long serialVersionUID = 1;
     /** Trigger combo box. */
-    private JComboBox triggerGroup;
+    private JComboBox<Object> triggerGroup;
     /** Trigger combo box. */
-    private JComboBox triggerItem;
+    private JComboBox<Object> triggerItem;
     /** Triggers list. */
     private ActionTriggersListPanel triggerList;
     /** Are we internally changing the combo boxes? */
@@ -95,14 +95,14 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Triggers"));
 
-        triggerGroup = new JComboBox(new DefaultComboBoxModel());
+        triggerGroup = new JComboBox<>(new DefaultComboBoxModel<>());
         // Only fire events on selection not on highlight
         triggerGroup.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
         triggerGroup.setRenderer(new ActionTypeRenderer(triggerGroup.getRenderer()));
         triggerGroup.addPopupMenuListener(new ComboBoxWidthModifier());
 
-        triggerItem = new JComboBox(new DefaultComboBoxModel());
+        triggerItem = new JComboBox<>(new DefaultComboBoxModel<>());
         // Only fire events on selection not on highlight
         triggerItem.putClientProperty("JComboBox.isTableCellEditor",
                 Boolean.TRUE);
@@ -209,12 +209,13 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
     private void addAll(final MapList<String, ActionType> mapList) {
         comboChange = true;
         compatibleTriggers.clear();
-        ((DefaultComboBoxModel) triggerGroup.getModel()).removeAllElements();
-        ((DefaultComboBoxModel) triggerItem.getModel()).removeAllElements();
+        final DefaultComboBoxModel<Object> triggerModel
+                = (DefaultComboBoxModel<Object>) triggerGroup.getModel();
+        triggerModel.removeAllElements();
+        ((DefaultComboBoxModel<Object>) triggerItem.getModel()).removeAllElements();
         for (final Map.Entry<String, List<ActionType>> entry : mapList
                 .entrySet()) {
-            ((DefaultComboBoxModel) triggerGroup.getModel())
-                    .addElement(entry.getKey());
+            triggerModel.addElement(entry.getKey());
         }
         triggerGroup.setSelectedIndex(-1);
         triggerGroup.setEnabled(triggerGroup.getModel().getSize() > 0);
@@ -228,8 +229,10 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
      * @param primaryType Primary type
      */
     private void addCompatible(final ActionType primaryType) {
-        final DefaultComboBoxModel groupModel = (DefaultComboBoxModel) triggerGroup.getModel();
-        final DefaultComboBoxModel itemModel = (DefaultComboBoxModel) triggerItem.getModel();
+        final DefaultComboBoxModel<Object> groupModel = (DefaultComboBoxModel<Object>) triggerGroup.
+                getModel();
+        final DefaultComboBoxModel<Object> itemModel = (DefaultComboBoxModel<Object>) triggerItem.
+                getModel();
 
         comboChange = true;
         compatibleTriggers.clear();
@@ -275,8 +278,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
         for (final ActionType entry : list) {
             if (compatibleTriggers.isEmpty()
                     || compatibleTriggers.contains(entry)) {
-                ((DefaultComboBoxModel) triggerItem.getModel())
-                        .addElement(entry);
+                ((DefaultComboBoxModel<Object>) triggerItem.getModel()).addElement(entry);
             }
         }
         triggerItem.setSelectedIndex(-1);

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

@@ -38,18 +38,14 @@ import javax.swing.SwingUtilities;
  * Model for the "trigger" list of the actions editor. Adds type group headers, and ensures they
  * can't be selected.
  */
-public final class ActionTypeModel extends DefaultComboBoxModel {
+public final class ActionTypeModel extends DefaultComboBoxModel<Object> {
 
-    /**
-     * 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;
+    /** Font metrics. */
+    private final FontMetrics fm;
     /** Max Width. */
     private int maxWidth = -1;
-    /** Font metrics. */
-    private FontMetrics fm;
 
     /**
      * Creates a new instance of ActionTypeModel.
@@ -77,7 +73,7 @@ public final class ActionTypeModel extends DefaultComboBoxModel {
     /**
      * {@inheritDoc}
      *
-     * @param anObject Objerct to add
+     * @param anObject Object to add
      */
     @Override
     public void addElement(final Object anObject) {

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

@@ -44,7 +44,7 @@ public class StringTransferable implements Transferable {
     /**
      * Creates a new string transferable object.
      *
-     * @param data String to transger
+     * @param data String to transfer
      */
     public StringTransferable(final String data) {
         super();