Style fixes

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

src/com/dmdirc/CertificateManager.java

@@ -152,13 +152,7 @@ public class CertificateManager implements X509TrustManager {
         } catch (NoSuchAlgorithmException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
         } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException ex) {
-                    // ...
-                }
-            }
+            StreamUtil.close(is);
         }
     }
 

src/com/dmdirc/ServerManager.java

@@ -251,7 +251,7 @@ public final class ServerManager {
         server.activateFrame();
 
         if (server.getState().isDisconnected()) {
-            server.connect(uri, profile );
+            server.connect(uri, profile);
         } else {
             server.join(server.getParser().extractChannels(uri)
                     .toArray(new ChannelJoinRequest[0]));

src/com/dmdirc/actions/ActionManager.java

@@ -54,35 +54,35 @@ import java.util.Map;
 public final class ActionManager {
 
     /** A list of registered action types. */
-    private static final List<ActionType> actionTypes
+    private static final List<ActionType> ACTION_TYPES
             = new ArrayList<ActionType>();
 
     /** A list of registered action components. */
-    private static final List<ActionComponent> actionComponents
+    private static final List<ActionComponent> ACTION_COMPONENTS
             = new ArrayList<ActionComponent>();
 
     /** A list of registered action comparisons. */
-    private static final List<ActionComparison> actionComparisons
+    private static final List<ActionComparison> ACTION_COMPARISON
             = new ArrayList<ActionComparison>();
 
     /** A map linking types and a list of actions that're registered for them. */
-    private static final MapList<ActionType, Action> actions
+    private static final MapList<ActionType, Action> ACTIONS
             = new MapList<ActionType, Action>();
 
     /** A map linking groups and a list of actions that're in them. */
-    private static final Map<String, ActionGroup> groups
+    private static final Map<String, ActionGroup> GROUPS
             = new HashMap<String, ActionGroup>();
 
     /** A map of objects to synchronise on for concurrency groups. */
-    private static final Map<String, Object> locks
+    private static final Map<String, Object> LOCKS
             = new HashMap<String, Object>();
 
     /** A map of the action type groups to the action types within. */
-    private static final MapList<String, ActionType> actionTypeGroups
+    private static final MapList<String, ActionType> ACTIONTYPE_GROUPS
             = new MapList<String, ActionType>();
 
     /** The listeners that we have registered. */
-    private static final MapList<ActionType, ActionListener> listeners
+    private static final MapList<ActionType, ActionListener> LISTENERS
             = new MapList<ActionType, ActionListener>();
 
     /** Indicates whether or not user actions should be killed (not processed). */
@@ -133,7 +133,7 @@ public final class ActionManager {
      * Saves all actions.
      */
     public static void saveActions() {
-        for (ActionGroup group : groups.values()) {
+        for (ActionGroup group : GROUPS.values()) {
             for (Action action : group) {
                 action.save();
             }
@@ -156,7 +156,7 @@ public final class ActionManager {
      * @param group The group of actions to be registered
      */
     public static void registerGroup(final ActionGroup group) {
-        groups.put(group.getName(), group);
+        GROUPS.put(group.getName(), group);
     }
 
     /**
@@ -169,9 +169,9 @@ public final class ActionManager {
         for (ActionType type : types) {
             Logger.assertTrue(type != null);
             
-            if(!actionTypes.contains(type)) {
-                actionTypes.add(type);
-                actionTypeGroups.add(type.getType().getGroup(), type);
+            if(!ACTION_TYPES.contains(type)) {
+                ACTION_TYPES.add(type);
+                ACTIONTYPE_GROUPS.add(type.getType().getGroup(), type);
             }
         }
     }
@@ -186,7 +186,7 @@ public final class ActionManager {
         for (ActionComponent comp : comps) {
             Logger.assertTrue(comp != null);
 
-            actionComponents.add(comp);
+            ACTION_COMPONENTS.add(comp);
         }
     }
 
@@ -200,7 +200,7 @@ public final class ActionManager {
         for (ActionComparison comp : comps) {
             Logger.assertTrue(comp != null);
 
-            actionComparisons.add(comp);
+            ACTION_COMPARISON.add(comp);
         }
     }
 
@@ -210,7 +210,7 @@ public final class ActionManager {
      * @return a map of groups to action lists
      */
     public static Map<String, ActionGroup> getGroups() {
-        return groups;
+        return GROUPS;
     }
 
     /**
@@ -219,16 +219,16 @@ public final class ActionManager {
      * @return A map of type groups to types
      */
     public static MapList<String, ActionType> getTypeGroups() {
-        return actionTypeGroups;
+        return ACTIONTYPE_GROUPS;
     }
 
     /**
      * Loads actions from the user's directory.
      */
     public static void loadActions() {
-        actions.clear();
+        ACTIONS.clear();
 
-        for (ActionGroup group : groups.values()) {
+        for (ActionGroup group : GROUPS.values()) {
             group.clear();
         }
 
@@ -261,7 +261,7 @@ public final class ActionManager {
      * Creates new ActionGroupComponents for each action group.
      */
     private static void registerComponents() {
-        for (ActionGroup group : groups.values()) {
+        for (ActionGroup group : GROUPS.values()) {
             new ActionGroupComponent(group);
         }
     }
@@ -276,8 +276,8 @@ public final class ActionManager {
         Logger.assertTrue(dir != null);
         Logger.assertTrue(dir.isDirectory());
         
-        if (!groups.containsKey(dir.getName())) {
-            groups.put(dir.getName(), new ActionGroup(dir.getName()));
+        if (!GROUPS.containsKey(dir.getName())) {
+            GROUPS.put(dir.getName(), new ActionGroup(dir.getName()));
         }
 
         for (File file : dir.listFiles()) {
@@ -295,7 +295,7 @@ public final class ActionManager {
         Logger.assertTrue(action != null);
  
         for (ActionType trigger : action.getTriggers()) {
-            actions.add(trigger, action);
+            ACTIONS.add(trigger, action);
         }
 
         getGroup(action.getGroup()).add(action);
@@ -309,11 +309,11 @@ public final class ActionManager {
      * @return The corresponding ActionGroup
      */
     public static ActionGroup getGroup(final String name) {
-        if (!groups.containsKey(name)) {
-            groups.put(name, new ActionGroup(name));
+        if (!GROUPS.containsKey(name)) {
+            GROUPS.put(name, new ActionGroup(name));
         }
 
-        return groups.get(name);
+        return GROUPS.get(name);
     }
 
     /**
@@ -325,7 +325,7 @@ public final class ActionManager {
     public static void unregisterAction(final Action action) {
         Logger.assertTrue(action != null);
 
-        actions.removeFromAll(action);
+        ACTIONS.removeFromAll(action);
         getGroup(action.getGroup()).remove(action);
     }
 
@@ -379,9 +379,9 @@ public final class ActionManager {
 
         boolean res = false;
 
-        if (listeners.containsKey(type)) {
+        if (LISTENERS.containsKey(type)) {
             for (ActionListener listener :
-                new ArrayList<ActionListener>(listeners.get(type))) {
+                new ArrayList<ActionListener>(LISTENERS.get(type))) {
                 try {
                     listener.processEvent(type, format, arguments);
                 } catch (Exception e) {
@@ -414,19 +414,19 @@ public final class ActionManager {
 
         boolean res = false;
 
-        if (actions.containsKey(type)) {
-            for (Action action : new ArrayList<Action>(actions.get(type))) {
+        if (ACTIONS.containsKey(type)) {
+            for (Action action : new ArrayList<Action>(ACTIONS.get(type))) {
                 try {
                     if (action.getConcurrencyGroup() == null) {
                         res |= action.trigger(format, arguments);
                     } else {
-                        synchronized (locks) {
-                            if (!locks.containsKey(action.getConcurrencyGroup())) {
-                                locks.put(action.getConcurrencyGroup(), new Object());
+                        synchronized (LOCKS) {
+                            if (!LOCKS.containsKey(action.getConcurrencyGroup())) {
+                                LOCKS.put(action.getConcurrencyGroup(), new Object());
                             }
                         }
 
-                        synchronized (locks.get(action.getConcurrencyGroup())) {
+                        synchronized (LOCKS.get(action.getConcurrencyGroup())) {
                             res |= action.trigger(format, arguments);
                         }
                     }
@@ -466,12 +466,12 @@ public final class ActionManager {
     public static ActionGroup makeGroup(final String group) {
         Logger.assertTrue(group != null);
         Logger.assertTrue(!group.isEmpty());
-        Logger.assertTrue(!groups.containsKey(group));
+        Logger.assertTrue(!GROUPS.containsKey(group));
 
         final File file = new File(getDirectory() + group);
         if (file.isDirectory() || file.mkdir()) {
             final ActionGroup actionGroup = new ActionGroup(group);
-            groups.put(group, actionGroup);
+            GROUPS.put(group, actionGroup);
             return actionGroup;
         } else {
             throw new IllegalArgumentException("Unable to create action group directory"
@@ -491,9 +491,9 @@ public final class ActionManager {
     public static void removeGroup(final String group) {
         Logger.assertTrue(group != null);
         Logger.assertTrue(!group.isEmpty());
-        Logger.assertTrue(groups.containsKey(group));
+        Logger.assertTrue(GROUPS.containsKey(group));
 
-        for (Action action : groups.get(group).getActions()) {
+        for (Action action : GROUPS.get(group).getActions()) {
             unregisterAction(action);
         }
 
@@ -515,7 +515,7 @@ public final class ActionManager {
             return;
         }
 
-        groups.remove(group);
+        GROUPS.remove(group);
     }
 
     /**
@@ -536,13 +536,13 @@ public final class ActionManager {
         Logger.assertTrue(!oldName.isEmpty());
         Logger.assertTrue(newName != null);
         Logger.assertTrue(!newName.isEmpty());
-        Logger.assertTrue(groups.containsKey(oldName));
-        Logger.assertTrue(!groups.containsKey(newName));
+        Logger.assertTrue(GROUPS.containsKey(oldName));
+        Logger.assertTrue(!GROUPS.containsKey(newName));
         Logger.assertTrue(!newName.equals(oldName));
 
         makeGroup(newName);
 
-        for (Action action : groups.get(oldName).getActions()) {
+        for (Action action : GROUPS.get(oldName).getActions()) {
             action.setGroup(newName);
             getGroup(oldName).remove(action);
             getGroup(newName).add(action);
@@ -563,7 +563,7 @@ public final class ActionManager {
             return null;
         }
 
-        for (ActionType target : actionTypes) {
+        for (ActionType target : ACTION_TYPES) {
             if (target.name().equals(type)) {
                 return target;
             }
@@ -584,7 +584,7 @@ public final class ActionManager {
         Logger.assertTrue(type != null);
 
         final List<ActionType> res = new ArrayList<ActionType>();
-        for (ActionType target : actionTypes) {
+        for (ActionType target : ACTION_TYPES) {
             if (!target.equals(type) && target.getType().equals(type.getType())) {
                 res.add(target);
             }
@@ -605,7 +605,7 @@ public final class ActionManager {
         Logger.assertTrue(target != null);
 
         final List<ActionComponent> res = new ArrayList<ActionComponent>();
-        for (ActionComponent subject : actionComponents) {
+        for (ActionComponent subject : ACTION_COMPONENTS) {
             if (subject.appliesTo().equals(target)) {
                 res.add(subject);
             }
@@ -626,7 +626,7 @@ public final class ActionManager {
         Logger.assertTrue(target != null);
 
         final List<ActionComparison> res = new ArrayList<ActionComparison>();
-        for (ActionComparison subject : actionComparisons) {
+        for (ActionComparison subject : ACTION_COMPARISON) {
             if (subject.appliesTo().equals(target)) {
                 res.add(subject);
             }
@@ -641,7 +641,7 @@ public final class ActionManager {
      * @return A list of registered action types
      */
     public static List<ActionType> getTypes() {
-        return actionTypes;
+        return ACTION_TYPES;
     }
 
     /**
@@ -650,7 +650,7 @@ public final class ActionManager {
      * @return A list of registered action comparisons
      */
     public static List<ActionComparison> getComparisons() {
-        return actionComparisons;
+        return ACTION_COMPARISON;
     }
 
     /**
@@ -665,7 +665,7 @@ public final class ActionManager {
         Logger.assertTrue(type != null);
         Logger.assertTrue(!type.isEmpty());
 
-        for (ActionComponent target : actionComponents) {
+        for (ActionComponent target : ACTION_COMPONENTS) {
             if (target.name().equals(type)) {
                 return target;
             }
@@ -686,7 +686,7 @@ public final class ActionManager {
         Logger.assertTrue(type != null);
         Logger.assertTrue(!type.isEmpty());
 
-        for (ActionComparison target : actionComparisons) {
+        for (ActionComparison target : ACTION_COMPARISON) {
             if (target.name().equals(type)) {
                 return target;
             }
@@ -719,7 +719,7 @@ public final class ActionManager {
      */
     public static void addListener(final ActionListener listener, final ActionType ... types) {
         for (ActionType type : types) {
-            listeners.add(type, listener);
+            LISTENERS.add(type, listener);
         }
     }
 
@@ -731,7 +731,7 @@ public final class ActionManager {
      */
     public static void removeListener(final ActionListener listener, final ActionType ... types) {
         for (ActionType type : types) {
-            listeners.remove(type, listener);
+            LISTENERS.remove(type, listener);
         }
     }
 
@@ -741,6 +741,6 @@ public final class ActionManager {
      * @param listener The listener to be removed
      */
     public static void removeListener(final ActionListener listener) {
-        listeners.removeFromAll(listener);
+        LISTENERS.removeFromAll(listener);
     }
 }

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -27,7 +27,6 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionListener;
 import java.util.HashMap;
 import java.util.Map;

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -167,10 +167,10 @@ public class PerformWrapper extends ActionGroup {
     }
     
     /** A singleton instance of the Perform Wrapper. */
-    private static PerformWrapper me = new PerformWrapper();
+    private static final PerformWrapper ME = new PerformWrapper();
 
     /** The component name for per-profile perform conditions. */
-    private static String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
+    private static final String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
     
     /**
      * Creates a new instance of PerformWrapper.
@@ -185,7 +185,7 @@ public class PerformWrapper extends ActionGroup {
      * @return A singleton instance of PerformWrapper
      */
     public static PerformWrapper getPerformWrapper() {
-        return me;
+        return ME;
     }
     
     /** {@inheritDoc} */
@@ -247,7 +247,9 @@ public class PerformWrapper extends ActionGroup {
                         perform.getProfile());
                 action.setResponse(content);
                 action.save();
-            } if (action != null) {
+            }
+
+            if (action != null) {
                 if (empty) {
                     // They want to clear the perform but we have an action
                     deleteAction(action);

src/com/dmdirc/commandparser/CommandManager.java

@@ -52,11 +52,11 @@ import java.util.Map;
 public final class CommandManager {
     
     /** A list of commands that have been instansiated. */
-    private static final Map<CommandInfo, Command> commands
+    private static final Map<CommandInfo, Command> COMMANDS
             = new HashMap<CommandInfo, Command>();
     
     /** A list of command parsers that have been instansiated. */
-    private static final MapList<CommandType, CommandParser> parsers
+    private static final MapList<CommandType, CommandParser> PARSERS
             = new MapList<CommandType, CommandParser>();
     
     /** The command char we're using. */
@@ -123,7 +123,7 @@ public final class CommandManager {
      * @since 0.6.3m1
      */
     public static void unregisterCommand(final CommandInfo info) {
-        registerCommand(info, commands.get(info), false);
+        registerCommand(info, COMMANDS.get(info), false);
     }
     
     /**
@@ -137,14 +137,14 @@ public final class CommandManager {
      */
     private static void registerCommand(final CommandInfo info, final Command command,
             final boolean register) {
-        if (parsers.containsKey(info.getType())) {
-            registerCommand(info, command, parsers.get(info.getType()), register);
+        if (PARSERS.containsKey(info.getType())) {
+            registerCommand(info, command, PARSERS.get(info.getType()), register);
         }
         
         if (register) {
-            commands.put(info, command);
+            COMMANDS.put(info, command);
         } else {
-            commands.remove(info);
+            COMMANDS.remove(info);
         }
 
         registerCommandName(info, register);
@@ -326,7 +326,7 @@ public final class CommandManager {
                     parser.registerCommand(pair.getValue(), pair.getKey());
                 }
 
-                parsers.add(type, parser);
+                PARSERS.add(type, parser);
             }
         }
     }
@@ -408,7 +408,7 @@ public final class CommandManager {
             final String name) {
         final Map<CommandInfo, Command> res = new HashMap<CommandInfo, Command>();
         
-        for (Map.Entry<CommandInfo, Command> entry : commands.entrySet()) {
+        for (Map.Entry<CommandInfo, Command> entry : COMMANDS.entrySet()) {
             if ((type == null || type.equals(entry.getKey().getType()))
                     && (name == null || name.equals(entry.getKey().getName()))) {
                 res.put(entry.getKey(), entry.getValue());

src/com/dmdirc/config/CipherUtils.java

@@ -63,7 +63,7 @@ public class CipherUtils {
     private Cipher dcipher;
     
     /** Salt. */
-    private final byte[] SALT = {
+    private static final byte[] SALT = {
         (byte) 0xA9, (byte) 0x9B, (byte) 0xC8, (byte) 0x32,
         (byte) 0x56, (byte) 0x35, (byte) 0xE3, (byte) 0x03,
     };

src/com/dmdirc/config/ConfigManager.java

@@ -44,7 +44,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         IdentityListener {
 
     /** Temporary map for lookup stats. */
-    private static final Map<String, Integer> stats = new TreeMap<String, Integer>();
+    private static final Map<String, Integer> STATS = new TreeMap<String, Integer>();
 
     /** A logger for this class. */
     private static final java.util.logging.Logger LOGGER = java.util.logging
@@ -403,7 +403,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         final String key = domain + "." + option;
 
         try {
-            stats.put(key, 1 + (stats.containsKey(key) ? stats.get(key) : 0));
+            STATS.put(key, 1 + (STATS.containsKey(key) ? STATS.get(key) : 0));
         } catch (NullPointerException ex) {
             // JVM bugs ftl.
         }
@@ -415,7 +415,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
      * @return A map of config options to lookup counts
      */
     public static Map<String, Integer> getStats() {
-        return stats;
+        return STATS;
     }
 
     /**

src/com/dmdirc/config/IdentityManager.java

@@ -57,7 +57,7 @@ public final class IdentityManager {
      * Standard identities are inserted with a <code>null</code> key, custom
      * identities use their custom type as the key.
      */
-    private static final MapList<String, Identity> identities
+    private static final MapList<String, Identity> IDENTITIES
             = new MapList<String, Identity>();
     
     /**
@@ -66,7 +66,7 @@ public final class IdentityManager {
      * Listeners for standard identities are inserted with a <code>null</code>
      * key, listeners for a specific custom type use their type as the key.
      */
-    private static final MapList<String, IdentityListener> listeners
+    private static final MapList<String, IdentityListener> LISTENERS
             = new WeakMapList<String, IdentityListener>();
 
     /** A logger for this class. */
@@ -96,8 +96,8 @@ public final class IdentityManager {
      *                                      file.
      */
     public static void load() throws InvalidIdentityFileException {
-        identities.clear();
-        identities.clear();
+        IDENTITIES.clear();
+        IDENTITIES.clear();
 
         loadVersion();
         loadDefaults();
@@ -269,7 +269,7 @@ public final class IdentityManager {
      * @param file The file to load the identity from.
      */
     private static void loadIdentity(final File file) {
-        synchronized (identities) {
+        synchronized (IDENTITIES) {
             for (Identity identity : getAllIdentities()) {
                 if (identity.isFile(file)) {
                     try {
@@ -309,7 +309,7 @@ public final class IdentityManager {
     private static Set<Identity> getAllIdentities() {
         final Set<Identity> res = new LinkedHashSet<Identity>();
 
-        for (Map.Entry<String, List<Identity>> entry : identities.entrySet()) {
+        for (Map.Entry<String, List<Identity>> entry : IDENTITIES.entrySet()) {
             res.addAll(entry.getValue());
         }
 
@@ -398,7 +398,7 @@ public final class IdentityManager {
      * Saves all modified identity files to disk.
      */
     public static void save() {
-        synchronized (identities) {
+        synchronized (IDENTITIES) {
             for (Identity identity : getAllIdentities()) {
                 identity.save();
             }
@@ -415,18 +415,18 @@ public final class IdentityManager {
 
         final String target = getGroup(identity);
 
-        if (identities.containsValue(target, identity)) {
+        if (IDENTITIES.containsValue(target, identity)) {
             removeIdentity(identity);
         }
 
-        synchronized (identities) {
-            identities.add(target, identity);
+        synchronized (IDENTITIES) {
+            IDENTITIES.add(target, identity);
         }
 
         LOGGER.finer("Adding identity: " + identity + " (group: " + target + ")");
 
-        synchronized (listeners) {
-            for (IdentityListener listener : listeners.safeGet(target)) {
+        synchronized (LISTENERS) {
+            for (IdentityListener listener : LISTENERS.safeGet(target)) {
                 listener.identityAdded(identity);
             }
         }
@@ -445,14 +445,14 @@ public final class IdentityManager {
 
         final String group = getGroup(identity);
 
-        Logger.assertTrue(identities.containsValue(group, identity));
+        Logger.assertTrue(IDENTITIES.containsValue(group, identity));
         
-        synchronized (identities) {
-            identities.remove(group, identity);
+        synchronized (IDENTITIES) {
+            IDENTITIES.remove(group, identity);
         }
         
-        synchronized (listeners) {
-            for (IdentityListener listener : listeners.safeGet(group)) {
+        synchronized (LISTENERS) {
+            for (IdentityListener listener : LISTENERS.safeGet(group)) {
                 listener.identityRemoved(identity);
             }
         }
@@ -494,8 +494,8 @@ public final class IdentityManager {
     public static void addIdentityListener(final String type, final IdentityListener listener) {
         Logger.assertTrue(listener != null);
         
-        synchronized (listeners) {
-            listeners.add(type, listener);
+        synchronized (LISTENERS) {
+            LISTENERS.add(type, listener);
         }
     }
     
@@ -519,7 +519,7 @@ public final class IdentityManager {
      * @since 0.6.4
      */
     public static List<Identity> getCustomIdentities(final String type) {
-        return Collections.unmodifiableList(identities.safeGet(type));
+        return Collections.unmodifiableList(IDENTITIES.safeGet(type));
     }
     
     /**
@@ -533,8 +533,8 @@ public final class IdentityManager {
         
         final List<Identity> sources = new ArrayList<Identity>();
         
-        synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+        synchronized (IDENTITIES) {
+            for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (manager.identityApplies(identity)) {
                     sources.add(identity);
                 }
@@ -584,8 +584,8 @@ public final class IdentityManager {
 
         final String myTarget = (channel + "@" + network).toLowerCase();
         
-        synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+        synchronized (IDENTITIES) {
+            for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.CHANNEL
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -621,8 +621,8 @@ public final class IdentityManager {
 
         final String myTarget = network.toLowerCase();
         
-        synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+        synchronized (IDENTITIES) {
+            for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.NETWORK
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -658,8 +658,8 @@ public final class IdentityManager {
         
         final String myTarget = server.toLowerCase();
         
-        synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+        synchronized (IDENTITIES) {
+            for (Identity identity : IDENTITIES.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.SERVER
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;

src/com/dmdirc/installer/Settings.java

@@ -32,33 +32,33 @@ public interface Settings {
      *
      * @return shortcutMenu checkbox state
      */
-    public boolean getShortcutMenuState();
+    boolean getShortcutMenuState();
 
     /**
      * Returns the state of the shortcutDesktop checkbox.
      *
      * @return shortcutDesktop checkbox state
      */
-    public boolean getShortcutDesktopState();
+    boolean getShortcutDesktopState();
 
     /**
      * Returns the state of the shortcutDesktop checkbox.
      *
      * @return shortcutDesktop checkbox state
      */
-    public boolean getShortcutQuickState();
+    boolean getShortcutQuickState();
 
     /**
      * Returns the state of the shortcutProtocol checkbox.
      *
      * @return shortcutDesktop checkbox state
      */
-    public boolean getShortcutProtocolState();
+    boolean getShortcutProtocolState();
 
     /**
      * Returns the location chosen for installation.
      *
      * @return location chosen for installation.
      */
-    public String getInstallLocation();
+    String getInstallLocation();
 }

src/com/dmdirc/installer/Step.java

@@ -35,19 +35,19 @@ public interface Step {
      * 
      * @return Step name
      */
-    public abstract String getStepName();
+    String getStepName();
     
     /**
      * Returns the description for this step.
      * 
      * @return Step description
      */
-    public abstract String getStepDescription();
+    String getStepDescription();
     
     /**
      * Returns the icon for this step.
      * 
      * @return Step icon
      */
-    public abstract Image getIcon();
+    Image getIcon();
 }

src/com/dmdirc/installer/TextStep.java

@@ -26,17 +26,19 @@ package com.dmdirc.installer;
  * Quick access methods for a step to have a controllable text field.
  */
 public interface TextStep {
-	/**
-	 * Add text to the infolabel on this step
-	 *
-	 * @param text Text to add to infoLabel
-	 */
-	public void addText(final String text);
-	
-	/**
-	 * Sets the text in the infolabel on this step
-	 *
-	 * @param text Text to set the infoLabel to
-	 */
-	public void setText(final String text);
+
+    /**
+     * Add text to the infolabel on this step
+     *
+     * @param text Text to add to infoLabel
+     */
+    void addText(final String text);
+
+    /**
+     * Sets the text in the infolabel on this step
+     *
+     * @param text Text to set the infoLabel to
+     */
+    void setText(final String text);
+
 }

src/com/dmdirc/installer/WindowsInstaller.java

@@ -186,7 +186,7 @@ public class WindowsInstaller extends Installer {
      *            Command array to execute/
      * @return return value from command, or -1 if there was an error.
      */
-    private int execAndWait(final String cmd[]) {
+    private int execAndWait(final String[] cmd) {
         try {
             final Process myProcess = Runtime.getRuntime().exec(cmd);
             new StreamReader(myProcess.getInputStream()).start();

src/com/dmdirc/installer/cliparser/CLIParam.java

@@ -26,65 +26,66 @@ package com.dmdirc.installer.cliparser;
  * Command Line argument type.
  */
 public abstract class CLIParam {
-	/** Single Character flag for this param. */
-	private final char charFlag;
-	/** String flag for this param. */
-	private final String stringFlag;
-	/** Description of this flag. */
-	private final String description;
-	/** Number of times this param has been given. */
-	private int number;
-	
-	/**
-	 * Create a new CLIParam.
-	 *
-	 * @param chr Single Character flag for this param.
-	 * @param str String flag for this param.
-	 * @param desc Description of this flag.
-	 */
-	protected CLIParam(final char chr, final String str, final String desc) {
-		charFlag = chr;
-		stringFlag = str;
-		description = desc;
-	}
-	
-	/**
-	 * Get the single character flag for this param.
-	 */
-	public final char getChr() { return charFlag; }
-	
-	/**
-	 * Get the string flag for this param.
-	 */
-	public final String getString() { return stringFlag; }
-	
-	/**
-	 * Get the description for this param.
-	 */
-	public final String getDescription() { return description; }
-	
-	/**
-	 * Get the number of times this value has been given.
-	 */
-	public final int getNumber() { return number; }
-	
-	/**
-	 * Increment the number of times this value has been given.
-	 */
-	public final void incNumber() { ++number; }
-	
-	/**
-	 * Set the value of this param to the value given by a string.
-	 *
-	 * @param value String taken from command line to use as value.
-	 * @return true if value was valid, else false.
-	 */
-	public abstract boolean setValue(final String value);
-	
-	/**
-	 * Return the value of this param as a string.
-	 *
-	 * @return The value of this param as a string.
-	 */
-	public abstract String getStringValue();
+
+    /** Single Character flag for this param. */
+    private final char charFlag;
+    /** String flag for this param. */
+    private final String stringFlag;
+    /** Description of this flag. */
+    private final String description;
+    /** Number of times this param has been given. */
+    private int number;
+
+    /**
+     * Create a new CLIParam.
+     *
+     * @param chr Single Character flag for this param.
+     * @param str String flag for this param.
+     * @param desc Description of this flag.
+     */
+    protected CLIParam(final char chr, final String str, final String desc) {
+        charFlag = chr;
+        stringFlag = str;
+        description = desc;
+    }
+
+    /**
+     * Get the single character flag for this param.
+     */
+    public final char getChr() { return charFlag; }
+
+    /**
+     * Get the string flag for this param.
+     */
+    public final String getString() { return stringFlag; }
+
+    /**
+     * Get the description for this param.
+     */
+    public final String getDescription() { return description; }
+
+    /**
+     * Get the number of times this value has been given.
+     */
+    public final int getNumber() { return number; }
+
+    /**
+     * Increment the number of times this value has been given.
+     */
+    public final void incNumber() { ++number; }
+
+    /**
+     * Set the value of this param to the value given by a string.
+     *
+     * @param value String taken from command line to use as value.
+     * @return true if value was valid, else false.
+     */
+    public abstract boolean setValue(final String value);
+
+    /**
+     * Return the value of this param as a string.
+     *
+     * @return The value of this param as a string.
+     */
+    public abstract String getStringValue();
 }

src/com/dmdirc/installer/cliparser/CLIParser.java

@@ -87,7 +87,7 @@ public class CLIParser {
      */
     public boolean add(final CLIParam param) {
         final boolean validChar = param.getChr() == 0
-                || !params.containsKey(param.getChr());
+                || !params.containsKey(String.valueOf(param.getChr()));
         final boolean validString = param.getString().isEmpty()
                 || !params.containsKey("-" + param.getString());
         if (validChar && validString) {

src/com/dmdirc/installer/cliparser/StringParam.java

@@ -26,46 +26,47 @@ package com.dmdirc.installer.cliparser;
  * Command Line argument type.
  */
 public class StringParam extends CLIParam {
-	/** The value of this param. */
-	private String myValue = "";
-	
-	/**
-	 * Create a new StringParam.
-	 *
-	 * @param chr Single Character flag for this param.
-	 * @param str String flag for this param.
-	 * @param desc Description of this flag.
-	 */
-	public StringParam(final char chr, final String str, final String desc) {
-		super(chr, str, desc);
-	}
-	
-	/**
-	 * Set the value of this param to the value given by a string.
-	 *
-	 * @param value String taken from command line to use as value.
-	 * @return true if value was valid, else false.
-	 */
-	public boolean setValue(final String value) {
-		myValue = value;
-		return true;
-	}
-	
-	/**
-	 * Get the value of this param.
-	 *
-	 * @return Value of this parameter
-	 */
-	public String getValue() {
-		return myValue;
-	}
-	
-	/**
-	 * Return the value of this param as a string.
-	 *
-	 * @return The value of this param as a string.
-	 */
-	public String getStringValue() {
-		return getValue();
-	}
+
+    /** The value of this param. */
+    private String myValue = "";
+
+    /**
+    * Create a new StringParam.
+    *
+    * @param chr Single Character flag for this param.
+    * @param str String flag for this param.
+    * @param desc Description of this flag.
+    */
+    public StringParam(final char chr, final String str, final String desc) {
+        super(chr, str, desc);
+    }
+
+    /**
+    * Set the value of this param to the value given by a string.
+    *
+    * @param value String taken from command line to use as value.
+    * @return true if value was valid, else false.
+    */
+    public boolean setValue(final String value) {
+        myValue = value;
+        return true;
+    }
+
+    /**
+    * Get the value of this param.
+    *
+    * @return Value of this parameter
+    */
+    public String getValue() {
+        return myValue;
+    }
+
+    /**
+    * Return the value of this param as a string.
+    *
+    * @return The value of this param as a string.
+    */
+    public String getStringValue() {
+        return getValue();
+    }
 }

src/com/dmdirc/installer/ui/StepSettings.java

@@ -76,24 +76,24 @@ public final class StepSettings extends SwingStep implements Settings {
         shortcutProtocol.setSelected(defaultSettings.getShortcutProtocolState());
 
         final GridBagConstraints constraints = new GridBagConstraints();
-		setLayout(new GridBagLayout());
+        setLayout(new GridBagLayout());
 
         constraints.weightx = 1.0;
-		constraints.fill = GridBagConstraints.BOTH;
-		constraints.gridx = 0;
-		constraints.gridy = 0;
-		constraints.gridwidth = 2;
+        constraints.fill = GridBagConstraints.BOTH;
+        constraints.gridx = 0;
+        constraints.gridy = 0;
+        constraints.gridwidth = 2;
         add(new TextLabel("Here you can choose options for the install." +
                           "\n\nInstall Location:"), constraints);
 
         constraints.fill = GridBagConstraints.HORIZONTAL;
-		constraints.gridx = 1;
+        constraints.gridx = 1;
         constraints.gridy = 1;
         add(location, constraints);
 
         constraints.gridwidth = 2;
-		constraints.gridx = 0;
-		constraints.insets = new Insets(InstallerDialog.SMALL_GAP, 0, 0, 0);
+        constraints.gridx = 0;
+        constraints.insets = new Insets(InstallerDialog.SMALL_GAP, 0, 0, 0);
 
         if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
             constraints.gridy = (constraints.gridy + 1);
@@ -113,8 +113,8 @@ public final class StepSettings extends SwingStep implements Settings {
         }
 
         constraints.gridy = (constraints.gridy + 1);
-		constraints.weighty = 1.0;
-		constraints.fill = GridBagConstraints.BOTH;
+        constraints.weighty = 1.0;
+        constraints.fill = GridBagConstraints.BOTH;
         add(Box.createVerticalGlue(), constraints);
     }
 

src/com/dmdirc/logger/ErrorManager.java

@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicLong;
 public final class ErrorManager implements ConfigChangeListener {
 
     /** Previously instantiated instance of ErrorManager. */
-    private static final ErrorManager me = new ErrorManager();
+    private static final ErrorManager ME = new ErrorManager();
 
     /** A list of exceptions which we don't consider bugs and thus don't report. */
     private static final Class[] BANNED_EXCEPTIONS = new Class[]{
@@ -92,8 +92,8 @@ public final class ErrorManager implements ConfigChangeListener {
      * @return Instance of ErrorManager
      */
     public static ErrorManager getErrorManager() {
-        synchronized (me) {
-            return me;
+        synchronized (ME) {
+            return ME;
         }
     }
 

src/com/dmdirc/logger/Logger.java

@@ -27,8 +27,8 @@ package com.dmdirc.logger;
  */
 public final class Logger {
 
-    /** The manager to use to report errors. */
-    protected static final ErrorManager manager = ErrorManager.getErrorManager();
+    /** The MANAGER to use to report errors. */
+    protected static final ErrorManager MANAGER = ErrorManager.getErrorManager();
        
     /** Prevent instantiation of a new instance of Logger. */
     private Logger() {
@@ -42,7 +42,7 @@ public final class Logger {
      * @param message Brief error description
      */
     public static void userError(final ErrorLevel level, final String message) {
-        manager.addError(level, message);
+        MANAGER.addError(level, message);
     }
     
     /**
@@ -54,7 +54,7 @@ public final class Logger {
      */
     public static void userError(final ErrorLevel level, final String message,
             final String details) {
-        manager.addError(level, message, new String[]{details}, false);
+        MANAGER.addError(level, message, new String[]{details}, false);
     }
     
     /**
@@ -66,7 +66,7 @@ public final class Logger {
      */
     public static void userError(final ErrorLevel level,
             final String message, final Throwable exception) {
-        manager.addError(level, message, exception, false);
+        MANAGER.addError(level, message, exception, false);
     }
     
     /**
@@ -79,7 +79,7 @@ public final class Logger {
      */
     public static void appError(final ErrorLevel level,
             final String message, final Throwable exception) {
-        manager.addError(level, message, exception, true);
+        MANAGER.addError(level, message, exception, true);
     }
     
     /**

src/com/dmdirc/logger/ProgramError.java

@@ -60,7 +60,7 @@ public final class ProgramError implements Serializable {
     private static File errorDir;
 
     /** Semaphore used to serialise write access. */
-    private static final Semaphore writingSem = new Semaphore(1);
+    private static final Semaphore WRITING_SEM = new Semaphore(1);
     
     /** Error ID. */
     private final long id;
@@ -269,7 +269,7 @@ public final class ProgramError implements Serializable {
      */
     @SuppressWarnings("PMD.SystemPrintln")
     private OutputStream getErrorFile() {
-        writingSem.acquireUninterruptibly();
+        WRITING_SEM.acquireUninterruptibly();
         
         if (errorDir == null || !errorDir.exists()) {
             errorDir = new File(Main.getConfigDir() + "errors");
@@ -299,7 +299,7 @@ public final class ProgramError implements Serializable {
             ex.printStackTrace();
             return new NullOutputStream();
         } finally {
-            writingSem.release();
+            WRITING_SEM.release();
         }
     }
 

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -64,7 +64,7 @@ public final class GlobalClassLoader extends ClassLoader {
      *
      * @return A singleton instance of GlobalClassLoader.
      */
-    public static final synchronized GlobalClassLoader getGlobalClassLoader() {
+    public static synchronized GlobalClassLoader getGlobalClassLoader() {
         if (me == null) {
             me = new GlobalClassLoader();
         }

src/com/dmdirc/plugins/PluginManager.java

@@ -321,7 +321,7 @@ public class PluginManager implements ActionListener {
             return false;
         }
 
-	final PluginInfo pluginInfo = getPluginInfo(filename);
+        final PluginInfo pluginInfo = getPluginInfo(filename);
         final boolean wasLoaded = pluginInfo.isLoaded();
 
         if (wasLoaded && !pluginInfo.isUnloadable()) { return false; }

src/com/dmdirc/ui/WindowManager.java

@@ -48,19 +48,19 @@ import java.util.concurrent.CopyOnWriteArrayList;
 public class WindowManager {
 
     /** A list of root windows. */
-    private final static List<FrameContainer<?>> rootWindows
+    private static final List<FrameContainer<?>> ROOT_WINDOWS
             = new CopyOnWriteArrayList<FrameContainer<?>>();
     
     /** A list of frame listeners. */
-    private final static List<FrameListener> frameListeners
+    private static final List<FrameListener> FRAME_LISTENERS
             = new ArrayList<FrameListener>();
     
     /** A list of selection listeners. */
-    private final static List<SelectionListener> selListeners
+    private static final List<SelectionListener> SELECTION_LISTENERS
             = new ArrayList<SelectionListener>();
     
     /** Our selection listener proxy. */
-    private static final SelectionListener selectionListener
+    private static final SelectionListener SELECTION_LISTENER
             = new WMSelectionListener();
 
     /** Active window. */
@@ -84,9 +84,9 @@ public class WindowManager {
     })
     public static void addFrameListener(final FrameListener frameListener) {
         Logger.assertTrue(frameListener != null);
-        Logger.assertTrue(!frameListeners.contains(frameListener));
+        Logger.assertTrue(!FRAME_LISTENERS.contains(frameListener));
 
-        frameListeners.add(frameListener);
+        FRAME_LISTENERS.add(frameListener);
     }
 
     /**
@@ -100,9 +100,9 @@ public class WindowManager {
     })
     public static void removeFrameListener(final FrameListener frameListener) {
         Logger.assertTrue(frameListener != null);
-        Logger.assertTrue(frameListeners.contains(frameListener));
+        Logger.assertTrue(FRAME_LISTENERS.contains(frameListener));
 
-        frameListeners.remove(frameListener);
+        FRAME_LISTENERS.remove(frameListener);
     }
     
     /**
@@ -111,7 +111,7 @@ public class WindowManager {
      * @param listener The listener to be added
      */
     public static void addSelectionListener(final SelectionListener listener) {
-        selListeners.add(listener);
+        SELECTION_LISTENERS.add(listener);
     }
     
     /**
@@ -120,7 +120,7 @@ public class WindowManager {
      * @param listener The listener to be removed
      */
     public static void removeSelectionListener(final SelectionListener listener) {
-        selListeners.remove(listener);
+        SELECTION_LISTENERS.remove(listener);
     }
 
     /**
@@ -150,11 +150,11 @@ public class WindowManager {
     })
     public static void addWindow(final FrameContainer<?> window, final boolean focus) {
         Logger.assertTrue(window != null);
-        Logger.assertTrue(!rootWindows.contains(window));
+        Logger.assertTrue(!ROOT_WINDOWS.contains(window));
 
-        rootWindows.add(window);
+        ROOT_WINDOWS.add(window);
 
-        window.addSelectionListener(selectionListener);
+        window.addSelectionListener(SELECTION_LISTENER);
 
         fireAddWindow(window, focus);
     }
@@ -224,7 +224,7 @@ public class WindowManager {
 
         parent.addChild(child);
 
-        child.addSelectionListener(selectionListener);
+        child.addSelectionListener(SELECTION_LISTENER);
 
         fireAddWindow(parent, child, focus);
     }
@@ -239,7 +239,7 @@ public class WindowManager {
      * @return True if the target is in the hierarchy, false otherise
      */
     protected static boolean isInHierarchy(final FrameContainer<?> target) {
-        return target != null && (rootWindows.contains(target)
+        return target != null && (ROOT_WINDOWS.contains(target)
                 || isInHierarchy(target.getParent()));
     }
 
@@ -330,11 +330,11 @@ public class WindowManager {
             }
         }
 
-        if (rootWindows.contains(window)) {
+        if (ROOT_WINDOWS.contains(window)) {
             fireDeleteWindow(window);
-            rootWindows.remove(window);
+            ROOT_WINDOWS.remove(window);
 
-            if (rootWindows.isEmpty()) {
+            if (ROOT_WINDOWS.isEmpty()) {
                 // Last root window has been removed, show that the selected
                 // window is now null
                 fireSelectionChanged(null);
@@ -354,7 +354,7 @@ public class WindowManager {
             }
         }
         
-        window.removeSelectionListener(selectionListener);
+        window.removeSelectionListener(SELECTION_LISTENER);
         window.windowClosed();
     }
 
@@ -369,7 +369,7 @@ public class WindowManager {
     public static FrameContainer<?> findCustomWindow(final String name) {
         Logger.assertTrue(name != null);
 
-        return findCustomWindow(rootWindows, name);
+        return findCustomWindow(ROOT_WINDOWS, name);
     }
 
     /**
@@ -434,7 +434,7 @@ public class WindowManager {
      * @return A collection of all known root windows.
      */
     public static Collection<FrameContainer<?>> getRootWindows() {
-        return rootWindows;
+        return ROOT_WINDOWS;
     }
 
     /**
@@ -477,7 +477,7 @@ public class WindowManager {
      * @param focus Should this window become focused
      */
     private static void fireAddWindow(final FrameContainer<?> window, final boolean focus) {
-        for (FrameListener listener : frameListeners) {
+        for (FrameListener listener : FRAME_LISTENERS) {
             listener.addWindow(window, focus);
         }
     }
@@ -492,7 +492,7 @@ public class WindowManager {
      */
     private static void fireAddWindow(final FrameContainer<?> parent,
             final FrameContainer<?> child, final boolean focus) {
-        for (FrameListener listener : frameListeners) {
+        for (FrameListener listener : FRAME_LISTENERS) {
             listener.addWindow(parent, child, focus);
         }
     }
@@ -503,7 +503,7 @@ public class WindowManager {
      * @param window The window that was removed
      */
     private static void fireDeleteWindow(final FrameContainer<?> window) {
-        for (FrameListener listener : frameListeners) {
+        for (FrameListener listener : FRAME_LISTENERS) {
             listener.delWindow(window);
         }
     }
@@ -516,7 +516,7 @@ public class WindowManager {
      */
     private static void fireDeleteWindow(final FrameContainer<?> parent,
             final FrameContainer<?> child) {
-        for (FrameListener listener : frameListeners) {
+        for (FrameListener listener : FRAME_LISTENERS) {
             listener.delWindow(parent, child);
         }
     }
@@ -528,7 +528,7 @@ public class WindowManager {
      * @param window The window that is now focused (or null)
      */
     private static void fireSelectionChanged(final FrameContainer<?> window) {
-        for (SelectionListener listener : selListeners) {
+        for (SelectionListener listener : SELECTION_LISTENERS) {
             listener.selectionChanged(window);
         }
 

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -44,7 +44,7 @@ public class URLHandler {
     /** Config manager. */
     private final ConfigManager config;
     /** Singleton instance. */
-    private static final URLHandler me = new URLHandler();
+    private static final URLHandler ME = new URLHandler();
     /** Desktop handler. */
     private final Desktop desktop;
     /** The time a browser was last launched. */
@@ -66,8 +66,8 @@ public class URLHandler {
      * @return URLHandler instance
      */
     public static URLHandler getURLHander() {
-        synchronized (me) {
-            return me;
+        synchronized (ME) {
+            return ME;
         }
     }
 

src/com/dmdirc/ui/interfaces/InputWindow.java

@@ -24,7 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.ui.input.InputHandler;
 
 /**

src/com/dmdirc/ui/interfaces/SearchBar.java

@@ -66,7 +66,7 @@ public interface SearchBar {
      * @param text the text to search for
      * @param caseSensitive whether the search is case sensitive
      */
-    public void search(final String text, final boolean caseSensitive);
+    void search(final String text, final boolean caseSensitive);
 
     /**
      * Searches the textpane for text.
@@ -75,6 +75,6 @@ public interface SearchBar {
      * @param text the text to search for
      * @param caseSensitive whether the search is case sensitive
      */
-    public void search(final Direction direction, final String text,
+    void search(final Direction direction, final String text,
             final boolean caseSensitive);
 }

src/com/dmdirc/ui/interfaces/UIController.java

@@ -28,7 +28,6 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.updater.Update;
 

src/com/dmdirc/ui/interfaces/Window.java

@@ -24,7 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.util.StringTranscoder;
 
 /**

src/com/dmdirc/ui/messages/ColourManager.java

@@ -50,7 +50,7 @@ public final class ColourManager {
     };
     
     /** Actual colours we're using for the 16 IRC colours. */
-    private static Color[] IRC_COLOURS = DEFAULT_COLOURS.clone();
+    private static Color[] ircColours = DEFAULT_COLOURS.clone();
        
     /** Creates a new instance of ColourManager. */
     private ColourManager() {
@@ -62,11 +62,11 @@ public final class ColourManager {
     private static void initColours() {        
         for (int i = 0; i < 16; i++) {
             if (IdentityManager.getGlobalConfig().hasOptionColour("colour", String.valueOf(i))) {
-                IRC_COLOURS[i] = getColour(IdentityManager.getGlobalConfig()
+                ircColours[i] = getColour(IdentityManager.getGlobalConfig()
                         .getOption("colour", String.valueOf(i)));
                 COLOUR_CACHE.remove(String.valueOf(i));
-            } else if (!IRC_COLOURS[i].equals(DEFAULT_COLOURS[i])) {
-                IRC_COLOURS[i] = DEFAULT_COLOURS[i];
+            } else if (!ircColours[i].equals(DEFAULT_COLOURS[i])) {
+                ircColours[i] = DEFAULT_COLOURS[i];
                 COLOUR_CACHE.remove(String.valueOf(i));
             } 
         }
@@ -160,7 +160,7 @@ public final class ColourManager {
     public static Color getColour(final int number) {
         
         if (number >= 0 && number <= 15) {
-            return IRC_COLOURS[number];
+            return ircColours[number];
         } else {
             Logger.userError(ErrorLevel.MEDIUM, "Invalid colour: " + number);
             return Color.WHITE;

src/com/dmdirc/ui/messages/Formatter.java

@@ -39,7 +39,7 @@ public final class Formatter {
     /**
      * A cache of types needed by the various formatters.
      */
-    private static final Map<String, Character[]> typeCache
+    private static final Map<String, Character[]> TYPE_CACHE
             = new HashMap<String, Character[]>();
    
     /**
@@ -101,14 +101,14 @@ public final class Formatter {
     private static Object[] castArguments(final String format, final Object[] args) {
         assert(format != null);
         
-        if (!typeCache.containsKey(format)) {
+        if (!TYPE_CACHE.containsKey(format)) {
             analyseFormat(format, args);
         }
         
         final Object[] res = new Object[args.length];
         
         int i = 0;
-        for (Character chr : typeCache.get(format)) {
+        for (Character chr : TYPE_CACHE.get(format)) {
             if (i >= args.length) {
                 break;
             }
@@ -221,7 +221,7 @@ public final class Formatter {
             }
         }
         
-        typeCache.put(format, types);
+        TYPE_CACHE.put(format, types);
     }
 
 }

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -122,8 +122,9 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      */
     public void addText(final String[] text) {
         synchronized (lines) {
-            lines.add(new Line(container.getStyliser(), text, fontSize, fontName));
-            fireLineAdded(lines.indexOf(text));
+            final Line line = new Line(container.getStyliser(), text, fontSize, fontName);
+            lines.add(line);
+            fireLineAdded(lines.indexOf(line));
         }
     }
 
@@ -135,8 +136,9 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      */
     public void addText(final String[] text, final int lineHeight) {
         synchronized (lines) {
-            lines.add(new Line(container.getStyliser(), text, lineHeight, fontName));
-            fireLineAdded(lines.indexOf(text));
+            final Line line = new Line(container.getStyliser(), text, lineHeight, fontName);
+            lines.add(line);
+            fireLineAdded(lines.indexOf(line));
         }
     }
 

src/com/dmdirc/ui/messages/Line.java

@@ -156,6 +156,6 @@ public class Line {
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
-        return getLineParts().hashCode();
+        return Arrays.hashCode(getLineParts());
     }
 }

src/com/dmdirc/updater/UpdateChecker.java

@@ -65,26 +65,26 @@ public final class UpdateChecker implements Runnable {
     }
 
     /** Semaphore used to prevent multiple invocations. */
-    private static final Semaphore mutex = new Semaphore(1);
+    private static final Semaphore MUTEX = new Semaphore(1);
 
     /** A list of components that we're to check. */
-    private static final List<UpdateComponent> components
+    private static final List<UpdateComponent> COMPONENTS
             = new ArrayList<UpdateComponent>();
 
     /** Our timer. */
     private static Timer timer = new Timer("Update Checker Timer");
 
     /** The list of updates that are available. */
-    private static final List<Update> updates = new ArrayList<Update>();
+    private static final List<Update> UPDATES = new ArrayList<Update>();
 
     /** A list of our listeners. */
-    private static final ListenerList listeners = new ListenerList();
+    private static final ListenerList LISTENERS = new ListenerList();
 
     /** Our current state. */
     private static STATE status = STATE.IDLE;
 
     /** A reference to the listener we use for update status changes. */
-    private static final UpdateListener listener = new UpdateListener() {
+    private static final UpdateListener LISTENER = new UpdateListener() {
         @Override
         public void updateStatusChange(final Update update, final UpdateStatus status) {
             if (status == UpdateStatus.INSTALLED
@@ -103,9 +103,9 @@ public final class UpdateChecker implements Runnable {
     };
 
     static {
-        components.add(new ClientComponent());
-        components.add(new ModeAliasesComponent());
-        components.add(new DefaultsComponent());
+        COMPONENTS.add(new ClientComponent());
+        COMPONENTS.add(new ModeAliasesComponent());
+        COMPONENTS.add(new DefaultsComponent());
     }
 
     /**
@@ -118,7 +118,7 @@ public final class UpdateChecker implements Runnable {
     /** {@inheritDoc} */
     @Override
     public void run() {
-        if (!mutex.tryAcquire()) {
+        if (!MUTEX.tryAcquire()) {
             // Duplicate invocation
 
             return;
@@ -131,7 +131,7 @@ public final class UpdateChecker implements Runnable {
             IdentityManager.getConfigIdentity().setOption("updater",
                     "lastcheck", String.valueOf((int) (new Date().getTime() / 1000)));
         
-            mutex.release();
+            MUTEX.release();
             init();
             return;
         }
@@ -139,9 +139,9 @@ public final class UpdateChecker implements Runnable {
         setStatus(STATE.CHECKING);
 
         // Remove any existing update that isn't waiting for a restart.
-        for (Update update : new ArrayList<Update>(updates)) {
+        for (Update update : new ArrayList<Update>(UPDATES)) {
             if (update.getStatus() != UpdateStatus.RESTART_NEEDED) {
-                updates.remove(update);
+                UPDATES.remove(update);
             }
         }
 
@@ -149,7 +149,7 @@ public final class UpdateChecker implements Runnable {
         final String updateChannel = config.getOption("updater", "channel");
 
         // Build the data string to send to the server
-        for (UpdateComponent component : components) {
+        for (UpdateComponent component : COMPONENTS) {
             if (isEnabled(component)) {
                 data.append(component.getName());
                 data.append(',');
@@ -177,14 +177,14 @@ public final class UpdateChecker implements Runnable {
             }
         }
 
-        if (updates.isEmpty()) {
+        if (UPDATES.isEmpty()) {
             setStatus(STATE.IDLE);
         } else {
             boolean available = false;
 
             // Check to see if the updates are outstanding or just waiting for
             // a restart
-            for (Update update : updates) {
+            for (Update update : UPDATES) {
                 if (update.getStatus() == UpdateStatus.PENDING) {
                     available = true;
                 }
@@ -193,7 +193,7 @@ public final class UpdateChecker implements Runnable {
             setStatus(available ? STATE.UPDATES_AVAILABLE : STATE.RESTART_REQUIRED);
         }
 
-        mutex.release();
+        MUTEX.release();
         
         IdentityManager.getConfigIdentity().setOption("updater",
                 "lastcheck", String.valueOf((int) (new Date().getTime() / 1000)));
@@ -240,8 +240,8 @@ public final class UpdateChecker implements Runnable {
         final Update update = new Update(line);
 
         if (update.getUrl() != null) {
-            updates.add(update);
-            update.addUpdateListener(listener);
+            UPDATES.add(update);
+            update.addUpdateListener(LISTENER);
         }
     }
 
@@ -292,7 +292,7 @@ public final class UpdateChecker implements Runnable {
      * @param component The component to be registered
      */
     public static void registerComponent(final UpdateComponent component) {
-        components.add(component);
+        COMPONENTS.add(component);
     }
 
     /**
@@ -303,14 +303,14 @@ public final class UpdateChecker implements Runnable {
     public static void removeComponent(final String name) {
         UpdateComponent target = null;
 
-        for (UpdateComponent component : components) {
+        for (UpdateComponent component : COMPONENTS) {
             if (name.equals(component.getName())) {
                 target = component;
             }
         }
 
         if (target != null) {
-            components.remove(target);
+            COMPONENTS.remove(target);
         }
     }
 
@@ -324,7 +324,7 @@ public final class UpdateChecker implements Runnable {
     public static UpdateComponent findComponent(final String name) {
         assert(name != null);
 
-        for (UpdateComponent component : components) {
+        for (UpdateComponent component : COMPONENTS) {
             if (name.equals(component.getName())) {
                 return component;
             }
@@ -341,10 +341,10 @@ public final class UpdateChecker implements Runnable {
      * @param update The update to be removed
      */
     public static void removeUpdate(final Update update) {
-        update.removeUpdateListener(listener);
-        updates.remove(update);
+        update.removeUpdateListener(LISTENER);
+        UPDATES.remove(update);
 
-        if (updates.isEmpty()) {
+        if (UPDATES.isEmpty()) {
             setStatus(STATE.IDLE);
         } else if (status == STATE.UPDATING) {
             doNextUpdate();
@@ -355,7 +355,7 @@ public final class UpdateChecker implements Runnable {
      * Downloads and installs all known updates.
      */
     public static void applyUpdates() {
-        if (!updates.isEmpty()) {
+        if (!UPDATES.isEmpty()) {
             setStatus(STATE.UPDATING);
             doNextUpdate();
         }
@@ -368,7 +368,7 @@ public final class UpdateChecker implements Runnable {
     private static void doNextUpdate() {
         boolean restart = false;
         
-        for (Update update : updates) {
+        for (Update update : UPDATES) {
             if (update.getStatus() == UpdateStatus.PENDING) {
                 update.doUpdate();
                 return;
@@ -386,7 +386,7 @@ public final class UpdateChecker implements Runnable {
      * @return A list of registered components
      */
     public static List<UpdateComponent> getComponents() {
-        return components;
+        return COMPONENTS;
     }
 
     /**
@@ -395,7 +395,7 @@ public final class UpdateChecker implements Runnable {
      * @return A list of available updates
      */
     public static List<Update> getAvailableUpdates() {
-        return updates;
+        return UPDATES;
     }
 
 
@@ -405,7 +405,7 @@ public final class UpdateChecker implements Runnable {
      * @param listener The listener to be added
      */
     public static void addListener(final UpdateCheckerListener listener) {
-        listeners.add(UpdateCheckerListener.class, listener);
+        LISTENERS.add(UpdateCheckerListener.class, listener);
     }
 
     /**
@@ -414,7 +414,7 @@ public final class UpdateChecker implements Runnable {
      * @param listener The listener to be removed
      */
     public static void removeListener(final UpdateCheckerListener listener) {
-        listeners.remove(UpdateCheckerListener.class, listener);
+        LISTENERS.remove(UpdateCheckerListener.class, listener);
     }
 
     /**
@@ -434,7 +434,7 @@ public final class UpdateChecker implements Runnable {
     private static void setStatus(final STATE newStatus) {
         status = newStatus;
 
-        for (UpdateCheckerListener myListener : listeners.get(UpdateCheckerListener.class)) {
+        for (UpdateCheckerListener myListener : LISTENERS.get(UpdateCheckerListener.class)) {
             myListener.statusChanged(newStatus);
         }
     }

src/com/dmdirc/updater/Version.java

@@ -64,11 +64,11 @@ public class Version implements Comparable<Version> {
         } else if (o.strVersion != null && this.strVersion == null) {
             return -1;
         } else {
-            final String myParts[] = this.strVersion.split("-");
-            final String thParts[] = o.strVersion.split("-");
+            final String[] myParts = this.strVersion.split("-");
+            final String[] thParts = o.strVersion.split("-");
 
-            final String myFirstParts[] = myParts[0].split("\\.|(?=a|b|rc|m)");
-            final String thFirstParts[] = thParts[0].split("\\.|(?=a|b|rc|m)");
+            final String[] myFirstParts = myParts[0].split("\\.|(?=a|b|rc|m)");
+            final String[] thFirstParts = thParts[0].split("\\.|(?=a|b|rc|m)");
 
             for (int i = 0; i < Math.max(myFirstParts.length, thFirstParts.length); i++) {
                 final boolean myExists = myFirstParts.length > i;
@@ -98,8 +98,8 @@ public class Version implements Comparable<Version> {
                 } else if (thIsInt && myIsInt) {
                     return myInt - thInt;
                 } else {
-                    final String myLetterParts[] = myFirstParts[i].split("(?=[0-9])", 2);
-                    final String thLetterParts[] = thFirstParts[i].split("(?=[0-9])", 2);
+                    final String[] myLetterParts = myFirstParts[i].split("(?=[0-9])", 2);
+                    final String[] thLetterParts = thFirstParts[i].split("(?=[0-9])", 2);
 
                     if (myLetterParts[0].equals(thLetterParts[0])) {
                         return Integer.parseInt(myLetterParts[1])

src/com/dmdirc/updater/components/PluginComponent.java

@@ -43,7 +43,7 @@ public class PluginComponent implements UpdateComponent, FileComponent {
     private final PluginInfo plugin;
 
     /** The config to use. */
-    private static final ConfigManager config = IdentityManager.getGlobalConfig();
+    private static final ConfigManager CONFIG = IdentityManager.getGlobalConfig();
 
     /**
      * Creates a new PluginComponent for the specified plugin, to enable it to
@@ -55,7 +55,7 @@ public class PluginComponent implements UpdateComponent, FileComponent {
         this.plugin = plugin;
 
         if ((plugin.getAddonID() > 0 && plugin.getVersion().isValid())
-                || (config.hasOptionInt("plugin-addonid", plugin.getName()))) {
+                || (CONFIG.hasOptionInt("plugin-addonid", plugin.getName()))) {
             UpdateChecker.removeComponent(getName());
             UpdateChecker.registerComponent(this);
         }
@@ -67,7 +67,7 @@ public class PluginComponent implements UpdateComponent, FileComponent {
         if (plugin.getAddonID() > 0) {
             return "addon-" + plugin.getAddonID();
         } else {
-            return "addon-" + config.getOption("plugin-addonid", plugin.getName());
+            return "addon-" + CONFIG.getOption("plugin-addonid", plugin.getName());
         }
     }
 

src/net/miginfocom/Base64.java

@@ -140,7 +140,7 @@ public class Base64 {
      *            little faster.
      * @return A BASE64 encoded array. Never <code>null</code>.
      */
-    public final static char[] encodeToChar(final byte[] sArr,
+    public static final char[] encodeToChar(final byte[] sArr,
             final boolean lineSep) {
         // Check special case
         final int sLen = sArr != null ? sArr.length : 0;
@@ -206,7 +206,7 @@ public class Base64 {
      *         (including '=') isn't divideable by 4. (I.e. definitely
      *         corrupted).
      */
-    public final static byte[] decode(final char[] sArr) {
+    public static final byte[] decode(final char[] sArr) {
         // Check special case
         final int sLen = sArr != null ? sArr.length : 0;
         if (sLen == 0) {
@@ -281,7 +281,7 @@ public class Base64 {
      *            <code>null</code> will throw an exception.
      * @return The decoded array of bytes. May be of length 0.
      */
-    public final static byte[] decodeFast(final char[] sArr) {
+    public static final byte[] decodeFast(final char[] sArr) {
         // Check special case
         final int sLen = sArr.length;
         if (sLen == 0) {
@@ -366,7 +366,7 @@ public class Base64 {
      *            little faster.
      * @return A BASE64 encoded array. Never <code>null</code>.
      */
-    public final static byte[] encodeToByte(final byte[] sArr,
+    public static final byte[] encodeToByte(final byte[] sArr,
             final boolean lineSep) {
         // Check special case
         final int sLen = sArr != null ? sArr.length : 0;
@@ -432,7 +432,7 @@ public class Base64 {
      *         (including '=') isn't divideable by 4. (I.e. definitely
      *         corrupted).
      */
-    public final static byte[] decode(final byte[] sArr) {
+    public static final byte[] decode(final byte[] sArr) {
         // Check special case
         final int sLen = sArr.length;
 
@@ -506,7 +506,7 @@ public class Base64 {
      *            <code>null</code> will throw an exception.
      * @return The decoded array of bytes. May be of length 0.
      */
-    public final static byte[] decodeFast(final byte[] sArr) {
+    public static final byte[] decodeFast(final byte[] sArr) {
         // Check special case
         final int sLen = sArr.length;
         if (sLen == 0) {
@@ -591,7 +591,7 @@ public class Base64 {
      *            little faster.
      * @return A BASE64 encoded array. Never <code>null</code>.
      */
-    public final static String encodeToString(final byte[] sArr,
+    public static final String encodeToString(final byte[] sArr,
             final boolean lineSep) {
         // Reuse char[] since we can't create a String incrementally anyway and
         // StringBuffer/Builder would be slower.
@@ -615,7 +615,7 @@ public class Base64 {
      *         (including '=') isn't divideable by 4. (I.e. definitely
      *         corrupted).
      */
-    public final static byte[] decode(final String str) {
+    public static final byte[] decode(final String str) {
         // Check special case
         final int sLen = str != null ? str.length() : 0;
         if (sLen == 0) {
@@ -691,7 +691,7 @@ public class Base64 {
      *            <code>null</code> will throw an exception.
      * @return The decoded array of bytes. May be of length 0.
      */
-    public final static byte[] decodeFast(final String s) {
+    public static final byte[] decodeFast(final String s) {
         // Check special case
         final int sLen = s.length();
         if (sLen == 0) {

test/com/dmdirc/ServerManagerTest.java

@@ -24,12 +24,9 @@ package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import com.dmdirc.addons.ui_dummy.DummyQueryWindow;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.plugins.PluginManager;
 
-import java.net.URI;
-import java.net.URISyntaxException;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;

test/com/dmdirc/TopicTest.java

@@ -45,7 +45,7 @@ public class TopicTest {
     @Test
     public void testGetTime() {
         final Topic test = new Topic("abc", "123!456@789", 1);
-        assertEquals(1l, test.getTime());
+        assertEquals(1L, test.getTime());
     }
 
     @Test

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -54,20 +54,17 @@ public class ActionComponentChainTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testInvalidName() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
-                "STRONG_STRING");
+        new ActionComponentChain(String.class, "STRONG_STRING");
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testInvalidType() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
-                "USER_MODES.STRING_STRING");
+        new ActionComponentChain(String.class, "USER_MODES.STRING_STRING");
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testInvalidLink() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
-                "STRING_STRING.USER_MODES");
+        new ActionComponentChain(String.class, "STRING_STRING.USER_MODES");
     }
 
     @Test

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -45,7 +45,7 @@ import static org.mockito.Mockito.*;
 @RunWith(Parameterized.class)
 public class ActionSubstitutorTest {
 
-    private static final Map<String, String> settings = new HashMap<String, String>();
+    private static final Map<String, String> SETTINGS = new HashMap<String, String>();
     
     private final String input, expected;
     private final Channel channel;
@@ -57,11 +57,11 @@ public class ActionSubstitutorTest {
         IdentityManager.load();
         ActionManager.init();
 
-        settings.put("alpha", "A");
-        settings.put("bravo", "$alpha");
-        settings.put("charlie", "${bravo}");
-        settings.put("delta", "${${bravo}${bravo}}");
-        settings.put("AA", "win!");
+        SETTINGS.put("alpha", "A");
+        SETTINGS.put("bravo", "$alpha");
+        SETTINGS.put("charlie", "${bravo}");
+        SETTINGS.put("delta", "${${bravo}${bravo}}");
+        SETTINGS.put("AA", "win!");
     }
 
     public ActionSubstitutorTest(final String input, final String expected) {
@@ -81,8 +81,8 @@ public class ActionSubstitutorTest {
         when(server.getAwayMessage()).thenReturn("foo");
         when(server.getProtocol()).thenReturn("$alpha");
 
-        when(manager.getOptions(eq("actions"))).thenReturn(settings);
-        for (Map.Entry<String, String> entry : settings.entrySet()) {
+        when(manager.getOptions(eq("actions"))).thenReturn(SETTINGS);
+        for (Map.Entry<String, String> entry : SETTINGS.entrySet()) {
             when(manager.hasOptionString("actions", entry.getKey())).thenReturn(true);
             when(manager.getOption("actions", entry.getKey())).thenReturn(entry.getValue());
         }

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
-import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -23,12 +23,8 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.commandparser.CommandManager;
-import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.global.Echo;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-import java.util.Arrays;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -151,7 +147,7 @@ public class CommandParserTest {
         assertTrue(time2 > 0);
         assertTrue(time2 >= time1);
         
-        assertEquals(0l, tcp.getCommandTime("echo"));
+        assertEquals(0L, tcp.getCommandTime("echo"));
     }    
 
 }

test/com/dmdirc/commandparser/parsers/GlobalCommandParserTest.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.config.IdentityManager;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;

test/com/dmdirc/config/prefs/PluginPreferencesCategoryTest.java

@@ -22,7 +22,7 @@
 package com.dmdirc.config.prefs;
 
 import com.dmdirc.plugins.PluginInfo;
-import java.util.List;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;

test/com/dmdirc/harness/TestCommandParser.java

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.parsers.*;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
 public class TestCommandParser extends CommandParser {

test/com/dmdirc/logger/NullOutputStreamTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.logger;
 
+import com.dmdirc.util.StreamUtil;
 import java.io.IOException;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -31,10 +32,14 @@ public class NullOutputStreamTest {
     public void testWrite() {
         boolean exception = false;
         
+        final NullOutputStream os = new NullOutputStream();
+
         try {
-            new NullOutputStream().write(46);
+            os.write(46);
         } catch (IOException ex) {
             exception = true;
+        } finally {
+            StreamUtil.close(os);
         }
         
         assertFalse(exception);

test/com/dmdirc/ui/WindowManagerTest.java

@@ -74,7 +74,7 @@ public class WindowManagerTest {
     public void testRemoveRoot() {
         final FrameListener tfm = mock(FrameListener.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer<DummyInputWindow>(512, DummyInputWindow.class), null);        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent);
         WindowManager.addFrameListener(tfm);
 
         WindowManager.removeWindow(parent);

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -26,7 +26,6 @@ import com.dmdirc.config.IdentityManager;
 
 import java.awt.Color;
 
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;

test/com/dmdirc/updater/UpdateTest.java

@@ -36,14 +36,14 @@ public class UpdateTest {
         IdentityManager.load();
     }
     
-    private final String subject = "outofdate client channel date version url";
+    private static final String SUBJECT = "outofdate client channel date version url";
     
     private Update update;
 
     @Before
     public void setUp() throws Exception {
         UpdateChecker.init();
-        update = new Update(subject);
+        update = new Update(SUBJECT);
     }
 
     @Test