Style fixes

Change-Id: Id4892abf0ade56e53771bf3ecae69adb7992cb77
Reviewed-on: http://gerrit.dmdirc.com/1321
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/relaybot/RelayCallbackManager.java

@@ -81,7 +81,6 @@ public class RelayCallbackManager extends IRCCallbackManager implements SocketCl
                 // Get the old callback manager
                 final Field field = o.getClass().getDeclaredField("owner");
                 field.setAccessible(true);
-                @SuppressWarnings("unchecked")
                 final Channel channel = (Channel) field.get(o);
 
                 if (myPlugin.isListening(channel)) {

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

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ServerManager;
-import com.dmdirc.addons.ui_swing.components.MenuBar;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.ui_swing.components.MenuBar;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
@@ -34,20 +34,18 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
 import java.awt.event.ActionEvent;
-
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Field;
 import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationTargetException;
-
 import java.net.URI;
 import java.net.URISyntaxException;
-import javax.swing.UIManager;
+import java.util.ArrayList;
+
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
-
-import java.util.ArrayList;
+import javax.swing.UIManager;
 
 /**
  * Integrate DMDirc with OS X better.

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

@@ -1,19 +1,16 @@
 /*
  * Copyright (c) 2007, Kirill Grouchnikov
  * All rights reserved.
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- *
  * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
+ * this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
  * - Neither the name of the <ORGANIZATION> nor the names of its contributors
- *   may be used to endorse or promote products derived from this software
- *   without specific prior written permission.
- *
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -41,98 +38,108 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 /**
- * Event queue extention to monitor long running tasks on the EDT.  Found at
+ * Event queue extention to monitor long running tasks on the EDT. Found at
  * http://today.java.net/lpt/a/433
  */
-class TracingEventQueueThread extends Thread {
+public class TracingEventQueueThread extends Thread {
 
-    private long thresholdDelay;
-    private Map<AWTEvent, Long> eventTimeMap;
+    private final long thresholdDelay;
+    private final Map<AWTEvent, Long> eventTimeMap;
     private ThreadMXBean threadBean;
     private boolean running = false;
 
     /**
      * Instantiates a new tracing thread.
-     *
-     * @param thresholdDelay Length to consider a long running task
+     * 
+     * @param thresholdDelay
+     *            Length to consider a long running task
      */
-    public TracingEventQueueThread(long thresholdDelay) {
+    public TracingEventQueueThread(final long thresholdDelay) {
         this.thresholdDelay = thresholdDelay;
-        this.eventTimeMap = new HashMap<AWTEvent, Long>();
+        eventTimeMap = new HashMap<AWTEvent, Long>();
 
         try {
-            MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer();
-            ObjectName objName = new ObjectName(
+            final MBeanServer mbeanServer = ManagementFactory
+                    .getPlatformMBeanServer();
+            final ObjectName objName = new ObjectName(
                     ManagementFactory.THREAD_MXBEAN_NAME);
-            Set<ObjectName> mbeans = mbeanServer.queryNames(objName, null);
-            for (ObjectName name : mbeans) {
-                this.threadBean = ManagementFactory.newPlatformMXBeanProxy(
+            final Set<ObjectName> mbeans = mbeanServer
+                    .queryNames(objName, null);
+            for (final ObjectName name : mbeans) {
+                threadBean = ManagementFactory.newPlatformMXBeanProxy(
                         mbeanServer, name.toString(), ThreadMXBean.class);
             }
-        } catch (Exception e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
      * Marks the start time for the specified event.
-     *
-     * @param event Event to monitor
+     * 
+     * @param event
+     *            Event to monitor
      */
-    public synchronized void eventDispatched(AWTEvent event) {
-        this.eventTimeMap.put(event, System.currentTimeMillis());
+    public synchronized void eventDispatched(final AWTEvent event) {
+        eventTimeMap.put(event, System.currentTimeMillis());
     }
 
     /**
      * Marks the end time for the specified event.
-     *
-     * @param event Event to finish monitoring.
+     * 
+     * @param event
+     *            Event to finish monitoring.
      */
-    public synchronized void eventProcessed(AWTEvent event) {
-        this.checkEventTime(event, System.currentTimeMillis(),
-                this.eventTimeMap.get(event));
-        this.eventTimeMap.put(event, null);
+    public synchronized void eventProcessed(final AWTEvent event) {
+        checkEventTime(event, System.currentTimeMillis(), eventTimeMap
+                .get(event));
+        eventTimeMap.put(event, null);
     }
 
-    private void checkEventTime(AWTEvent event, long currTime, long startTime) {
-        long currProcessingTime = currTime - startTime;
-        if (currProcessingTime >= this.thresholdDelay) {
-            System.out.println("Event [" + event.hashCode() + "] " + event.
-                    getClass().getName() + " is taking too much time on EDT (" +
-                    currProcessingTime + ")");
+    private void checkEventTime(final AWTEvent event, final long currTime,
+            final long startTime) {
+        final long currProcessingTime = currTime - startTime;
+        if (currProcessingTime >= thresholdDelay) {
+            System.out.println("Event [" + event.hashCode() + "] "
+                    + event.getClass().getName()
+                    + " is taking too much time on EDT (" + currProcessingTime
+                    + ")");
 
-            if (this.threadBean != null) {
-                long threadIds[] = threadBean.getAllThreadIds();
-                for (long threadId : threadIds) {
-                    ThreadInfo threadInfo = threadBean.getThreadInfo(threadId,
-                            Integer.MAX_VALUE);
-                    if (threadInfo != null && threadInfo.getThreadName().
-                            startsWith("AWT-EventQueue")) {
-                        System.out.println(threadInfo.getThreadName() + " / " +
-                                threadInfo.getThreadState());
-                        StackTraceElement[] stack = threadInfo.getStackTrace();
-                        for (StackTraceElement stackEntry : stack) {
-                            System.out.println("\t" + stackEntry.getClassName() +
-                                    "." + stackEntry.getMethodName() + " [" +
-                                    stackEntry.getLineNumber() + "]");
+            if (threadBean != null) {
+                final long[] threadIds = threadBean.getAllThreadIds();
+                for (final long threadId : threadIds) {
+                    final ThreadInfo threadInfo = threadBean.getThreadInfo(
+                            threadId, Integer.MAX_VALUE);
+                    if (threadInfo != null
+                            && threadInfo.getThreadName().startsWith(
+                                    "AWT-EventQueue")) {
+                        System.out.println(threadInfo.getThreadName() + " / "
+                                + threadInfo.getThreadState());
+                        final StackTraceElement[] stack = threadInfo
+                                .getStackTrace();
+                        for (final StackTraceElement stackEntry : stack) {
+                            System.out.println("\t" + stackEntry.getClassName()
+                                    + "." + stackEntry.getMethodName() + " ["
+                                    + stackEntry.getLineNumber() + "]");
                         }
                     }
                 }
 
-                long[] deadlockedThreads = threadBean.findDeadlockedThreads();
-                if ((deadlockedThreads != null) &&
-                        (deadlockedThreads.length > 0)) {
+                final long[] deadlockedThreads = threadBean
+                        .findDeadlockedThreads();
+                if (deadlockedThreads != null && deadlockedThreads.length > 0) {
                     System.out.println("Deadlocked threads:");
-                    for (long threadId : deadlockedThreads) {
-                        ThreadInfo threadInfo = threadBean.getThreadInfo(
+                    for (final long threadId : deadlockedThreads) {
+                        final ThreadInfo threadInfo = threadBean.getThreadInfo(
                                 threadId, Integer.MAX_VALUE);
-                        System.out.println(threadInfo.getThreadName() + " / " +
-                                threadInfo.getThreadState());
-                        StackTraceElement[] stack = threadInfo.getStackTrace();
-                        for (StackTraceElement stackEntry : stack) {
-                            System.out.println("\t" + stackEntry.getClassName() +
-                                    "." + stackEntry.getMethodName() + " [" +
-                                    stackEntry.getLineNumber() + "]");
+                        System.out.println(threadInfo.getThreadName() + " / "
+                                + threadInfo.getThreadState());
+                        final StackTraceElement[] stack = threadInfo
+                                .getStackTrace();
+                        for (final StackTraceElement stackEntry : stack) {
+                            System.out.println("\t" + stackEntry.getClassName()
+                                    + "." + stackEntry.getMethodName() + " ["
+                                    + stackEntry.getLineNumber() + "]");
                         }
                     }
                 }
@@ -145,21 +152,22 @@ class TracingEventQueueThread extends Thread {
     public void run() {
         running = true;
         while (running) {
-            long currTime = System.currentTimeMillis();
+            final long currTime = System.currentTimeMillis();
             synchronized (this) {
-                for (Map.Entry<AWTEvent, Long> entry : this.eventTimeMap.
-                        entrySet()) {
-                    AWTEvent event = entry.getKey();
+                for (final Map.Entry<AWTEvent, Long> entry : eventTimeMap
+                        .entrySet()) {
+                    final AWTEvent event = entry.getKey();
                     if (entry.getValue() == null) {
                         continue;
                     }
-                    long startTime = entry.getValue();
-                    this.checkEventTime(event, currTime, startTime);
+                    final long startTime = entry.getValue();
+                    checkEventTime(event, currTime, startTime);
                 }
             }
             try {
                 Thread.sleep(100);
-            } catch (InterruptedException ie) {
+            } catch (final InterruptedException ie) {
+                // Ignore
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonTable.java

@@ -79,7 +79,6 @@ public class AddonTable extends JTable {
 
     /** {@inheritDoc} */
     @Override
-    @SuppressWarnings("unchecked")
     public AddonSorter getRowSorter() {
         return (AddonSorter) super.getRowSorter();
     }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/BrowserWindow.java

@@ -41,10 +41,9 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
-
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.table.DefaultTableModel;
+
 import net.miginfocom.swing.MigLayout;
 
 /**
@@ -203,7 +202,9 @@ public class BrowserWindow extends JDialog implements ActionListener {
         try {
             data.read();
         } catch (IOException ex) {
+            //Ignore this
         } catch (InvalidConfigFileException ex) {
+            //Ignore this
         }
 
         list.getModel().setRowCount(0);

src/com/dmdirc/addons/ui_swing/components/colours/ColourPickerPanel.java

@@ -246,9 +246,9 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
      * Retrieves the irc colour beneath the mouse. It is assumed that this
      * method is only called if the mouse is within the irc colour area.
      * @param e The mouse event that triggered this call
-     * @return A colour object representing the colour beneat the mouse
+     * @return A colour object representing the colour beneath the mouse
      */
-    private Color getIrcColour(final MouseEvent e) {
+    private static Color getIrcColour(final MouseEvent e) {
         final int i = (e.getX() - BORDER_SIZE) / IRC_WIDTH;
 
         return ColourManager.getColour(i);
@@ -291,7 +291,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
      * @param value The integer to convert
      * @return A char digit hex string representing the specified integer
      */
-    private String toHex(final int value) {
+    private static String toHex(final int value) {
         final char[] chars = {
             '0', '1', '2', '3', '4', '5', '6', '7',
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
@@ -417,7 +417,7 @@ public final class ColourPickerPanel extends JPanel implements MouseListener,
     @Override
     public void mouseWheelMoved(final MouseWheelEvent e) {
         if (showHex) {
-            saturation = saturation + (e.getWheelRotation() >= 0 ? 0.02f : -0.02f);
+            saturation += e.getWheelRotation() >= 0 ? 0.02f : -0.02f;
 
             if (saturation < 0) {
                 saturation = 0f;

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -49,6 +49,11 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
+    private static final int SECONDS_IN_MINUTE = 60;
+    private static final int HOURS_IN_DAY = 24;
+    private static final int SECONDS_IN_HOURS = 3600;
+    private static final int SECONDS_IN_DAY = 86400;
+    private static final int MAX_DAYS_IN_MONTH = 31;
     /** Days spinner. */
     private JSpinner daysSpinner;
     /** Hours spinner. */
@@ -116,17 +121,17 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      */
     private void initComponents(long duration) {
         orderButtons(new JButton(), new JButton());
-        daysSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 31, 1));
-        hoursSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 24, 1));
-        minutesSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 60, 1));
-        secondsSpinner = new JSpinner(new SpinnerNumberModel(0, 0, 60, 1));
-
-        daysSpinner.setValue((int) duration / 86400);
-        duration = (duration % 86400);
-        hoursSpinner.setValue((int) duration / 3600);
-        duration = (duration % 3600);
-        minutesSpinner.setValue((int) duration / 60);
-        duration = (duration % 60);
+        daysSpinner = new JSpinner(new SpinnerNumberModel(0, 0, MAX_DAYS_IN_MONTH, 1));
+        hoursSpinner = new JSpinner(new SpinnerNumberModel(0, 0, HOURS_IN_DAY, 1));
+        minutesSpinner = new JSpinner(new SpinnerNumberModel(0, 0, SECONDS_IN_MINUTE, 1));
+        secondsSpinner = new JSpinner(new SpinnerNumberModel(0, 0, SECONDS_IN_MINUTE, 1));
+
+        daysSpinner.setValue((int) duration / SECONDS_IN_DAY);
+        duration = (duration % SECONDS_IN_DAY);
+        hoursSpinner.setValue((int) duration / SECONDS_IN_HOURS);
+        duration = (duration % SECONDS_IN_HOURS);
+        minutesSpinner.setValue((int) duration / SECONDS_IN_MINUTE);
+        duration = (duration % SECONDS_IN_MINUTE);
         secondsSpinner.setValue((int) duration);
     }
 
@@ -181,10 +186,9 @@ public class DurationEditor extends StandardDialog implements ActionListener {
         int duration = 0;
 
         duration += ((Number) secondsSpinner.getValue()).intValue();
-        duration += (((Number) minutesSpinner.getValue())).intValue() * 60;
-        duration += (((Number) hoursSpinner.getValue())).intValue() * 60 * 60;
-        duration += (((Number) daysSpinner.getValue())).intValue() * 60 * 60 *
-                24;
+        duration += (((Number) minutesSpinner.getValue())).intValue() * SECONDS_IN_MINUTE;
+        duration += (((Number) hoursSpinner.getValue())).intValue() * SECONDS_IN_MINUTE * SECONDS_IN_MINUTE;
+        duration += (((Number) daysSpinner.getValue())).intValue() * SECONDS_IN_MINUTE * SECONDS_IN_MINUTE * SECONDS_IN_MINUTE;
 
         return duration;
     }

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

@@ -22,18 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
-import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
-import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.FontPicker;
+import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
+import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel.OptionType;
+import com.dmdirc.addons.ui_swing.components.renderers.AddOptionCellRenderer;
 
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.nio.charset.Charset;
+
 import javax.swing.AbstractAction;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
-import com.dmdirc.config.Identity;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.config.Identity;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -33,14 +33,14 @@ import java.util.Map.Entry;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-
 import javax.swing.UIManager;
+
 import net.miginfocom.swing.MigLayout;
 
 /**
  * Settings panel.
  */
-public final class SettingsPanel extends JPanel {
+public class SettingsPanel extends JPanel {
 
     /**
      * A version number for this class. It should be changed whenever the class

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

@@ -43,13 +43,6 @@ public final class ActionCellRenderer extends DefaultListCellRenderer {
      */
     private static final long serialVersionUID = 1;
     
-    /**
-     * Creates a new instance of ActionCellRenderer.
-     */
-    public ActionCellRenderer() {
-        super();
-    }
-    
     /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(final JList list,
@@ -63,8 +56,8 @@ public final class ActionCellRenderer extends DefaultListCellRenderer {
             setText(((ActionComponent) value).getName());
         } else if (value instanceof ActionType) {
             setText(((ActionType) value).getName());
-        } else if (value instanceof Class) {
-            setText(((Class) value).getSimpleName());
+        } else if (value instanceof Class<?>) {
+            setText(((Class<?>) value).getSimpleName());
         } else if (value == null) {
             setText("");
         } else {

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

@@ -26,9 +26,8 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 
 import java.awt.Component;
 
-import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.JList;
 
 /**
  * Add option combo box cell renderer.

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

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.renderers;
 
+import static com.dmdirc.addons.ui_swing.UIUtilities.SMALL_BORDER;
+
 import com.dmdirc.addons.ui_swing.components.pluginpanel.PluginInfoToggle;
 import com.dmdirc.addons.ui_swing.components.themepanel.ThemeToggle;
-import static com.dmdirc.addons.ui_swing.UIUtilities.SMALL_BORDER;
 
 import java.awt.Color;
 import java.awt.Component;

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandler.java

@@ -83,9 +83,9 @@ public final class ArrayListTransferHandler extends TransferHandler {
 
         try {
             if (hasLocalArrayListFlavor(t.getTransferDataFlavors())) {
-                return doImport((JList) comp, (ArrayList) t.getTransferData(localArrayListFlavor));
+                return doImport((JList) comp, (ArrayList<?>) t.getTransferData(localArrayListFlavor));
             } else if (hasSerialArrayListFlavor(t.getTransferDataFlavors())) {
-                return doImport((JList) comp, (ArrayList) t.getTransferData(serialArrayListFlavor));
+                return doImport((JList) comp, (ArrayList<?>) t.getTransferData(serialArrayListFlavor));
             } else {
                 return false;
             }
@@ -106,7 +106,7 @@ public final class ArrayListTransferHandler extends TransferHandler {
      * 
      * @return Whether the data was imported
      */
-    private boolean doImport(final JList target, final List transferList) {
+    private boolean doImport(final JList target, final List<?> transferList) {
         int index = target.getSelectedIndex();
         if (sourceList.equals(target) && indices != null && index >= indices[0] - 1 && index <= indices[indices.length - 1]) {
             indices = null;

src/com/dmdirc/addons/ui_swing/components/reorderablelist/ReorderableJList.java

@@ -270,7 +270,7 @@ public final class ReorderableJList extends JList implements DragSourceListener,
         final DefaultListModel mod = getModel();
         final int newIndex = sourceBeforeTarget ? index - 1 : index;
         mod.remove(draggedIndex);
-        for (Object item : (ArrayList) dragged) {
+        for (Object item : (ArrayList<?>) dragged) {
             mod.add(newIndex, item);
         }
         

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import javax.swing.JPanel;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkEvent.EventType;
 import javax.swing.event.HyperlinkListener;
+import javax.swing.event.HyperlinkEvent.EventType;
 
 import net.miginfocom.swing.MigLayout;
 

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

@@ -24,17 +24,17 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.JPanel;
 import javax.swing.JToggleButton;
 

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

@@ -22,18 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
-import com.dmdirc.config.prefs.validator.ConditionRuleValidator;
 import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.ConditionTreeFactory;
 import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.config.prefs.validator.ConditionRuleValidator;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.ButtonGroup;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;

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

@@ -24,9 +24,9 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.validator.ActionNameValidator;
+import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
 
 import java.beans.PropertyChangeEvent;

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;

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

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.components.colours.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.colours.OptionalColourChooser;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
+import com.dmdirc.config.prefs.PreferencesSetting;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -22,17 +22,17 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
-import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 
-import java.awt.Dialog.ModalityType;
 import java.awt.Window;
+import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
-import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
@@ -31,17 +30,18 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.validator.FileNameValidator;
-import com.dmdirc.config.prefs.validator.ValidatorChain;
-import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.SortedListModel;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+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.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.NoDuplicatesInListValidator;
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.prefs.validator.FileNameValidator;
+import com.dmdirc.config.prefs.validator.ValidatorChain;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -22,15 +22,15 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
-import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
-import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionComparison;
+import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
+import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
+import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;

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

@@ -22,17 +22,17 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
-import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
-import com.dmdirc.config.prefs.validator.FileNameValidator;
+import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.renderers.ActionComparisonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-
 import com.dmdirc.config.prefs.validator.CommandNameValidator;
+import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;

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

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.ActionCondition;
+import com.dmdirc.actions.wrappers.Alias;
 
 import java.util.ArrayList;
 import java.util.List;

test/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandlerTest.java

@@ -51,9 +51,9 @@ public class ArrayListTransferHandlerTest {
         assertNotNull(transferable);
         final Object data = transferable.getTransferData(transferable.getTransferDataFlavors()[0]);
         
-        assertTrue(data instanceof ArrayList);
-        assertEquals(1, ((ArrayList) data).size());
-        assertEquals("abc", ((ArrayList) data).get(0));
+        assertTrue(data instanceof ArrayList<?>);
+        assertEquals(1, ((ArrayList<?>) data).size());
+        assertEquals("abc", ((ArrayList<?>) data).get(0));
     }
     
     @Test
@@ -94,9 +94,9 @@ public class ArrayListTransferHandlerTest {
         assertNotNull(transferable);
         final Object data = transferable.getTransferData(transferable.getTransferDataFlavors()[0]);
         
-        assertTrue(data instanceof ArrayList);
-        assertEquals(1, ((ArrayList) data).size());
-        assertEquals("", ((ArrayList) data).get(0));
+        assertTrue(data instanceof ArrayList<?>);
+        assertEquals(1, ((ArrayList<?>) data).size());
+        assertEquals("", ((ArrayList<?>) data).get(0));
     }    
     
     @Test

test/com/dmdirc/harness/ui/ClassAndNameComponentMatcher.java

@@ -30,7 +30,7 @@ import org.uispec4j.finder.ComponentMatcher;
  */
 public class ClassAndNameComponentMatcher implements ComponentMatcher {
 
-    private Class clazz;
+    private Class<?> clazz;
     private String name;
 
     /**
@@ -40,7 +40,7 @@ public class ClassAndNameComponentMatcher implements ComponentMatcher {
      * @param clazz Class to match
      * @param name Component name to match
      */
-    public ClassAndNameComponentMatcher(final Class clazz, final String name) {
+    public ClassAndNameComponentMatcher(final Class<?> clazz, final String name) {
         this.clazz = clazz;
         this.name = name;
     }

test/com/dmdirc/harness/ui/ClassComponentMatcher.java

@@ -31,7 +31,7 @@ import org.uispec4j.finder.ComponentMatcher;
  */
 public class ClassComponentMatcher implements ComponentMatcher {
 
-    private final Class clazz;
+    private final Class<?> clazz;
 
     /**
      * Creates a new component matcher, searching for any components matching
@@ -39,7 +39,7 @@ public class ClassComponentMatcher implements ComponentMatcher {
      *
      * @param clazz Class to search for
      */
-    public ClassComponentMatcher(final Class clazz) {
+    public ClassComponentMatcher(final Class<?> clazz) {
         this.clazz = clazz;
     }