Style fixes

Change-Id: I1a3166e5b4f21430b119f5a2692c8554e192aec1
Reviewed-on: http://gerrit.dmdirc.com/1329
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -188,7 +188,7 @@ public class TransferContainer extends FrameContainer<TransferWindow> implements
         final long time = getElapsedTime();
 
         synchronized (this) {
-            return time > 0 ? (transferCount / time) : transferCount;
+            return time > 0 ? ((double) transferCount / time) : transferCount;
         }
     }
 

src/com/dmdirc/addons/dcc/io/DCC.java

@@ -324,7 +324,7 @@ public abstract class DCC implements Runnable {
      * @return ip as a long
      */
     public static long ipToLong(final String ip) {
-        final String bits[] = ip.split("\\.");
+        final String[] bits = ip.split("\\.");
         if (bits.length > 3) {
             return (Long.parseLong(bits[0]) << 24) + (Long.parseLong(bits[1]) << 16)
                     + (Long.parseLong(bits[2]) << 8) + Long.parseLong(bits[3]);

src/com/dmdirc/addons/dcc/kde/KDialogProcess.java

@@ -32,10 +32,10 @@ import java.util.ArrayList;
 public class KDialogProcess {
 
     /** Is kdialog in /bin? */
-    private final static boolean isBin = (new File("/bin/kdialog")).exists();
+    private static final boolean IS_BIN = (new File("/bin/kdialog")).exists();
 
     /** Does KDialog exist? */
-    private final static boolean hasKDialog = (new File("/usr/bin/kdialog")).exists() || isBin;
+    private static final boolean HAS_KDIALOG = (new File("/usr/bin/kdialog")).exists() || IS_BIN;
 
     /** Stream for the stdout stream for this process */
     private final StreamReader stdOutputStream;
@@ -54,7 +54,7 @@ public class KDialogProcess {
     public KDialogProcess(final String[] params) throws IOException {
         final String[] exec = new String[params.length + 1];
         System.arraycopy(params, 0, exec, 1, params.length);
-        exec[0] = (isBin) ? "/bin/kdialog" : "/usr/bin/kdialog";
+        exec[0] = (IS_BIN) ? "/bin/kdialog" : "/usr/bin/kdialog";
         process = Runtime.getRuntime().exec(exec);
         stdOutputStream = new StreamReader(process.getInputStream(), new ArrayList<String>());
         stdErrorStream = new StreamReader(process.getErrorStream(), new ArrayList<String>());
@@ -68,7 +68,7 @@ public class KDialogProcess {
      * @return True if kdialog was found, else false
      */
     public static boolean hasKDialog() {
-        return hasKDialog;
+        return HAS_KDIALOG;
     }
 
     /**

src/com/dmdirc/addons/dcc/ui/EmptyWindow.java

@@ -35,7 +35,7 @@ import javax.swing.JPopupMenu;
 public class EmptyWindow extends TextFrame {
 
     /** A version number for this class. */
-    private static final long serialVersionUID = 2l;
+    private static final long serialVersionUID = 2L;
 
     /**
      * Creates a new empty window for the specified UI controller and owner.

src/com/dmdirc/addons/dcc/ui/PlaceholderWindow.java

@@ -36,7 +36,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 public class PlaceholderWindow extends EmptyWindow {
 
     /** A version number for this class. */
-    private static final long serialVersionUID = 1l;
+    private static final long serialVersionUID = 1L;
 
     /**
      * Creates a new placeholder window for the specified UI controller and owner.

src/com/dmdirc/addons/dcc/ui/TransferWindow.java

@@ -56,7 +56,7 @@ public class TransferWindow extends EmptyWindow implements ActionListener,
         SocketCloseListener, DCCTransferHandler {
 
     /** A version number for this class. */
-    private static final long serialVersionUID = 1l;
+    private static final long serialVersionUID = 1L;
 
     /** Progress Bar */
     private final JProgressBar progress = new JProgressBar();

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -53,7 +53,6 @@ public final class DcopCommand extends Command implements CommandInfo {
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
         if (args.getArguments().length != 3) {
             showUsage(origin, args.isSilent(), "dcop", "<app> <object> <function>");
             return;

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
-import com.dmdirc.Main;
 import com.dmdirc.addons.freedesktop_notifications.commons.StringEscapeUtils;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
@@ -41,7 +40,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -121,11 +119,11 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
      * @param input Input string
      * @return Input string after being processed according to config settings.
      */
-    public final String prepareString(final String input) {
+    public String prepareString(final String input) {
         String output = input;
         if (stripcodes) { output = Styliser.stipControlCodes(output); }
         if (escapehtml) {
-	    if (strictescape) {
+            if (strictescape) {
                 output = StringEscapeUtils.escapeHtml(output);
             } else {
                 output = output.replace("&", "&");
@@ -192,7 +190,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "general.timeout", "Timeout", "Length of time in seconds before the notification popup closes."));
         general.addSetting(new PreferencesSetting(PreferencesType.FILE, getDomain(), "general.icon", "icon", "Path to icon to use on the notification."));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.escapehtml", "Escape HTML", "Some Implementations randomly parse HTML, escape it before showing?"));
-	general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.strictescape", "Strict Escape HTML", "Strictly escape HTML or just the basic characters? (&, < and >)"));
+        general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.strictescape", "Strict Escape HTML", "Strictly escape HTML or just the basic characters? (&, < and >)"));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "advanced.stripcodes", "Strip Control Codes", "Strip IRC Control codes from messages?"));
         
         manager.getCategory("Plugins").addSubCategory(general);
@@ -202,7 +200,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
         timeout = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "general.timeout");
         icon = IdentityManager.getGlobalConfig().getOption(getDomain(), "general.icon");
         escapehtml = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.escapehtml");
-	strictescape = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.strictescape");
+        strictescape = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.strictescape");
         stripcodes = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "advanced.stripcodes");
     }
 

src/com/dmdirc/addons/freedesktop_notifications/commons/Entities.java

@@ -150,9 +150,9 @@ class Entities {
     };
 
     // package scoped for testing
-    static int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
+    static final int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
     
-    static String getISO8859_1(int i, int j) {
+    static String getISO88591(int i, int j) {
         return ISO8859_1_ARRAY[i][j];
     }
 
@@ -355,7 +355,7 @@ class Entities {
     };
     
     // package scoped for testing
-    static int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
+    static final int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
     
     static String getHTML40(int i, int j) {
         return HTML40_ARRAY[i][j];
@@ -481,7 +481,7 @@ class Entities {
         }
     }
 
-    static abstract class MapIntMap implements Entities.EntityMap {
+    abstract static class MapIntMap implements Entities.EntityMap {
         protected Map<String, Integer> mapNameToValue;
 
         protected Map<Integer, String> mapValueToName;
@@ -536,7 +536,7 @@ class Entities {
     static class LookupEntityMap extends PrimitiveEntityMap {
         private String[] lookupTable;
 
-        private int LOOKUP_TABLE_SIZE = 256;
+        private static final int LOOKUP_TABLE_SIZE = 256;
 
         /**
          * {@inheritDoc}
@@ -972,14 +972,13 @@ class Entities {
                             char isHexChar = entityContent.charAt(1);
                             try {
                                 switch (isHexChar) {
-                                    case 'X' :
-                                    case 'x' : {
+                                    case 'X':
+                                    case 'x':
                                         entityValue = Integer.parseInt(entityContent.substring(2), 16);
                                         break;
-                                    }
-                                    default : {
+                                    default:
                                         entityValue = Integer.parseInt(entityContent.substring(1), 10);
-                                    }
+                                        break;
                                 }
                                 if (entityValue > 0xFFFF) {
                                     entityValue = -1;

src/com/dmdirc/addons/freedesktop_notifications/commons/IntHashMap.java

@@ -40,7 +40,7 @@ class IntHashMap {
     /**
      * The hash table data.
      */
-    private transient Entry table[];
+    private transient Entry[] table;
 
     /**
      * The total number of entries in the hash table.
@@ -176,7 +176,7 @@ class IntHashMap {
             throw new NullPointerException();
         }
 
-        Entry tab[] = table;
+        Entry[] tab = table;
         for (int i = tab.length; i-- > 0;) {
             for (Entry e = tab[i]; e != null; e = e.next) {
                 if (e.value.equals(value)) {
@@ -213,7 +213,7 @@ class IntHashMap {
      * @see #contains(Object)
      */
     public boolean containsKey(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -234,7 +234,7 @@ class IntHashMap {
      * @see     #put(int, Object)
      */
     public Object get(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -256,10 +256,10 @@ class IntHashMap {
      */
     protected void rehash() {
         int oldCapacity = table.length;
-        Entry oldMap[] = table;
+        Entry[] oldMap = table;
 
         int newCapacity = oldCapacity * 2 + 1;
-        Entry newMap[] = new Entry[newCapacity];
+        Entry[] newMap = new Entry[newCapacity];
 
         threshold = (int) (newCapacity * loadFactor);
         table = newMap;
@@ -293,7 +293,7 @@ class IntHashMap {
      */
     public Object put(int key, Object value) {
         // Makes sure the key is not already in the hashtable.
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -331,7 +331,7 @@ class IntHashMap {
      *          or <code>null</code> if the key did not have a mapping.
      */
     public Object remove(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index], prev = null; e != null; prev = e, e = e.next) {
@@ -354,7 +354,7 @@ class IntHashMap {
      * <p>Clears this hashtable so that it contains no keys.</p>
      */
     public synchronized void clear() {
-        Entry tab[] = table;
+        Entry[] tab = table;
         for (int index = tab.length; --index >= 0;) {
             tab[index] = null;
         }

src/com/dmdirc/addons/freedesktop_notifications/commons/StringEscapeUtils.java

@@ -19,7 +19,6 @@ package com.dmdirc.addons.freedesktop_notifications.commons;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.util.Locale;
 
 /**
  * <p>Escapes and unescapes <code>String</code>s for
@@ -71,7 +70,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            StringWriter writer = new StringWriter((int)(str.length() * 1.5));
             escapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -110,8 +109,8 @@ public class StringEscapeUtils {
      * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
      */
     public static void escapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null ) {
-            throw new IllegalArgumentException ("The Writer must not be null.");
+        if (writer == null) {
+            throw new IllegalArgumentException("The Writer must not be null.");
         }
         if (string == null) {
             return;
@@ -141,7 +140,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            StringWriter writer = new StringWriter((int)(str.length() * 1.5));
             unescapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -169,8 +168,8 @@ public class StringEscapeUtils {
      * @see #escapeHtml(String)
      */
     public static void unescapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null ) {
-            throw new IllegalArgumentException ("The Writer must not be null.");
+        if (writer == null) {
+            throw new IllegalArgumentException("The Writer must not be null.");
         }
         if (string == null) {
             return;

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

@@ -56,7 +56,7 @@ public class PingHistoryPanel extends JPanel {
     protected final RollingList<Long> history;
 
     /** The maximum ping value. */
-    protected long maximum = 0l;
+    protected long maximum = 0L;
 
     /**
      * Creates a new history panel for the specified plugin.

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -57,7 +57,6 @@ public final class LoggingCommand extends Command implements IntelligentCommand,
     @Override
     public void execute(final FrameContainer<?> origin,
             final CommandArguments args, final CommandContext context) {
-        final Server server = ((ServerCommandContext) context).getServer();
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
         if (pluginInfo == null) {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Logging Plugin is not loaded.");

src/com/dmdirc/addons/logging/ReverseFileReader.java

@@ -126,7 +126,7 @@ public class ReverseFileReader {
             throw new IOException("File has been closed.");
         }
         // Used to store result to output.
-//		StringBuilder line = new StringBuilder();
+
         final ArrayList<Byte> line = new ArrayList<Byte>(seekLength);
         // Used to store position in file pre-read
         long fp = 0;

src/com/dmdirc/addons/mediasource_windows/DllSource.java

@@ -116,7 +116,7 @@ public class DllSource implements MediaSource {
     @Override
     public String getTitle() {
         if (useArtistTitle) {
-            String bits[] = getOutput("getArtistTitle").split("\\s-\\s", 2);
+            final String[] bits = getOutput("getArtistTitle").split("\\s-\\s", 2);
             return (bits.length > 1) ? bits[1] : "";
         } else {
             return getOutput("getTitle");

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -65,7 +65,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
     /** The plugin we're associated with. */
     private final transient NickColourPlugin plugin;
     /** The table headings. */
-    private static final String[] headers = {"Network", "Nickname",
+    private static final String[] HEADERS = {"Network", "Nickname",
         "Text colour", "Nicklist colour"};
 
     /** Edit and delete buttons. */
@@ -83,7 +83,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
 
         final Object[][] data = plugin.getData();
 
-        table = new JTable(new DefaultTableModel(data, headers)) {
+        table = new JTable(new DefaultTableModel(data, HEADERS)) {
 
             /**
              * A version number for this class. It should be changed whenever the class

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -261,7 +261,7 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
     /**
      * A dummy media source for use in previews.
      */
-    private class DummyMediaSource implements MediaSource {
+    private static class DummyMediaSource implements MediaSource {
 
         /** {@inheritDoc} */
         @Override

src/com/dmdirc/addons/nowplaying/MediaSourceState.java

@@ -29,35 +29,35 @@ package com.dmdirc.addons.nowplaying;
  * @since 0.6.3m1
  */
 public enum MediaSourceState {
-	/** Media Source is closed. */
-	CLOSED ("Closed"),
-	/** Media Source is stopped. */
-	STOPPED ("Stopped"),
-	/** Media Source is paused. */
-	PAUSED ("Paused"),
-	/** Media Source is playing. */
-	PLAYING ("Playing"),
-	/** Media Source is giving an unknown state. */
-	NOTKNOWN ("Unknown");
-	
-	/** Nice name for this state. */
-	final String niceName;
-	
-	/**
-	 * Create a new MediaSourceState
-	 *
-	 * @param niceName Nice name for this state.
-	 */
-	MediaSourceState(final String niceName) {
-		this.niceName = niceName;
-	}
-	
-	/**
-	 * Get the nice name for this state.
-     *
-     * @return This state's nice name
-	 */
-	public String getNiceName() {
-		return niceName;
-	}
+    /** Media Source is closed. */
+    CLOSED ("Closed"),
+    /** Media Source is stopped. */
+    STOPPED ("Stopped"),
+    /** Media Source is paused. */
+    PAUSED ("Paused"),
+    /** Media Source is playing. */
+    PLAYING ("Playing"),
+    /** Media Source is giving an unknown state. */
+    NOTKNOWN ("Unknown");
+
+    /** Nice name for this state. */
+    final String niceName;
+
+    /**
+    * Create a new MediaSourceState
+    *
+    * @param niceName Nice name for this state.
+    */
+    MediaSourceState(final String niceName) {
+        this.niceName = niceName;
+    }
+
+    /**
+    * Get the nice name for this state.
+    *
+    * @return This state's nice name
+    */
+    public String getNiceName() {
+        return niceName;
+    }
 }

src/com/dmdirc/addons/parser_twitter/TwitterCallbackObject.java

@@ -42,7 +42,7 @@ import java.util.Map;
 public class TwitterCallbackObject extends CallbackObject {
 
     /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+    protected static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
 
     static {
         IMPL_MAP.put(ChannelClientInfo.class, TwitterChannelClientInfo.class);

src/com/dmdirc/addons/parser_twitter/TwitterCallbackObjectSpecific.java

@@ -42,7 +42,7 @@ import java.util.Map;
 public class TwitterCallbackObjectSpecific extends CallbackObjectSpecific {
 
     /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+    protected static final Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
 
     static {
         IMPL_MAP.put(ChannelClientInfo.class, TwitterChannelClientInfo.class);

src/com/dmdirc/addons/parser_twitter/TwitterClientInfo.java

@@ -23,13 +23,11 @@
 package com.dmdirc.addons.parser_twitter;
 
 import com.dmdirc.addons.parser_twitter.api.TwitterUser;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.LocalClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
-import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
 import com.dmdirc.plugins.Plugin;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

src/com/dmdirc/addons/parser_twitter/api/commons/Entities.java

@@ -150,9 +150,9 @@ class Entities {
     };
 
     // package scoped for testing
-    static int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
+    static final int ISO8859_1_ARRAY_LENGTH = ISO8859_1_ARRAY.length;
     
-    static String getISO8859_1(int i, int j) {
+    static String getISO88591(int i, int j) {
         return ISO8859_1_ARRAY[i][j];
     }
 
@@ -355,7 +355,7 @@ class Entities {
     };
     
     // package scoped for testing
-    static int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
+    static final int HTML40_ARRAY_LENGTH = HTML40_ARRAY.length;
     
     static String getHTML40(int i, int j) {
         return HTML40_ARRAY[i][j];
@@ -481,7 +481,7 @@ class Entities {
         }
     }
 
-    static abstract class MapIntMap implements Entities.EntityMap {
+    abstract static class MapIntMap implements Entities.EntityMap {
         protected Map<String, Integer> mapNameToValue;
 
         protected Map<Integer, String> mapValueToName;
@@ -536,7 +536,7 @@ class Entities {
     static class LookupEntityMap extends PrimitiveEntityMap {
         private String[] lookupTable;
 
-        private int LOOKUP_TABLE_SIZE = 256;
+        private static final int LOOKUP_TABLE_SIZE = 256;
 
         /**
          * {@inheritDoc}
@@ -972,14 +972,13 @@ class Entities {
                             char isHexChar = entityContent.charAt(1);
                             try {
                                 switch (isHexChar) {
-                                    case 'X' :
-                                    case 'x' : {
+                                    case 'X':
+                                    case 'x':
                                         entityValue = Integer.parseInt(entityContent.substring(2), 16);
                                         break;
-                                    }
-                                    default : {
+                                    default:
                                         entityValue = Integer.parseInt(entityContent.substring(1), 10);
-                                    }
+                                        break;
                                 }
                                 if (entityValue > 0xFFFF) {
                                     entityValue = -1;

src/com/dmdirc/addons/parser_twitter/api/commons/IntHashMap.java

@@ -40,7 +40,7 @@ class IntHashMap {
     /**
      * The hash table data.
      */
-    private transient Entry table[];
+    private transient Entry[] table;
 
     /**
      * The total number of entries in the hash table.
@@ -176,7 +176,7 @@ class IntHashMap {
             throw new NullPointerException();
         }
 
-        Entry tab[] = table;
+        Entry[] tab = table;
         for (int i = tab.length; i-- > 0;) {
             for (Entry e = tab[i]; e != null; e = e.next) {
                 if (e.value.equals(value)) {
@@ -213,7 +213,7 @@ class IntHashMap {
      * @see #contains(Object)
      */
     public boolean containsKey(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -234,7 +234,7 @@ class IntHashMap {
      * @see     #put(int, Object)
      */
     public Object get(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -256,10 +256,10 @@ class IntHashMap {
      */
     protected void rehash() {
         int oldCapacity = table.length;
-        Entry oldMap[] = table;
+        Entry[] oldMap = table;
 
         int newCapacity = oldCapacity * 2 + 1;
-        Entry newMap[] = new Entry[newCapacity];
+        Entry[] newMap = new Entry[newCapacity];
 
         threshold = (int) (newCapacity * loadFactor);
         table = newMap;
@@ -293,7 +293,7 @@ class IntHashMap {
      */
     public Object put(int key, Object value) {
         // Makes sure the key is not already in the hashtable.
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index]; e != null; e = e.next) {
@@ -331,7 +331,7 @@ class IntHashMap {
      *          or <code>null</code> if the key did not have a mapping.
      */
     public Object remove(int key) {
-        Entry tab[] = table;
+        Entry[] tab = table;
         int hash = key;
         int index = (hash & 0x7FFFFFFF) % tab.length;
         for (Entry e = tab[index], prev = null; e != null; prev = e, e = e.next) {
@@ -354,7 +354,7 @@ class IntHashMap {
      * <p>Clears this hashtable so that it contains no keys.</p>
      */
     public synchronized void clear() {
-        Entry tab[] = table;
+        Entry[] tab = table;
         for (int index = tab.length; --index >= 0;) {
             tab[index] = null;
         }

src/com/dmdirc/addons/parser_twitter/api/commons/StringEscapeUtils.java

@@ -70,7 +70,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            StringWriter writer = new StringWriter((int)(str.length() * 1.5));
             escapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -109,8 +109,8 @@ public class StringEscapeUtils {
      * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
      */
     public static void escapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null ) {
-            throw new IllegalArgumentException ("The Writer must not be null.");
+        if (writer == null) {
+            throw new IllegalArgumentException("The Writer must not be null.");
         }
         if (string == null) {
             return;
@@ -140,7 +140,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            StringWriter writer = new StringWriter((int)(str.length() * 1.5));
             unescapeHtml(writer, str);
             return writer.toString();
         } catch (IOException ioe) {
@@ -168,8 +168,8 @@ public class StringEscapeUtils {
      * @see #escapeHtml(String)
      */
     public static void unescapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null ) {
-            throw new IllegalArgumentException ("The Writer must not be null.");
+        if (writer == null) {
+            throw new IllegalArgumentException("The Writer must not be null.");
         }
         if (string == null) {
             return;

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

@@ -32,7 +32,6 @@ import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
 import com.dmdirc.parser.irc.IRCCallbackManager;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.plugins.PluginClassLoader;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
@@ -205,7 +204,6 @@ public class RelayChannelHandler implements ChannelMessageListener {
             try {
                 final Method gpcl = PluginInfo.class.getDeclaredMethod("getPluginClassLoader");
                 gpcl.setAccessible(true);
-                final PluginClassLoader pcl = (PluginClassLoader) gpcl.invoke(nickColour);
 
                 final Class<?> nc = nickColour.getPlugin().getClass();
                 final Method colourClient = nc.getDeclaredMethod("colourClient", new Class<?>[]{String.class, ChannelClientInfo.class});

src/com/dmdirc/addons/scriptplugin/JavaScriptHelper.java

@@ -21,7 +21,8 @@
  */
 
 package com.dmdirc.addons.scriptplugin;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Used to allow the rhino javascript to do stuff that it otherwise can't, such
@@ -31,13 +32,13 @@ import java.util.Hashtable;
  */
 public class JavaScriptHelper {
     /** Used to identify the JavaScriptHelper. */
-    private static final String myIDString = "DMDIRC-JSH";
+    private static final String ID = "DMDIRC-JSH";
     
     /** Used to allow scripts to know if a specific function they need is available. */
-    private final int myVersion = 2;
+    private static final int VERSION = 2;
 
-    /** Hashtable for storing stufff. */
-    private static Hashtable<String,Object> globalSettings = new Hashtable<String,Object>();
+    /** Hashtable for storing stuff. */
+    private static final Map<String,Object> SETTINGS = new HashMap<String,Object>();
     
     /**
      * Method to set Stuff.
@@ -48,8 +49,8 @@ public class JavaScriptHelper {
     public void setGlobal(String setting, Object value) {
         if (setting.equals("")) { return; }
         setting = setting.toLowerCase();
-        if (globalSettings.containsKey(setting)) { globalSettings.remove(setting); }
-        if (value != null) { globalSettings.put(setting,value); }
+        if (SETTINGS.containsKey(setting)) { SETTINGS.remove(setting); }
+        if (value != null) { SETTINGS.put(setting,value); }
     }
     
     /**
@@ -61,7 +62,7 @@ public class JavaScriptHelper {
     public Object getGlobal(String setting) {
         if (setting.equals("")) { return ""; }
         setting = setting.toLowerCase();
-        if (globalSettings.containsKey(setting)) { return globalSettings.get(setting); }
+        if (SETTINGS.containsKey(setting)) { return SETTINGS.get(setting); }
         return null;
     }
     
@@ -86,7 +87,7 @@ public class JavaScriptHelper {
      *
      * @return JavaScriptHelper version
      */
-    public int getVersion() { return myVersion; }
+    public int getVersion() { return VERSION; }
     
     /**
      * Get the ID of this JavaScriptHelper.
@@ -94,5 +95,5 @@ public class JavaScriptHelper {
      *
      * @return JavaScriptHelper ID
      */
-    public String getID() { return myIDString; }
+    public String getID() { return ID; }
 }

src/com/dmdirc/addons/scriptplugin/TypedProperties.java

@@ -465,13 +465,13 @@ public class TypedProperties extends Properties {
      */
     public void setListProperty(final String key, final List<String> value) {
         final StringBuilder val = new StringBuilder();
-        final String LF = "\n";
+        final String lf = "\n";
         boolean first = true;
         for (final String bit : value) {
             if (first) {
                 first = false;
             } else {
-                val.append(LF);
+                val.append(lf);
             }
             val.append(bit);
         }

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

@@ -485,5 +485,5 @@ public final class Apple implements InvocationHandler, ActionListener {
      *
      * @return 0 on success, 1 on failure.
      */
-    private synchronized final native int registerOpenURLCallback();
+    private synchronized native int registerOpenURLCallback();
 }

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

@@ -68,7 +68,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.ChannelWindow;
-import com.dmdirc.ui.interfaces.FrameListener;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.QueryWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;

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

@@ -1,4 +1,3 @@
-
 /**
  * @(#)MenuScroller.java	1.3.0 05/04/09
  */
@@ -441,8 +440,9 @@ public class MenuScroller {
      * @see MenuScroller#dispose()
      */
     @Override
-    public void finalize() throws Throwable {
+    protected void finalize() throws Throwable {
         dispose();
+        super.finalize();
     }
 
     private void setMenuItems() {

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -59,7 +59,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
-import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.util.StringTranscoder;
 
 import java.awt.Container;
@@ -778,7 +777,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
     public void mouseClicked(final ClickTypeValue clicktype,
             final MouseEventType eventType, final MouseEvent event) {
         if (event.isPopupTrigger()) {
-            showPopupMenuInternal(clicktype, event.getPoint()   );
+            showPopupMenuInternal(clicktype, event.getPoint());
         }
         if (eventType == MouseEventType.CLICK
                 && event.getButton() == MouseEvent.BUTTON1) {

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

@@ -25,10 +25,8 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 import com.dmdirc.actions.interfaces.ActionType;
 
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Font;
 
-import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
 
 /**

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

@@ -40,8 +40,6 @@ import javax.swing.ListCellRenderer;
 
 import net.miginfocom.swing.MigLayout;
 
-import static com.dmdirc.addons.ui_swing.UIUtilities.SMALL_BORDER;
-
 /**
  * Handles the rendering of the JList used for plugin and theme management.
  * @author chris
@@ -53,7 +51,7 @@ public final class AddonCellRenderer extends JPanel implements ListCellRenderer
      * structure is changed (or anything else that would prevent serialized
      * objects being unserialized with the new class).
      */
-    private static final long serialVersionUID = 1;    
+    private static final long serialVersionUID = 1;
     
     /** Creates a new instance of AddonCellRenderer. */
     public AddonCellRenderer() {

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
@@ -68,7 +67,7 @@ public class ErrorPanel extends StatusbarPopupPanel implements ErrorListener, Ac
     /** Swing status bar. */
     private SwingStatusBar statusBar;
     /** Error manager. */
-    private transient final ErrorManager errorManager = ErrorManager.getErrorManager();
+    private final transient ErrorManager errorManager = ErrorManager.getErrorManager();
     /** Dismiss menu. */
     private final JPopupMenu menu;
     /** Dismiss menu item. */

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionLabel.java

@@ -58,7 +58,7 @@ public class SubstitutionLabel extends JButton implements MouseListener,
     /** Drag source. */
     private DragSource dragSource;
     /** Substitution. */
-    private transient final Substitution substitution;
+    private final transient Substitution substitution;
     /** Previously selected component. */
     private Component previousComponent;
 

src/com/dmdirc/addons/ui_swing/components/vetoable/VetoableChangeEvent.java

@@ -43,7 +43,7 @@ public class VetoableChangeEvent extends ChangeEvent {
      * @param source Event source
      * @param newValue New value
      */
-    public VetoableChangeEvent(final Object source, final Object newValue ) {
+    public VetoableChangeEvent(final Object source, final Object newValue) {
         super(source);
         this.newValue = newValue;
     }

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -78,7 +78,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
     /** Server info checkbox. */
     private JCheckBox serverCheckbox;
     /** DMDirc info checkbox. */
-    private JCheckBox DMDircCheckbox;
+    private JCheckBox dmdircCheckbox;
     /** Sent. */
     private boolean sentReport = false;
 
@@ -156,7 +156,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         feedback = new JTextArea();
         serverCheckbox =
                 new JCheckBox("Include information about connected servers.");
-        DMDircCheckbox = new JCheckBox("Include information about DMDirc.");
+        dmdircCheckbox = new JCheckBox("Include information about DMDirc.");
 
         UIUtilities.addUndoManager(name);
         UIUtilities.addUndoManager(email);
@@ -167,8 +167,8 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
     private void layoutComponents() {
         serverCheckbox.setMargin(new Insets(0, 0, 0, 0));
         serverCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        DMDircCheckbox.setMargin(new Insets(0, 0, 0, 0));
-        DMDircCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        dmdircCheckbox.setMargin(new Insets(0, 0, 0, 0));
+        dmdircCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
         setLayout(new MigLayout("fill, wmin 600, wmax 600, hmin 400, hmax 400"));
 
@@ -183,7 +183,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
         add(new JLabel("Feedback: "), "aligny top, shrink");
         add(new JScrollPane(feedback), "grow, push, wrap");
         add(serverCheckbox, "skip 1, growx, wrap");
-        add(DMDircCheckbox, "skip 1, growx, wrap");
+        add(dmdircCheckbox, "skip 1, growx, wrap");
 
         add(getCancelButton(), "skip, split 2, right, sg button");
         add(getOkButton(), "right, sg button");
@@ -249,7 +249,7 @@ public class FeedbackDialog extends StandardDialog implements ActionListener,
                 }
             }
         }
-        if (DMDircCheckbox.isSelected()) {
+        if (dmdircCheckbox.isSelected()) {
             dmdircInfo.append("DMDirc version: " + Info.getDMDircVersion()).
                     append("\n");
             dmdircInfo.append("Profile directory: " + Main.getConfigDir()).

src/com/dmdirc/addons/ui_swing/dialogs/StandardDialog.java

@@ -31,7 +31,6 @@ import java.awt.Frame;
 import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.concurrent.Semaphore;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;

src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.java

@@ -117,7 +117,7 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Initialises the components.
      */
-    private final void initComponents() {
+    private void initComponents() {
         orderButtons(new JButton(), new JButton());
         textField = new ValidatingJTextField(validator);
         blurb = new TextLabel(message);
@@ -127,7 +127,7 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Adds the listeners
      */
-    private final void addListeners() {
+    private void addListeners() {
         getOkButton().addActionListener(new ActionListener() {
 
             /** {@inheritDoc} */
@@ -201,7 +201,7 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Lays out the components.
      */
-    private final void layoutComponents() {
+    private void layoutComponents() {
         setLayout(new MigLayout("fill, wrap 1"));
 
         add(blurb, "growx");

src/com/dmdirc/addons/ui_swing/dialogs/StandardMessageDialog.java

@@ -91,7 +91,7 @@ public class StandardMessageDialog extends StandardDialog {
     /**
      * Initialises the components.
      */
-    private final void initComponents() {
+    private void initComponents() {
         orderButtons(new JButton(), new JButton());
         getOkButton().setText("OK");
         blurb = new TextLabel(message);
@@ -100,7 +100,7 @@ public class StandardMessageDialog extends StandardDialog {
     /**
      * Adds the listeners
      */
-    private final void addListeners() {
+    private void addListeners() {
         final ActionListener listener = new ActionListener() {
 
             /** {@inheritDoc} */
@@ -132,7 +132,7 @@ public class StandardMessageDialog extends StandardDialog {
     /**
      * Lays out the components.
      */
-    private final void layoutComponents() {
+    private void layoutComponents() {
         setLayout(new MigLayout("fill, wrap 1, hidemode 3, wmax min(80sp, 500),"
                 + " wmin min(80sp, 500), pack"));
 

src/com/dmdirc/addons/ui_swing/dialogs/StandardQuestionDialog.java

@@ -83,7 +83,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /**
      * Initialises the components.
      */
-    private final void initComponents() {
+    private void initComponents() {
         orderButtons(new JButton(), new JButton());
         getOkButton().setText("Yes");
         getCancelButton().setText("No");
@@ -93,7 +93,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /**
      * Adds the listeners
      */
-    private final void addListeners() {
+    private void addListeners() {
         getOkButton().addActionListener(new ActionListener() {
 
             /** {@inheritDoc} */
@@ -133,7 +133,7 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /**
      * Lays out the components.
      */
-    private final void layoutComponents() {
+    private void layoutComponents() {
         setLayout(new MigLayout("fill, wrap 1, hidemode 3"));
 
         add(blurb, "growx");

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

@@ -89,8 +89,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
         final String licenceString = entry.getKey().substring(entry.getKey().
                 lastIndexOf('/') + 1);
         if (licenceString.length() > 1) {
-            final String licenceStringParts[] = licenceString.split(
-                    " - ");
+            final String[] licenceStringParts = licenceString.split(" - ");
             return new Licence(licenceStringParts[1], licenceStringParts[0],
                     "<html><h1>" + licenceStringParts[1] + "</h1><p>"
                     + readInputStream(entry.getValue()).replace("\n", "<br>")

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

@@ -27,7 +27,7 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
-import java.awt.Color;
+
 import java.awt.Dimension;
 import java.util.concurrent.ExecutionException;
 import javax.swing.BorderFactory;
@@ -123,7 +123,7 @@ public class CategoryLabel extends JLabel {
         }
     }
 
-    private class IconLoader extends SwingWorker<Icon, Void> {
+    private static class IconLoader extends SwingWorker<Icon, Void> {
 
         private CategoryLabel label;
         private String icon;

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuInterface.java

@@ -34,5 +34,5 @@ public interface FrameContainerMenuInterface {
      *
      * @return Wrapped frame container
      */
-    public FrameContainer getFrame();
+    FrameContainer getFrame();
 }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
 
 import java.awt.Font;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

@@ -385,8 +385,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
             selectionStartChar = selection.getEndPos();
             selectionEndLine = selection.getStartLine();
             selectionEndChar = selection.getStartPos();
-        } else if (selection.getStartLine() == selection.getEndLine() && selection.
-                getStartPos() > selection.getEndPos()) {
+        } else if (selection.getStartLine() == selection.getEndLine()
+                && selection.getStartPos() > selection.getEndPos()) {
             // Just swap the chars
             selectionStartLine = selection.getStartLine();
             selectionStartChar = selection.getEndPos();
@@ -434,11 +434,8 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
 
                 final AttributedCharacterIterator iterator = document.
                         getStyledLine(line);
-                int lineHeight = document.getLineHeight(line);
-                lineHeight += lineHeight * 0.2;
                 final AttributedString as = new AttributedString(iterator,
-                        firstChar,
-                        lastChar);
+                        firstChar, lastChar);
 
                 as.addAttribute(TextAttribute.FOREGROUND,
                         textPane.getBackground());

src/com/dmdirc/addons/ui_swing/wizard/Step.java

@@ -40,5 +40,5 @@ public abstract class Step extends JPanel {
      *
      * @return Step title
      */
-    abstract public String getTitle();
+    public abstract String getTitle();
 }

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -62,10 +62,10 @@ import org.mortbay.util.ajax.JSONObjectConvertor;
 public class DynamicRequestHandler extends AbstractHandler {
     
     /** Number of milliseconds before a client is timed out. */
-    private static long TIMEOUT = 1000 * 60 * 2; // Two minutes
+    private static final long TIMEOUT = 1000 * 60 * 2; // Two minutes
 
     /** The last time each client was seen. */
-    private static final Map<String, Client> clients = new HashMap<String, Client>();
+    private static final Map<String, Client> CLIENTS = new HashMap<String, Client>();
 
     /**
      * Creates a new instance of DynamicRequestHandler. Registers object
@@ -82,11 +82,11 @@ public class DynamicRequestHandler extends AbstractHandler {
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
-                synchronized (clients) {
+                synchronized (CLIENTS) {
                     for (Map.Entry<String, Client> entry 
-                            : new HashMap<String, Client>(clients).entrySet()) {
+                            : new HashMap<String, Client>(CLIENTS).entrySet()) {
                         if (entry.getValue().getTime() > TIMEOUT) {
-                            clients.remove(entry.getKey());
+                            CLIENTS.remove(entry.getKey());
                         }
                     }
                 }
@@ -107,12 +107,12 @@ public class DynamicRequestHandler extends AbstractHandler {
         if (request.getParameter("clientID") != null) {
             final String clientID = request.getParameter("clientID");
             
-            if (!clients.containsKey(clientID)) {
-                clients.put(clientID, new Client(request.getRemoteHost()));
+            if (!CLIENTS.containsKey(clientID)) {
+                CLIENTS.put(clientID, new Client(request.getRemoteHost()));
             }
 
-            synchronized (clients) {
-                clients.get(clientID).touch();
+            synchronized (CLIENTS) {
+                CLIENTS.get(clientID).touch();
             }
         }
         
@@ -172,7 +172,7 @@ public class DynamicRequestHandler extends AbstractHandler {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
 
-        final Client client = clients.get(request.getParameter("clientID"));
+        final Client client = CLIENTS.get(request.getParameter("clientID"));
 
         synchronized (client.getMutex()) {
             List<Event> myEvents = client.retrieveEvents();
@@ -181,7 +181,7 @@ public class DynamicRequestHandler extends AbstractHandler {
                 Continuation continuation = ContinuationSupport.getContinuation(request,
                         client.getMutex());
                 client.setContinuation(continuation);
-                continuation.suspend(30000l);
+                continuation.suspend(30000L);
 
                 myEvents = client.retrieveEvents();
             }
@@ -322,7 +322,7 @@ public class DynamicRequestHandler extends AbstractHandler {
             final HttpServletResponse response) throws IOException {
         response.setStatus(HttpServletResponse.SC_OK);
         response.setContentType("application/json");
-        response.getWriter().write(JSON.toString(clients.values().toArray()));
+        response.getWriter().write(JSON.toString(CLIENTS.values().toArray()));
     }
     
     private void doJoinChannel(final HttpServletRequest request,
@@ -357,15 +357,15 @@ public class DynamicRequestHandler extends AbstractHandler {
     }
 
     public static void addEvent(final Event event) {
-        synchronized (clients) {
-            for (Client client : clients.values()) {
+        synchronized (CLIENTS) {
+            for (Client client : CLIENTS.values()) {
                 client.addEvent(event);
             }
         }
     }
 
     public static void addEvent(String clientID, Event event) {
-        clients.get(clientID).addEvent(event);
+        CLIENTS.get(clientID).addEvent(event);
     }
 
 }

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -35,7 +35,6 @@ import com.dmdirc.addons.ui_web.uicomponents.WebServerWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.interfaces.*;
 import com.dmdirc.updater.Update;

test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.mediasource_vlc;
 
-import com.dmdirc.addons.nowplaying.MediaSourceState;
 import com.dmdirc.util.TextFile;
 import java.io.IOException;
 import org.junit.Test;

test/com/dmdirc/addons/ui_swing/UIUtilitiesTest.java

@@ -58,8 +58,8 @@ public class UIUtilitiesTest {
         //incorrect look and feel name = system
         assertEquals(sysLAF, UIUtilities.getLookAndFeel("incorrectName"));
         //Look and feel name -> class name
-        final LookAndFeelInfo[] LAFs = UIManager.getInstalledLookAndFeels();
-        for (LookAndFeelInfo lookAndFeel : LAFs) {
+        final LookAndFeelInfo[] lafs = UIManager.getInstalledLookAndFeels();
+        for (LookAndFeelInfo lookAndFeel : lafs) {
             assertEquals(lookAndFeel.getClassName(), UIUtilities.getLookAndFeel(lookAndFeel.getName()));
         }
     }

test/com/dmdirc/addons/ui_swing/components/frames/InputTextFrameTest.java

@@ -112,7 +112,7 @@ public class InputTextFrameTest extends DMDircUITestCase {
     /**
      * Creates a new paste dialog for the specified frame with the specified text.
      */
-    private class PasteDialogTrigger implements Trigger {
+    private static class PasteDialogTrigger implements Trigger {
 
         private InputTextFrame frame;
         private String text;

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java

@@ -47,6 +47,8 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
     @Before
     @Override
     public void setUp() {
+        super.setUp();
+        
         action1 = mock(Action.class);
         when(action1.getName()).thenReturn("name 1");
         when(action1.getTriggers()).thenReturn(new ActionType[] {

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialogTest.java

@@ -157,7 +157,7 @@ public class ActionsManagerDialogTest extends FestSwingJUnitTestCase {
 
         newwin = WindowFinder.findDialog(StandardQuestionDialog.
                 class).withTimeout(5000).using(window.robot);
-        button = newwin.button(JButtonMatcher.withText("Yes")).click();
+        newwin.button(JButtonMatcher.withText("Yes")).click();
         
         assertTrue(window.list().selection().length != 1 ||   
                 !window.list().selection()[0].equals("amd-ui-test1"));

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

@@ -33,7 +33,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.IRCDocument;
-import org.junit.Test;
+
 import org.uispec4j.UISpecTestCase;
 import static org.mockito.Mockito.*;