Add generics to some models.

ui_swing/src/com/dmdirc/addons/ui_swing/ComboBoxWidthModifier.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import java.awt.Container;
 import java.awt.Dimension;
 
 import javax.swing.JComboBox;
@@ -37,12 +38,12 @@ public class ComboBoxWidthModifier implements PopupMenuListener {
 
     @Override
     public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
-        final JComboBox<?> box = (JComboBox) e.getSource();
+        final JComboBox<?> box = (JComboBox<?>) e.getSource();
         final Object comp = box.getUI().getAccessibleChild(box, 0);
         if (!(comp instanceof JPopupMenu)) {
             return;
         }
-        final JComponent scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(0);
+        final JComponent scrollPane = (JComponent) ((Container) comp).getComponent(0);
         final Dimension size = new Dimension(box.getPreferredSize().width,
                 scrollPane.getPreferredSize().height);
         scrollPane.setPreferredSize(size);

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

@@ -35,6 +35,7 @@ import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.MutableComboBoxModel;
 
 import net.miginfocom.swing.MigLayout;
 
@@ -115,7 +116,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      * @param setting Setting to add
      */
     protected void addOption(final JComponent setting) {
-        ((DefaultComboBoxModel<Object>) addOptionComboBox.getModel()).addElement(setting);
+        ((MutableComboBoxModel<Object>) addOptionComboBox.getModel()).addElement(setting);
         addOptionButton.setEnabled(true);
         addOptionComboBox.setEnabled(true);
     }
@@ -126,8 +127,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
      * @param setting Setting to add
      */
     protected void delOption(final JComponent setting) {
-        ((DefaultComboBoxModel) addOptionComboBox.getModel())
-                .removeElement(setting);
+        ((MutableComboBoxModel<Object>) addOptionComboBox.getModel()).removeElement(setting);
         if (addOptionComboBox.getModel().getSize() == 0) {
             addOptionComboBox.setEnabled(false);
             addOptionButton.setEnabled(false);
@@ -165,7 +165,7 @@ public class AddOptionPanel extends JPanel implements ActionListener {
                 addOptionComboBox.setEnabled(false);
                 addOptionButton.setEnabled(false);
             }
-            switchInputField(((JComponent) addOptionComboBox.getSelectedItem()));
+            switchInputField((JComponent) addOptionComboBox.getSelectedItem());
         } else if (e.getSource() == addOptionButton) {
             parent.addCurrentOption((JComponent) addOptionComboBox.getSelectedItem());
             delOption((JComponent) addOptionComboBox.getSelectedItem());

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

@@ -262,7 +262,7 @@ public class ActionTriggersPanel extends JPanel implements ActionListener,
      */
     private void addList(final List<ActionType> list) {
         comboChange = true;
-        ((DefaultComboBoxModel) triggerItem.getModel()).removeAllElements();
+        ((DefaultComboBoxModel<Object>) triggerItem.getModel()).removeAllElements();
         Collections.sort(list, new ActionTypeComparator());
         for (final ActionType entry : list) {
             if (compatibleTriggers.isEmpty()

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

@@ -256,7 +256,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      * @param selectedGroup Newly selected group
      */
     private void reloadGroups(final ActionGroup selectedGroup) {
-        ((DefaultListModel) groups.getModel()).clear();
+        ((DefaultListModel<ActionGroup>) groups.getModel()).clear();
         for (ActionGroup group : ActionManager.getActionManager().getGroupsMap().values()) {
             ((DefaultListModel<ActionGroup>) groups.getModel()).addElement(group);
         }
@@ -374,7 +374,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         new StandardQuestionDialog(this, ModalityType.APPLICATION_MODAL, "Confirm deletion",
                 "Are you sure you wish to delete the '" + group +
                         "' group and all actions within it?", () -> {
-            int location = ((DefaultListModel) groups.getModel())
+            int location = ((DefaultListModel<ActionGroup>) groups.getModel())
                     .indexOf(ActionManager.getActionManager().getOrCreateGroup(group));
             ActionManager.getActionManager().deleteGroup(group);
             reloadGroups();

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

@@ -56,6 +56,7 @@ import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.ListCellRenderer;
+import javax.swing.MutableComboBoxModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
@@ -188,7 +189,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             addListModeButton.setEnabled(true);
         }
 
-        final DefaultComboBoxModel<String> model = (DefaultComboBoxModel<String>) listModesMenu.
+        final MutableComboBoxModel<String> model = (MutableComboBoxModel<String>) listModesMenu.
                 getModel();
         for (char mode : listModesArray) {
             String modeText = mode + " list";
@@ -249,8 +250,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         for (int i = 0; i < listModesArray.length;
                 i++) {
             final char mode = listModesArray[i];
-            final Enumeration<?> values = ((DefaultListModel) listModesPanels.get(i).getModel()).
-                    elements();
+            final Enumeration<?> values = ((DefaultListModel<ChannelListModeItem>) listModesPanels
+                    .get(i).getModel()).elements();
             final List<ChannelListModeItem> listItems = existingListItems.get(mode);
 
             for (ChannelListModeItem listItem : listItems) {
@@ -306,7 +307,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         final int selectedIndex = listModesMenu.getSelectedIndex();
         final JList<ChannelListModeItem> removeList = listModesPanels.get(selectedIndex);
         for (ChannelListModeItem mode : removeList.getSelectedValuesList()) {
-            ((DefaultListModel) removeList.getModel()).removeElement(mode);
+            ((DefaultListModel<ChannelListModeItem>) removeList.getModel()).removeElement(mode);
         }
         updateModeCount();
     }
@@ -338,7 +339,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     @Override
     public void valueChanged(final ListSelectionEvent event) {
         if (!event.getValueIsAdjusting()) {
-            final int selected = ((JList) event.getSource()).getSelectedIndex();
+            final int selected = ((JList<?>) event.getSource()).getSelectedIndex();
             if (selected == -1) {
                 removeListModeButton.setEnabled(false);
             } else {

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

@@ -41,8 +41,6 @@ import com.dmdirc.ui.IconManager;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
@@ -53,6 +51,7 @@ import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.ListSelectionModel;
+import javax.swing.ScrollPaneConstants;
 import javax.swing.WindowConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -151,7 +150,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private void setPrefsManager(final PreferencesDialogModel manager) {
         this.manager = manager;
 
-        ((DefaultListModel) tabList.getModel()).clear();
+        ((DefaultListModel<PreferencesCategory>) tabList.getModel()).clear();
         mainPanel.setCategory(null);
 
         final int count = countCategories(manager.getCategories());
@@ -172,7 +171,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         ListScroller.register(tabList);
         final JScrollPane tabListScrollPane = new JScrollPane(tabList);
         tabListScrollPane.setHorizontalScrollBarPolicy(
-                JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
         setTitle("Preferences");
@@ -185,9 +184,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         getOkButton().addActionListener(this);
         getCancelButton().addActionListener(this);
 
-        final MigLayout layout
-                = new MigLayout("pack, hmin min(80sp, 700), " + "hmax min(700, 80sp)");
-        setLayout(layout);
+        setLayout(new MigLayout("pack, hmin min(80sp, 700), " + "hmax min(700, 80sp)"));
         add(tabListScrollPane, "w 150!, growy, pushy");
         add(mainPanel, "wrap, w 480!, pushy, growy, pushy");
         add(getLeftButton(), "span, split, right");
@@ -197,7 +194,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /**
      * Adds the categories from the preferences manager, clearing existing categories first.
      */
-    private void addCategories(final List<PreferencesCategory> categories) {
+    private void addCategories(final Iterable<PreferencesCategory> categories) {
         UIUtilities.invokeLater(() -> {
             tabList.removeListSelectionListener(this);
             for (PreferencesCategory category : categories) {
@@ -222,8 +219,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      *
      * @since 0.6.3m1rc3
      */
-    protected int countCategories(
-            final Collection<PreferencesCategory> categories) {
+    private int countCategories(final Iterable<PreferencesCategory> categories) {
         int count = 0;
 
         for (PreferencesCategory cat : categories) {
@@ -297,7 +293,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
 
     @Override
     public void dispose() {
-        synchronized (SwingPreferencesDialog.this) {
+        synchronized (this) {
             if (!worker.isDone()) {
                 worker.cancel(true);
             }

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

@@ -81,7 +81,7 @@ public class ProfileManagerDialogLinker {
         });
         listModel.addListSelectionListener(e -> model.setSelectedProfile(list.getSelectedValue()));
         model.addPropertyChangeListener("profiles", evt -> {
-            ((DefaultListModel) list.getModel()).clear();
+            ((DefaultListModel<Profile>) list.getModel()).clear();
             for (Profile profile : model.getProfiles()) {
                 ((DefaultListModel<Profile>) list.getModel()).addElement(profile);
             }

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

@@ -141,7 +141,7 @@ public class PerformTab extends JPanel implements ActionListener {
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final PerformDescription perform = (PerformDescription) ((JComboBox) e.getSource()).
+        final PerformDescription perform = (PerformDescription) ((JComboBox<?>) e.getSource()).
                 getSelectedItem();
         performPanel.switchPerform(perform);
     }