Style fixes

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

src/com/dmdirc/CertificateManager.java

@@ -315,7 +315,7 @@ public class CertificateManager implements X509TrustManager {
         }
 
         for (X509Certificate cert : chain) {
-            TrustResult trustResult = isTrusted(cert);
+            final TrustResult trustResult = isTrusted(cert);
 
             if (checkDate) {
                 // Check that the certificate is in-date

src/com/dmdirc/Channel.java

@@ -506,7 +506,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
             getModes(client),
             Styliser.CODE_NICKNAME + client.getClient().getNickname() + Styliser.CODE_NICKNAME,
             client.getClient().getUsername(),
-            client.getClient().getHostname()
+            client.getClient().getHostname(),
         };
 
         if (showColours) {

src/com/dmdirc/EventHandler.java

@@ -73,7 +73,7 @@ public abstract class EventHandler implements CallbackInterface {
      * @throws CallbackNotFoundException if the specified callback isn't found
      */
     protected abstract <T extends CallbackInterface> void addCallback(
-            final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException;
+            final CallbackManager<?> cbm, final Class<T> type);
 
     /**
      * Retrieves the server belonging to this EventHandler's owner.

src/com/dmdirc/Main.java

@@ -59,10 +59,8 @@ import java.util.logging.Level;
 
 /**
  * Main class, handles initialisation.
- *
- * @author chris
  */
-public class Main {
+public final class Main {
 
     /** Feedback nag delay. */
     private static final int FEEDBACK_DELAY = 30 * 60 * 1000;

src/com/dmdirc/MissingModeAliasException.java

@@ -1,16 +1,16 @@
 /*
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.parser.interfaces.Parser;
+
 import java.util.List;
 
 /**
@@ -59,10 +60,10 @@ public class MissingModeAliasException extends Exception {
     }
 
     private static String arrayListToString(final List<String> lines) {
-        StringBuilder sb = new StringBuilder();
+        final StringBuilder sb = new StringBuilder();
 
         for (String line : lines) {
-            sb.append(line).append("\n");
+            sb.append(line).append('\n');
         }
 
         return sb.toString();

src/com/dmdirc/Server.java

@@ -470,13 +470,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
      * @return list of channel names belonging to this server
      */
     public List<String> getChannels() {
-        final ArrayList<String> res = new ArrayList<String>();
-
-        for (String channel : channels.keySet()) {
-            res.add(channel);
-        }
-
-        return res;
+        return new ArrayList<String>(channels.keySet());
     }
 
     /**
@@ -1304,7 +1298,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
                 final Object[] arguments = new Object[]{
                     address.getHost(), parser == null ? "Unknown" : parser.getServerName(),
                     address.getPort(), parser == null ? "Unknown" : getNetwork(),
-                    parser == null ? "Unknown" : parser.getLocalClient().getNickname()
+                    parser == null ? "Unknown" : parser.getLocalClient().getNickname(),
                 };
 
                 setName(Formatter.formatMessage(getConfigManager(),

src/com/dmdirc/ServerEventHandler.java

@@ -28,7 +28,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -73,7 +72,7 @@ public final class ServerEventHandler extends EventHandler implements
     @Override
     @SuppressWarnings("unchecked")
     protected <T extends CallbackInterface> void addCallback(
-            final CallbackManager<?> cbm, final Class<T> type) throws CallbackNotFoundException {
+            final CallbackManager<?> cbm, final Class<T> type) {
         cbm.addCallback(type, (T) this);
     }
 
@@ -119,24 +118,20 @@ public final class ServerEventHandler extends EventHandler implements
 
         final StringBuilder errorString = new StringBuilder();
         errorString.append("Parser exception.\n\n");
-        
+
         errorString.append("\tLast line:\t");
-        errorString.append(errorInfo.getLastLine());
-        errorString.append("\n");
-       
+        errorString.append(errorInfo.getLastLine()).append('\n');
+
         errorString.append("\tServer:\t");
-        errorString.append(owner.getAddress());
-        errorString.append("\n");
-        
+        errorString.append(owner.getAddress()).append('\n');
+
         errorString.append("\tAdditional Information:\n");
         for (final String line : parser.getServerInformationLines()) {
-            errorString.append("\t\t");
-            errorString.append(line);
-            errorString.append("\n");
+            errorString.append("\t\t").append(line).append('\n');
         }
 
-        final Exception ex = (errorInfo.isException()) ? errorInfo.getException()
-                : new Exception(errorString.toString());
+        final Exception ex = errorInfo.isException() ? errorInfo.getException()
+                : new Exception(errorString.toString()); // NOPMD
 
         if (errorInfo.isUserError()) {
             Logger.userError(errorLevel, errorInfo.getData(), ex);
@@ -432,7 +427,7 @@ public final class ServerEventHandler extends EventHandler implements
     @Override
     protected void checkParser(final Parser parser) {
         super.checkParser(parser);
-        
+
         if (owner.getState() != ServerState.CONNECTED
                 && owner.getState() != ServerState.CONNECTING
                 && owner.getState() != ServerState.DISCONNECTING) {

src/com/dmdirc/ServerState.java

@@ -110,4 +110,4 @@ public enum ServerState {
     public boolean isDisconnected() {
         return this == ServerState.DISCONNECTED || this == ServerState.TRANSIENTLY_DISCONNECTED;
     }
-}
+}

src/com/dmdirc/ServerStatus.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.RollingList;
+
 import java.util.ArrayList;
 import java.util.List;
 

src/com/dmdirc/actions/Action.java

@@ -65,15 +65,15 @@ public class Action extends ActionModel implements ConfigChangeListener {
     /** The domain name for misc settings. */
     private static final String DOMAIN_MISC = "misc".intern();
 
-    /** The location of the file we're reading/saving. */
-    private String location;
-
     /** Whether or not this action is disabled. */
     protected boolean disabled;
 
     /** The config file we're using. */
     protected ConfigFile config;
 
+    /** The location of the file we're reading/saving. */
+    private String location;
+
     /**
      * Creates a new instance of Action. The group and name specified must
      * be the group and name of a valid action already saved to disk.
@@ -388,7 +388,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * @param data The relevant section of the action configuration
      * @return True if the condition is valid, false otherwise
      */
-    private boolean readCondition(final Map<String,String> data) {
+    private boolean readCondition(final Map<String, String> data) {
         int arg = 0;
         ActionComponent component = null;
         ActionComparison comparison = null;

src/com/dmdirc/actions/ActionComponentChain.java

@@ -166,4 +166,4 @@ public class ActionComponentChain implements ActionComponent {
         return res;
     }
 
-}
+}

src/com/dmdirc/actions/ActionManager.java

@@ -48,8 +48,6 @@ import java.util.Map;
 
 /**
  * Manages all actions for the client.
- *
- * @author chris
  */
 public final class ActionManager {
 
@@ -106,7 +104,7 @@ public final class ActionManager {
         registerGroup(PerformWrapper.getPerformWrapper());
 
         new WhoisNumericFormatter(IdentityManager.getAddonIdentity()).register();
-       
+
         // Register a listener for the closing event, so we can save actions
         addListener(new ActionListener() {
             /** {@inheritDoc} */
@@ -128,7 +126,7 @@ public final class ActionManager {
             }
         });
     }
-    
+
     /**
      * Saves all actions.
      */
@@ -168,7 +166,7 @@ public final class ActionManager {
     public static void registerActionTypes(final ActionType[] types) {
         for (ActionType type : types) {
             Logger.assertTrue(type != null);
-            
+
             if(!ACTION_TYPES.contains(type)) {
                 ACTION_TYPES.add(type);
                 ACTIONTYPE_GROUPS.add(type.getType().getGroup(), type);
@@ -275,7 +273,7 @@ public final class ActionManager {
     private static void loadActions(final File dir) {
         Logger.assertTrue(dir != null);
         Logger.assertTrue(dir.isDirectory());
-        
+
         if (!GROUPS.containsKey(dir.getName())) {
             GROUPS.put(dir.getName(), new ActionGroup(dir.getName()));
         }
@@ -293,7 +291,7 @@ public final class ActionManager {
     @Precondition("The specified action is not null")
     public static void registerAction(final Action action) {
         Logger.assertTrue(action != null);
- 
+
         for (ActionType trigger : action.getTriggers()) {
             ACTIONS.add(trigger, action);
         }
@@ -352,7 +350,7 @@ public final class ActionManager {
         Logger.assertTrue(action != null);
 
         unregisterAction(action);
-        
+
         action.delete();
     }
 
@@ -456,7 +454,7 @@ public final class ActionManager {
      * Creates a new group with the specified name.
      *
      * @param group The group to be created
-     * 
+     *
      * @return The newly created group
      */
     @Precondition({

src/com/dmdirc/actions/ActionModel.java

@@ -124,8 +124,8 @@ public class ActionModel {
     })
     public boolean trigger(final StringBuffer format,
             final Object... arguments) {
-        assert(triggers.length > 0);
-        assert(triggers[0] != null);
+        assert triggers.length > 0;
+        assert triggers[0] != null;
 
         final ActionSubstitutor sub = new ActionSubstitutor(triggers[0]);
 

src/com/dmdirc/actions/ConditionTree.java

@@ -392,4 +392,4 @@ public class ConditionTree {
         return parseString(builder.toString());
     }
 
-}
+}

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

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

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -28,8 +28,8 @@ import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
-
 import com.dmdirc.config.prefs.PreferencesDialogModel;
+
 import javax.swing.KeyStroke;
 import javax.swing.text.StyledDocument;
 

src/com/dmdirc/actions/validators/ActionGroupValidator.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.actions.validators;
 
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
-import com.dmdirc.actions.ActionManager;
 
 /**
  * Validates action groups.

src/com/dmdirc/actions/validators/ActionNameValidator.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.actions.validators;
 
-import com.dmdirc.util.validators.ValidationResponse;
-import com.dmdirc.util.validators.Validator;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
+import com.dmdirc.util.validators.ValidationResponse;
+import com.dmdirc.util.validators.Validator;
 
 import java.util.List;
 

src/com/dmdirc/actions/validators/ConditionRuleValidator.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.actions.validators;
 
+import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
-import com.dmdirc.actions.ConditionTree;
 
 /**
  * Validates a condition tree.

src/com/dmdirc/commandparser/CommandArguments.java

@@ -187,7 +187,7 @@ public class CommandArguments {
     public String getWordsAsString(final int start, final int end) {
         Logger.assertTrue(start <= end + 1);
 
-        final Pattern pattern = Pattern.compile("(\\S+\\s+){" + (start) + "}"
+        final Pattern pattern = Pattern.compile("(\\S+\\s+){" + start + "}"
                 + "((\\S+\\s+){" + Math.max(0, end - start) + "}\\S+(\\s+$)?).*?");
         final Matcher matcher = pattern.matcher(line);
 

src/com/dmdirc/commandparser/PopupManager.java

@@ -117,4 +117,4 @@ public class PopupManager {
         return res;
     }
 
-}
+}

src/com/dmdirc/commandparser/commands/Command.java

@@ -83,7 +83,7 @@ public abstract class Command {
         res.append(Styliser.CODE_FIXED);
         res.append(Styliser.CODE_BOLD);
 
-        int[] maxsizes = new int[headers.length];
+        final int[] maxsizes = new int[headers.length];
 
         for (int i = 0; i < headers.length; i++) {
             maxsizes[i] = headers[i].length() + 3;

src/com/dmdirc/commandparser/commands/PreviousCommand.java

@@ -93,4 +93,4 @@ public final class PreviousCommand {
         return hash;
     }
 
-}
+}

src/com/dmdirc/commandparser/commands/ValidatingCommand.java

@@ -22,14 +22,12 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.util.validators.ValidationResponse;
 
 /**
  * Validating commands are capable of validating their arguments to determine
  * whether the input would be valid or not.
- *
- * @author chris
  */
 public interface ValidatingCommand {
 

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -31,8 +31,8 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.ui.interfaces.InputWindow;
+import com.dmdirc.util.validators.ValidationResponse;
 
 /**
  * The me command sends a CTCP action to the current channel.

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -99,7 +99,7 @@ public final class NewServer extends Command implements IntelligentCommand,
      */
     public static URI getURI(final String address) throws URISyntaxException {
         final URI uri = new URI(address);
-        int port = uri.getPort();
+        final int port = uri.getPort();
 
         // Either no port specified, or a +port was used, lets try to find one.
         // Otherwise just return the URI.

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -78,7 +78,7 @@ public class JoinChannelCommand extends Command implements
         final List<ChannelJoinRequest> channels = new ArrayList<ChannelJoinRequest>();
 
         for (String pair : args.getArgumentsAsString().split(",")) {
-            int index = pair.trim().indexOf(' ');
+            final int index = pair.trim().indexOf(' ');
 
             if (index == -1) {
                 channels.add(new ChannelJoinRequest(pair));

src/com/dmdirc/commandparser/validators/CommandNameValidator.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.commandparser.validators;
 
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.util.validators.RegexStringValidator;
 import com.dmdirc.util.validators.ValidatorChain;
-import com.dmdirc.commandparser.CommandManager;
+
 import java.util.regex.Pattern;
 
 /**

src/com/dmdirc/config/CipherUtils.java

@@ -56,12 +56,6 @@ public class CipherUtils {
     /** Singleton instance. */
     private static CipherUtils me;
 
-    /** Encryption cipher. */
-    private Cipher ecipher;
-
-    /** Decryption cipher. */
-    private Cipher dcipher;
-
     /** Salt. */
     private static final byte[] SALT = {
         (byte) 0xA9, (byte) 0x9B, (byte) 0xC8, (byte) 0x32,
@@ -74,6 +68,12 @@ public class CipherUtils {
     /** Number of auth attemps before failing the attempt. */
     private static final int AUTH_TRIES = 4;
 
+    /** Encryption cipher. */
+    private Cipher ecipher;
+
+    /** Decryption cipher. */
+    private Cipher dcipher;
+
     /** User password. */
     private String password;
 

src/com/dmdirc/config/IdentityManager.java

@@ -137,7 +137,7 @@ public final class IdentityManager {
         final String dir = getDirectory();
 
         for (String target : targets) {
-            File file = new File(dir + target);
+            final File file = new File(dir + target);
 
             if (file.exists() && !file.isDirectory()) {
                 boolean success = false;

src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -24,12 +24,12 @@ package com.dmdirc.config.prefs;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.util.validators.NumericalValidator;
-import com.dmdirc.util.validators.OptionalValidator;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.validators.NumericalValidator;
+import com.dmdirc.util.validators.OptionalValidator;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -69,7 +69,7 @@ public final class StepSettings extends SwingStep implements Settings {
     public StepSettings() {
         super();
 
-        DefaultSettings defaultSettings = new DefaultSettings();
+        final DefaultSettings defaultSettings = new DefaultSettings();
         shortcutMenu.setSelected(defaultSettings.getShortcutMenuState());
         shortcutDesktop.setSelected(defaultSettings.getShortcutDesktopState());
         shortcutQuick.setSelected(defaultSettings.getShortcutQuickState());

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

@@ -88,13 +88,13 @@ public class WizardPanel extends JPanel {
      * @return Step
      */
     public Step getStep(final String stepName) {
-        Step step = null;
         for (SwingStep loopStep : layout.getSteps()) {
             if (stepName.equals(loopStep.getStepName())) {
                 return loopStep;
             }
         }
-        return step;
+
+        return null;
     }
 
     /**

src/com/dmdirc/interfaces/NicklistListener.java

@@ -23,6 +23,7 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
+
 import java.util.Collection;
 
 /**
@@ -30,7 +31,6 @@ import java.util.Collection;
  * channel's list of active users (the 'nicklist').
  *
  * @since 0.6.5
- * @author chris
  */
 public interface NicklistListener {
 

src/com/dmdirc/logger/ErrorManager.java

@@ -48,7 +48,8 @@ public final class ErrorManager implements ConfigChangeListener {
     private static final Class[] BANNED_EXCEPTIONS = new Class[]{
         NoSuchMethodError.class, NoClassDefFoundError.class,
         UnsatisfiedLinkError.class, AbstractMethodError.class,
-        IllegalAccessError.class, OutOfMemoryError.class, NoSuchFieldError.class
+        IllegalAccessError.class, OutOfMemoryError.class,
+        NoSuchFieldError.class,
     };
 
     /** Whether or not to send error reports. */

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -101,7 +101,7 @@ public final class GlobalClassLoader extends ClassLoader {
         try {
             return super.loadClass(name);
         } catch (ClassNotFoundException e) {
-            byte[] data = getClassData(name);
+            final byte[] data = getClassData(name);
             if (data != null) {
                 return defineClass(name, data);
             }
@@ -109,7 +109,7 @@ public final class GlobalClassLoader extends ClassLoader {
 
         // Check the other plugins.
         for (PluginInfo pi : PluginManager.getPluginManager().getPluginInfos()) {
-            List<String> classList = pi.getClassList();
+            final List<String> classList = pi.getClassList();
             if (classList.contains(name) && pi.getPluginClassLoader() != null) {
                 return pi.getPluginClassLoader().loadClass(name, false);
             }
@@ -137,7 +137,7 @@ public final class GlobalClassLoader extends ClassLoader {
         try {
             final String jarname = resourcesList.get(classname);
             if (jarname != null) {
-                ResourceManager rm = ResourceManager.getResourceManager("jar://" + jarname);
+                final ResourceManager rm = ResourceManager.getResourceManager("jar://" + jarname);
                 final String filename = classname.replace('.', '/') + ".class";
                 if (rm.resourceExists(filename)) {
                     return rm.getResourceBytes(filename);

src/com/dmdirc/plugins/Plugin.java

@@ -24,6 +24,7 @@ package com.dmdirc.plugins;
 
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.util.validators.ValidationResponse;
+
 import java.io.File;
 
 /**

src/com/dmdirc/plugins/PluginInfo.java

@@ -27,13 +27,13 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
 import com.dmdirc.util.resourcemanager.ResourceManager;
+import com.dmdirc.util.validators.ValidationResponse;
 
 import java.io.File;
 import java.io.IOException;
@@ -1037,7 +1037,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             return false;
         } else {
             final String unloadable = getKeyValue("metadata", "unloadable", "true");
-            return (unloadable.equalsIgnoreCase("yes") || unloadable.equalsIgnoreCase("true") || unloadable.equalsIgnoreCase("1"));
+            return unloadable.equalsIgnoreCase("yes") || unloadable.equalsIgnoreCase("true") || unloadable.equalsIgnoreCase("1");
         }
     }
 

src/com/dmdirc/plugins/PluginManager.java

@@ -38,6 +38,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -299,7 +300,7 @@ public class PluginManager implements ActionListener {
             return false;
         }
 
-        PluginInfo pluginInfo = getPluginInfo(filename);
+        final PluginInfo pluginInfo = getPluginInfo(filename);
         final boolean wasLoaded = pluginInfo.isLoaded();
 
         if (wasLoaded && !pluginInfo.isUnloadable()) { return false; }
@@ -411,7 +412,7 @@ public class PluginManager implements ActionListener {
     public List<PluginInfo> getPossiblePluginInfos(final boolean addPlugins) {
         final Map<String, PluginInfo> res = new HashMap<String, PluginInfo>();
 
-        final LinkedList<File> dirs = new LinkedList<File>();
+        final Deque<File> dirs = new LinkedList<File>();
 
         dirs.add(new File(myDir));
 

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

@@ -114,7 +114,7 @@ public class URLHandler {
     protected static String getSanitisedString(final String urlString) {
         String sanitisedString = urlString.replace("|", "%7C");
 
-        int index = sanitisedString.indexOf('#');
+        final int index = sanitisedString.indexOf('#');
         if (sanitisedString.lastIndexOf('#') > index) {
             sanitisedString = sanitisedString.substring(0, index + 1)
                     + sanitisedString.substring(index + 1).replace("#", "%23");

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

@@ -61,7 +61,7 @@ public final class Formatter {
     @Precondition("The specified message type is not null")
     public static String formatMessage(final ConfigManager config, final String messageType,
             final Object... arguments) {
-        assert(messageType != null);
+        assert messageType != null;
 
         final String res = config.hasOptionString("formatter", messageType) ?
             config.getOption("formatter", messageType).replace("%-1$", "%"
@@ -99,7 +99,7 @@ public final class Formatter {
      */
     @Precondition("The specified format is not null")
     private static Object[] castArguments(final String format, final Object[] args) {
-        assert(format != null);
+        assert format != null;
 
         if (!TYPE_CACHE.containsKey(format)) {
             analyseFormat(format, args);

src/com/dmdirc/updater/UpdateChecker.java

@@ -363,7 +363,7 @@ public final class UpdateChecker implements Runnable {
      */
     @Precondition("The specified name is not null")
     public static UpdateComponent findComponent(final String name) {
-        assert(name != null);
+        assert name != null;
 
         for (UpdateComponent component : COMPONENTS) {
             if (name.equals(component.getName())) {