Style fixes

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

src/com/dmdirc/ChannelClientProperty.java

@@ -24,8 +24,6 @@ package com.dmdirc;
 
 /**
  * Represents the properties that can be set on a channel client.
- *
- * @author chris
  */
 public enum ChannelClientProperty {
 

src/com/dmdirc/EventHandler.java

@@ -31,8 +31,6 @@ import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 /**
  * Abstracts some behaviour used by Event Handlers.
- *
- * @author chris
  */
 public abstract class EventHandler implements CallbackInterface {
 

src/com/dmdirc/GlobalWindow.java

@@ -38,8 +38,6 @@ import java.util.Arrays;
 
 /**
  * A window which can be used to execute global commands.
- *
- * @author chris
  */
 public class GlobalWindow extends WritableFrameContainer {
 

src/com/dmdirc/Invite.java

@@ -26,8 +26,6 @@ import java.util.Date;
 
 /**
  * Model for a channel invitation.
- *
- * @author Chris
  */
 public class Invite {
 

src/com/dmdirc/MessageEncoder.java

@@ -32,8 +32,6 @@ import java.io.UnsupportedEncodingException;
 /**
  * An {@link Encoder} implementation that reads the desired encoding from
  * the relevant target's config file.
- *
- * @author chris
  */
 public class MessageEncoder implements Encoder {
 

src/com/dmdirc/Raw.java

@@ -33,8 +33,8 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-import java.util.Arrays;
 
+import java.util.Arrays;
 import java.util.Date;
 
 /**

src/com/dmdirc/ServerEventHandler.java

@@ -432,8 +432,8 @@ public final class ServerEventHandler extends EventHandler implements
                 && owner.getState() != ServerState.CONNECTING
                 && owner.getState() != ServerState.DISCONNECTING) {
             throw new IllegalArgumentException("Event called from a parser (#"
-                    + owner.getStatus().getParserID(parser) + ") that " +
-                    "shouldn't be in use.\nState history:\n"
+                    + owner.getStatus().getParserID(parser) + ") that "
+                    + "shouldn't be in use.\nState history:\n"
                     + owner.getStatus().getTransitionHistory());
         }
     }

src/com/dmdirc/actions/Action.java

@@ -45,8 +45,6 @@ import java.util.Map;
 
 /**
  * Describes a single action.
- *
- * @author chris
  */
 public class Action extends ActionModel implements ConfigChangeListener {
 
@@ -174,7 +172,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
             response = new String[config.getFlatDomain(DOMAIN_RESPONSE).size()];
 
             int i = 0;
-            for (String line: config.getFlatDomain(DOMAIN_RESPONSE)) {
+            for (String line : config.getFlatDomain(DOMAIN_RESPONSE)) {
                 response[i++] = line;
             }
         } else {

src/com/dmdirc/actions/ActionCondition.java

@@ -27,7 +27,6 @@ import com.dmdirc.actions.interfaces.ActionComponent;
 
 /**
  * An action condition represents one condition within an action.
- * @author chris
  */
 public class ActionCondition {
 

src/com/dmdirc/actions/ActionGroup.java

@@ -35,8 +35,6 @@ import java.util.Map;
 
 /**
  * Represents a group of actions, along with their meta-data.
- *
- * @author chris
  */
 public class ActionGroup implements Iterable<Action> {
 
@@ -54,16 +52,16 @@ public class ActionGroup implements Iterable<Action> {
     private final String name;
 
     /** The description of this action group. */
-    private String description = null;
+    private String description;
 
     /** The author of this action group. */
-    private String author = null;
+    private String author;
 
     /** The component number of this action group (for updating). */
     private int component = -1;
 
     /** The version of this action group. */
-    private Version version = null;
+    private Version version;
 
     /** A list of settings used by this action group. */
     private final Map<String, PreferencesSetting> settings

src/com/dmdirc/actions/ActionManager.java

@@ -232,7 +232,7 @@ public final class ActionManager {
         for (ActionType type : newTypes) {
             Logger.assertTrue(type != null);
 
-            if(!types.contains(type)) {
+            if (!types.contains(type)) {
                 types.add(type);
                 typeGroups.add(type.getType().getGroup(), type);
             }

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -42,8 +42,6 @@ import java.util.regex.Pattern;
 
 /**
  * Handles the substitution of variables into action targets and responses.
- *
- * @author Chris
  */
 public class ActionSubstitutor {
 

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -29,8 +29,6 @@ import java.util.Comparator;
 
 /**
  * Implements a comparator for action types that compares their names.
- *
- * @author Chris
  */
 public final class ActionTypeComparator implements Comparator<ActionType>, Serializable {
 

src/com/dmdirc/actions/ConditionTree.java

@@ -28,8 +28,6 @@ import java.util.Deque;
 /**
  * A condition tree specifies in which order a group of conditions will be
  * executed.
- *
- * @author chris
  */
 public class ConditionTree {
 

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -27,7 +27,6 @@ package com.dmdirc.actions;
  * number of arguments.
  *
  * @since 0.6
- * @author chris
  */
 public abstract class ConditionTreeFactory {
 
@@ -58,6 +57,25 @@ public abstract class ConditionTreeFactory {
         CUSTOM,
     }
 
+    /**
+     * Retrieves a factory that will extrapolate the specified
+     * {@link ConditionTree} for different number of arguments, if applicable.
+     *
+     * @param tree The {@link ConditionTree} that's in use
+     * @param args The number of conditions currently in use
+     * @return A {@link ConditionTreeFactory} that will create relevant
+     * {@link ConditionTree}s
+     */
+    public static ConditionTreeFactory getFactory(final ConditionTree tree, final int args) {
+        if (tree.equals(ConditionTree.createConjunction(args))) {
+            return new ConjunctionFactory();
+        } else if (tree.equals(ConditionTree.createDisjunction(args))) {
+            return new DisjunctionFactory();
+        } else {
+            return new CustomFactory(tree);
+        }
+    }
+
     /**
      * Creates condition trees where the arguments are conjoined together.
      */
@@ -126,24 +144,4 @@ public abstract class ConditionTreeFactory {
         }
 
     }
-
-    /**
-     * Retrieves a factory that will extrapolate the specified
-     * {@link ConditionTree} for different number of arguments, if applicable.
-     *
-     * @param tree The {@link ConditionTree} that's in use
-     * @param args The number of conditions currently in use
-     * @return A {@link ConditionTreeFactory} that will create relevant
-     * {@link ConditionTree}s
-     */
-    public static ConditionTreeFactory getFactory(final ConditionTree tree, final int args) {
-        if (tree.equals(ConditionTree.createConjunction(args))) {
-            return new ConjunctionFactory();
-        } else if (tree.equals(ConditionTree.createDisjunction(args))) {
-            return new DisjunctionFactory();
-        } else {
-            return new CustomFactory(tree);
-        }
-    }
-
 }

src/com/dmdirc/actions/CoreActionComparison.java

@@ -31,7 +31,6 @@ import java.util.regex.PatternSyntaxException;
 /**
  * A CoreActionComparison represents a possible comparison between two types of
  * data used in an action condition.
- * @author chris
  */
 public enum CoreActionComparison implements ActionComparison {
 

src/com/dmdirc/actions/CoreActionComponent.java

@@ -45,7 +45,6 @@ import javax.swing.KeyStroke;
 /**
  * A CoreActionComponent represents a component of some object that the user can
  * use as the subject of a condition within an action.
- * @author chris
  */
 public enum CoreActionComponent implements ActionComponent {
 
@@ -69,7 +68,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_NETWORK {
         /** {@inheritDoc} */
         @Override
-        @ComponentOptions(requireConnected=true)
+        @ComponentOptions(requireConnected = true)
         public Object get(final Object argument) { return ((Server) argument).getNetwork(); }
         /** {@inheritDoc} */
         @Override
@@ -122,7 +121,7 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_CHANNELUMODES {
         /** {@inheritDoc} */
         @Override
-        @ComponentOptions(requireConnected=true)
+        @ComponentOptions(requireConnected = true)
         public Object get(final Object argument) { return ((Server) argument).getParser().getChannelUserModes(); }
         /** {@inheritDoc} */
         @Override
@@ -139,15 +138,16 @@ public enum CoreActionComponent implements ActionComponent {
     SERVER_MYNICKNAME {
         /** {@inheritDoc} */
         @Override
-        @ComponentOptions(requireConnected=true)
+        @ComponentOptions(requireConnected = true)
         public Object get(final Object argument) {
             final Server server = (Server) argument;
 
             if (server == null || server.getParser() == null) {
                 Logger.appError(ErrorLevel.LOW, "SERVER_MYNICKNAME.get() called with null element",
                         new UnsupportedOperationException(
-                        server == null ? "Server was null" :
-                            server.getParser() == null ? "Parser was null" : "Unknown"
+                        server == null ? "Server was null"
+                            : server.getParser() == null ? "Parser was null"
+                            : "Unknown"
                         ));
 
                 return "null";

src/com/dmdirc/actions/CoreActionType.java

@@ -34,7 +34,6 @@ import com.dmdirc.actions.metatypes.ServerEvents;
 
 /**
  * An enumeration of actions that are raised by the core.
- * @author chris
  */
 public enum CoreActionType implements ActionType {
 

src/com/dmdirc/actions/interfaces/ActionComparison.java

@@ -26,7 +26,6 @@ package com.dmdirc.actions.interfaces;
  * Describes the methods that must be implemented by an action comparison.
  * Action comparisons allow the user to compare an action component to a
  * string they entered.
- * @author chris
  */
 public interface ActionComparison {
 

src/com/dmdirc/actions/interfaces/ActionComponent.java

@@ -31,8 +31,6 @@ import java.lang.annotation.Target;
  * The ActionComponent interface describes the methods that action components
  * are required to implement. Components are objects that allow the user to
  * pull a specific piece of information from a certain type of argument.
- *
- * @author chris
  */
 public interface ActionComponent {
 

src/com/dmdirc/actions/interfaces/ActionMetaType.java

@@ -24,7 +24,6 @@ package com.dmdirc.actions.interfaces;
 
 /**
  * Encapsulates the methods that all action types are required to implement.
- * @author chris
  */
 public interface ActionMetaType {
 

src/com/dmdirc/actions/interfaces/ActionType.java

@@ -24,7 +24,6 @@ package com.dmdirc.actions.interfaces;
 
 /**
  * Encapsulates the methods that all actions are required to implement.
- * @author chris
  */
 public interface ActionType {
 

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

@@ -29,8 +29,6 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 /**
  * Defines channel-related events.
- *
- * @author Chris
  */
 public enum ChannelEvents implements ActionMetaType {
 

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

@@ -35,8 +35,6 @@ import javax.swing.text.StyledDocument;
 
 /**
  * Defines client-wide events.
- *
- * @author Chris
  */
 public enum ClientEvents implements ActionMetaType {
 

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

@@ -27,8 +27,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * Defines link-related events.
- *
- * @author Chris
  */
 public enum LinkEvents implements ActionMetaType {
 

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

@@ -32,7 +32,7 @@ import com.dmdirc.util.validators.Validator;
 public class ConditionRuleValidator implements Validator<String> {
 
     /** The number of arguments to the tree. */
-    private int args = 0;
+    private int args;
 
     /**
      * Creates a new ConditionRuleValidator.

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

@@ -39,8 +39,6 @@ import java.util.List;
 
 /**
  * Encapsulates alias actions.
- *
- * @author chris
  */
 public final class AliasWrapper extends ActionGroup {
 

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

@@ -43,114 +43,6 @@ import java.util.List;
  */
 public class PerformWrapper extends ActionGroup {
 
-    /**
-     * Describes one specific perform.
-     *
-     * @since 0.6.4
-     */
-    public static class PerformDescription {
-
-        /** The type of the perform being described. */
-        private final PerformType type;
-        /** The target of the perform. */
-        private final String target;
-        /** The profile (if any) of the perform. */
-        private final String profile;
-
-        /**
-         * Creates a new perform description with the specified arguments.
-         *
-         * @param type The type of the perform in question
-         * @param target The target of the perform
-         * @param profile The profile of the perform (or null)
-         */
-        public PerformDescription(final PerformType type, final String target,
-                final String profile) {
-            this.type = type;
-            this.target = target;
-            this.profile = profile;
-
-            if (target == null) {
-                throw new NullPointerException("Target may not be null");
-            }
-        }
-
-        /**
-         * Creates a new perform description with the specified arguments.
-         *
-         * @param type The type of the perform in question
-         * @param target The target of the perform
-         */
-        public PerformDescription(final PerformType type, final String target) {
-            this.type = type;
-            this.target = target;
-            this.profile = null;
-
-            if (target == null) {
-                throw new NullPointerException("Target may not be null");
-            }
-        }
-
-        /**
-         * Retrieves the profile of this perform.
-         *
-         * @return This perform's profile
-         */
-        public String getProfile() {
-            return profile;
-        }
-
-        /**
-         * Retrieves the target of this perform.
-         *
-         * @return This perform's target
-         */
-        public String getTarget() {
-            return target;
-        }
-
-        /**
-         * Retrieves the type of this perform.
-         *
-         * @return This perform's type
-         */
-        public PerformType getType() {
-            return type;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public boolean equals(final Object obj) {
-            if (obj == null || getClass() != obj.getClass()) {
-                return false;
-            }
-
-            final PerformDescription other = (PerformDescription) obj;
-
-            if (this.type != other.type || !this.target.equals(other.target)) {
-                return false;
-            }
-
-            if ((this.profile == null) ? (other.profile != null)
-                    : !this.profile.equals(other.profile)) {
-                return false;
-            }
-
-            return true;
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public int hashCode() {
-            int hash = 7;
-            hash = 89 * hash + (this.type != null ? this.type.hashCode() : 0);
-            hash = 89 * hash + (this.target != null ? this.target.hashCode() : 0);
-            hash = 89 * hash + (this.profile != null ? this.profile.hashCode() : 0);
-            return hash;
-        }
-
-    }
-
     /** A singleton instance of the Perform Wrapper. */
     private static final PerformWrapper ME = new PerformWrapper();
 
@@ -396,4 +288,112 @@ public class PerformWrapper extends ActionGroup {
                 + "the Settings menu.";
     }
 
+    /**
+     * Describes one specific perform.
+     *
+     * @since 0.6.4
+     */
+    public static class PerformDescription {
+
+        /** The type of the perform being described. */
+        private final PerformType type;
+        /** The target of the perform. */
+        private final String target;
+        /** The profile (if any) of the perform. */
+        private final String profile;
+
+        /**
+         * Creates a new perform description with the specified arguments.
+         *
+         * @param type The type of the perform in question
+         * @param target The target of the perform
+         * @param profile The profile of the perform (or null)
+         */
+        public PerformDescription(final PerformType type, final String target,
+                final String profile) {
+            this.type = type;
+            this.target = target;
+            this.profile = profile;
+
+            if (target == null) {
+                throw new NullPointerException("Target may not be null");
+            }
+        }
+
+        /**
+         * Creates a new perform description with the specified arguments.
+         *
+         * @param type The type of the perform in question
+         * @param target The target of the perform
+         */
+        public PerformDescription(final PerformType type, final String target) {
+            this.type = type;
+            this.target = target;
+            this.profile = null;
+
+            if (target == null) {
+                throw new NullPointerException("Target may not be null");
+            }
+        }
+
+        /**
+         * Retrieves the profile of this perform.
+         *
+         * @return This perform's profile
+         */
+        public String getProfile() {
+            return profile;
+        }
+
+        /**
+         * Retrieves the target of this perform.
+         *
+         * @return This perform's target
+         */
+        public String getTarget() {
+            return target;
+        }
+
+        /**
+         * Retrieves the type of this perform.
+         *
+         * @return This perform's type
+         */
+        public PerformType getType() {
+            return type;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public boolean equals(final Object obj) {
+            if (obj == null || getClass() != obj.getClass()) {
+                return false;
+            }
+
+            final PerformDescription other = (PerformDescription) obj;
+
+            if (this.type != other.type || !this.target.equals(other.target)) {
+                return false;
+            }
+
+            if ((this.profile == null) ? (other.profile != null)
+                    : !this.profile.equals(other.profile)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public int hashCode() {
+            int hash = 7;
+            hash = 89 * hash + (this.type != null ? this.type.hashCode() : 0);
+            hash = 89 * hash + (this.target != null ? this.target.hashCode() : 0);
+            hash = 89 * hash + (this.profile != null ? this.profile.hashCode() : 0);
+            return hash;
+        }
+
+    }
+
 }

src/com/dmdirc/commandline/CommandLineParser.java

@@ -40,8 +40,6 @@ import java.util.List;
 
 /**
  * Parses command line arguments for the client.
- *
- * @author Chris
  */
 public class CommandLineParser {
 

src/com/dmdirc/commandparser/CommandArguments.java

@@ -37,7 +37,6 @@ import java.util.regex.Pattern;
  * the command name.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public class CommandArguments {
 

src/com/dmdirc/commandparser/CommandInfo.java

@@ -24,8 +24,6 @@ package com.dmdirc.commandparser;
 
 /**
  * Describes a command.
- *
- * @author chris
  */
 public interface CommandInfo {
 

src/com/dmdirc/commandparser/CommandInfoPair.java

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.commands.Command;
  * triggered it.
  *
  * @since 0.6.4
- * @author chris
  */
 public class CommandInfoPair {
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -46,8 +46,6 @@ import java.util.Map;
 /**
  * The command manager creates and manages a single instance of all commands,
  * and provides methods to load each group of commands into a parser instance.
- *
- * @author chris
  */
 public final class CommandManager {
 

src/com/dmdirc/commandparser/CommandType.java

@@ -24,8 +24,6 @@ package com.dmdirc.commandparser;
 
 /**
  * Defines the possible targets for commands.
- *
- * @author chris
  */
 public enum CommandType {
 

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -24,15 +24,13 @@ package com.dmdirc.commandparser;
 
 /**
  * Represents an abstract, UI-independent popup menu item.
- *
- * @author chris
  */
 public class PopupMenuItem {
 
     /** Whether this item is a divider. */
-    private boolean divider = false;
+    private boolean divider;
     /** The submenu for this item, if any. */
-    private PopupMenu submenu = null;
+    private PopupMenu submenu;
     /** The name of this item, if any. */
     private String name;
     /** The command for this item, if any. */

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

@@ -30,8 +30,6 @@ import com.dmdirc.ui.messages.Styliser;
 
 /**
  * Represents a generic command.
- *
- * @author chris
  */
 public abstract class Command {
 

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

@@ -31,7 +31,6 @@ import java.lang.annotation.Target;
  * Allows commands to define options that affect their behaviour.
  *
  * @since 0.6.3m1
- * @author chris
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

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

@@ -28,8 +28,6 @@ import com.dmdirc.commandparser.CommandArguments;
 /**
  * An external command is a channel command that can be executed from outside
  * of the channel.
- *
- * @author chris
  */
 public interface ExternalCommand {
 

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

@@ -30,10 +30,20 @@ import java.util.List;
 /**
  * Intelligent commands implement a method that provides a list of possible
  * options for them, for use (for example) by table completers.
- * @author chris
  */
 public interface IntelligentCommand {
 
+    /**
+     * Returns a list of suggestions for the specified argument, given the
+     * specified context.
+     *
+     * @param arg The argument that is being completed
+     * @param context The context in which suggestions are being sought
+     * @return A list of suggestions for the argument
+     * @since 0.6.4
+     */
+    AdditionalTabTargets getSuggestions(int arg, IntelligentCommandContext context);
+
     /**
      * Describes the context of an intelligent tab completion request.
      *
@@ -91,16 +101,4 @@ public interface IntelligentCommand {
             return partial;
         }
     }
-
-    /**
-     * Returns a list of suggestions for the specified argument, given the
-     * specified context.
-     *
-     * @param arg The argument that is being completed
-     * @param context The context in which suggestions are being sought
-     * @return A list of suggestions for the argument
-     * @since 0.6.4
-     */
-    AdditionalTabTargets getSuggestions(int arg, IntelligentCommandContext context);
-
 }

src/com/dmdirc/commandparser/commands/channel/Ban.java

@@ -37,8 +37,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * The kick command bans a specified user or host from the channel.
- *
- * @author chris
  */
 public final class Ban extends Command implements IntelligentCommand, CommandInfo {
 

src/com/dmdirc/commandparser/commands/channel/ChannelSettings.java

@@ -35,9 +35,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Opens the channel settings window for the channel.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class ChannelSettings extends Command implements
         IntelligentCommand, CommandInfo {
 

src/com/dmdirc/commandparser/commands/channel/Cycle.java

@@ -34,10 +34,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 
 /**
  * The cycle command allows users to rapidly part and rejoin a channel.
- *
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Cycle extends Command implements CommandInfo {
 
     /** Creates a new instance of Cycle. */

src/com/dmdirc/commandparser/commands/channel/Invite.java

@@ -39,9 +39,8 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
  * The invite command allows the user to invite others to a channel.
  *
  * @since 0.6.4
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Invite extends Command implements ExternalCommand, CommandInfo {
 
     /** Creates a new instance of Invite. */

src/com/dmdirc/commandparser/commands/channel/KickReason.java

@@ -39,9 +39,8 @@ import com.dmdirc.ui.input.TabCompletionType;
 /**
  * The kick command kicks a specified user from the channel.
  * This version allows the user to specify a reason.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class KickReason extends Command implements IntelligentCommand,
         CommandInfo {
 

src/com/dmdirc/commandparser/commands/channel/Mode.java

@@ -40,17 +40,11 @@ import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * The mode command allows the user to inspect and change channel modes.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Mode extends Command implements IntelligentCommand,
         ExternalCommand, CommandInfo {
 
-    /** Creates a new instance of Mode. */
-    public Mode() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/channel/Names.java

@@ -38,20 +38,11 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * Sends a names request.
- *
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public class Names extends Command implements IntelligentCommand,
         ExternalCommand, CommandInfo {
 
-    /**
-     * Creates a new instance of Names.
-     */
-    public Names() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/commands/context/ChannelCommandContext.java

@@ -30,7 +30,6 @@ import com.dmdirc.ui.interfaces.Window;
  * A specialised {@link CommandContext} for commands executed in channels.
  *
  * @since 0.6.4
- * @author chris
  */
 public class ChannelCommandContext extends ChatCommandContext {
 

src/com/dmdirc/commandparser/commands/context/CommandContext.java

@@ -29,7 +29,6 @@ import com.dmdirc.ui.interfaces.Window;
  * Provides information relating to the context that a command was executed in.
  *
  * @since 0.6.4
- * @author chris
  */
 public class CommandContext {
 

src/com/dmdirc/commandparser/commands/flags/CommandFlagResult.java

@@ -70,8 +70,8 @@ public class CommandFlagResult {
      */
     public String getArgumentsAsString(final CommandFlag flag) {
         return flag == null ? (offsets.get(flag) > arguments.getArguments().length
-                ? "" : arguments.getArgumentsAsString(offsets.get(flag))) :
-                arguments.getArgumentsAsString(offsets.get(flag),
+                ? "" : arguments.getArgumentsAsString(offsets.get(flag)))
+                : arguments.getArgumentsAsString(offsets.get(flag),
                 offsets.get(flag) + flag.getDelayedArgs() + flag.getImmediateArgs() - 1);
     }
 

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

@@ -36,7 +36,6 @@ import com.dmdirc.ui.input.TabCompleter;
 
 /**
  * The Active command issues a command to the active window.
- * @author chris
  */
 public final class Active extends Command implements IntelligentCommand,
         CommandInfo {

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

@@ -39,8 +39,6 @@ import com.dmdirc.ui.input.TabCompleter;
 
 /**
  * The alias command allows users to create aliases on-the-fly.
- *
- * @author chris
  */
 public final class AliasCommand extends Command implements
         IntelligentCommand, CommandInfo {

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

@@ -36,7 +36,6 @@ import com.dmdirc.ui.input.TabCompleter;
 
 /**
  * The AllServers command allows users to issue commands to all servers.
- * @author chris
  */
 public final class AllServers extends Command implements IntelligentCommand,
         CommandInfo{

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

@@ -33,8 +33,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * The clear command clears the main text area of the current window.
- *
- * @author chris
  */
 public final class Clear extends Command implements IntelligentCommand,
         CommandInfo {

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

@@ -43,8 +43,6 @@ import java.util.List;
 
 /**
  * The echo commands simply echos text to the current window.
- *
- * @author chris
  */
 public final class Echo extends Command implements IntelligentCommand,
         CommandInfo {

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

@@ -34,7 +34,6 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
  * The exit command allows the user to quit DMDirc with a custom quit message.
  * When the client quits, it disconnects all servers (with the quit message
  * supplied) and saves the config file.
- * @author chris
  */
 public final class Exit extends Command implements CommandInfo {
 

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

@@ -44,17 +44,9 @@ import java.util.Map;
  * The help command shows the user a list of available commands, along with
  * their arguments, and a description. It is context-aware, so channel commands
  * are only displayed when in a channel window, for example.
- * @author chris
  */
 public final class Help extends Command implements IntelligentCommand, CommandInfo {
 
-    /**
-     * Creates a new instance of Help.
-     */
-    public Help() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -39,19 +39,10 @@ import com.dmdirc.ui.input.TabCompleter;
 /**
  * The if plugin command allows the user to execute commands based on whether
  * or not a plugin is loaded.
- *
- * @author chris
  */
 public final class Ifplugin extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of Ifplugin.
-     */
-    public Ifplugin() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -36,18 +36,10 @@ import com.dmdirc.ui.interfaces.InputWindow;
 /**
  * The input command allows you to maniplulate text in a windows inputField.
  *
- * @author Simon
  * @since 0.6.4
  */
 public class Input extends Command implements IntelligentCommand, CommandInfo {
 
-    /**
-     * Creates a new instance of Input.
-     */
-    public Input() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -44,19 +44,10 @@ import java.util.regex.Pattern;
 
 /**
  * The new server command allows users to open a new server window.
- *
- * @author chris
  */
 public final class NewServer extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of NewServer.
-     */
-    public NewServer() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,7 +37,6 @@ import com.dmdirc.ui.input.TabCompleter;
 /**
  * The AllChannels command allows the user to issue a command to all channels
  * on a server.
- * @author chris
  */
 public final class AllChannels extends Command implements IntelligentCommand,
         CommandInfo {

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

@@ -34,9 +34,8 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * The away command allows the user to set their away message.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Away extends Command implements CommandInfo {
 
     /**

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

@@ -36,9 +36,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
  * The back command allows the user to unset their away status.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Back extends Command implements IntelligentCommand, CommandInfo {
 
     /**

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

@@ -37,8 +37,6 @@ import java.net.URISyntaxException;
 
 /**
  * The /server command allows the user to connect to a new server.
- *
- * @author chris
  */
 public final class ChangeServer extends Command implements CommandInfo {
 

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

@@ -37,19 +37,11 @@ import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * Allows the user to send CTCP messages.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Ctcp extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of Ctcp.
-     */
-    public Ctcp() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -33,17 +33,9 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 
 /**
  * The disconnect command disconnects from the current server.
- * @author chris
  */
 public final class Disconnect extends Command implements CommandInfo {
 
-    /**
-     * Creates a new instance of Disconnect.
-     */
-    public Disconnect() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -41,18 +41,10 @@ import java.util.regex.PatternSyntaxException;
 
 /**
  * Allows the user to add/view/delete ignores.
- * @author chris
  */
 public final class Ignore extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of Ignore.
-     */
-    public Ignore() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -47,7 +47,6 @@ import java.util.List;
  * Allows the user to join channels.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public class JoinChannelCommand extends Command implements
         ActionListener, IntelligentCommand, CommandInfo {

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

@@ -40,19 +40,11 @@ import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Allows the user to send privmsgs.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Message extends Command implements IntelligentCommand,
         WrappableCommand, CommandInfo {
 
-    /**
-     * Creates a new instance of Message.
-     */
-    public Message() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,19 +37,11 @@ import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * Allows the user to change nickname.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Nick extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of Nick.
-     */
-    public Nick() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

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

@@ -37,19 +37,11 @@ import com.dmdirc.ui.input.TabCompletionType;
 
 /**
  * Allows the user to send notices.
- * @author chris
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public final class Notice extends Command implements IntelligentCommand,
         CommandInfo {
 
-    /**
-     * Creates a new instance of Notice.
-     */
-    public Notice() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,

src/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -35,8 +35,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * A command parser that is tailored for use in a channel environment.
- *
- * @author chris
  */
 public class ChannelCommandParser extends ChatCommandParser {
 

src/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -37,7 +37,6 @@ import com.dmdirc.ui.interfaces.Window;
  * (queries and channels).
  *
  * @since 0.6.4
- * @author chris
  */
 public class ChatCommandParser extends ServerCommandParser {
 

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -41,15 +41,12 @@ import com.dmdirc.util.RollingList;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Map;
 
 /**
  * Represents a generic command parser. A command parser takes a line of input
  * from the user, determines if it is an attempt at executing a command (based
  * on the character at the start of the string), and handles it appropriately.
- *
- * @author chris
  */
 public abstract class CommandParser implements Serializable {
 
@@ -72,7 +69,7 @@ public abstract class CommandParser implements Serializable {
 
     /** Creates a new instance of CommandParser. */
     protected CommandParser() {
-        commands = new Hashtable<String, CommandInfoPair>();
+        commands = new HashMap<String, CommandInfoPair>();
         history = new RollingList<PreviousCommand>(
                 IdentityManager.getGlobalConfig().getOptionInt("general",
                     "commandhistory"));

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -35,7 +35,6 @@ import com.dmdirc.ui.interfaces.Window;
 
 /**
  * The command parser used for global commands.
- * @author chris
  */
 public class GlobalCommandParser extends CommandParser {
 

src/com/dmdirc/config/ConfigManager.java

@@ -38,8 +38,6 @@ import java.util.logging.Level;
 
 /**
  * The config manager manages the various config sources for each entity.
- *
- * @author chris
  */
 public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         IdentityListener {

src/com/dmdirc/config/ConfigSource.java

@@ -51,8 +51,6 @@ import java.util.List;
  * have a value. Note that for this sort of behaviour to make sense, it requires
  * an implementation that takes values from multiple sources, such as a
  * {@link ConfigManager}.
- *
- * @author chris
  */
 public abstract class ConfigSource {
 

src/com/dmdirc/config/ConfigTarget.java

@@ -28,8 +28,6 @@ import java.io.Serializable;
  * Represents the target of a particular config source.
  * <p>
  * Note: this class has a natural ordering that is inconsistent with equals.
- *
- * @author chris
  */
 public class ConfigTarget implements Comparable<ConfigTarget>, Serializable {
 

src/com/dmdirc/config/Identity.java

@@ -49,20 +49,18 @@ import java.util.logging.Level;
  * cases, or the user may manually apply them.
  * <p>
  * Note: this class has a natural ordering that is inconsistent with equals.
- *
- * @author chris
  */
 public class Identity extends ConfigSource implements Comparable<Identity> {
 
+    /** A regular expression that will match all characters illegal in file names. */
+    protected static final String ILLEGAL_CHARS = "[\\\\\"/:\\*\\?\"<>\\|]";
+
     /** The domain used for identity settings. */
     private static final String DOMAIN = "identity".intern();
 
     /** The domain used for profile settings. */
     private static final String PROFILE_DOMAIN = "profile".intern();
 
-    /** A regular expression that will match all characters illegal in file names. */
-    protected static final String ILLEGAL_CHARS = "[\\\\\"/:\\*\\?\"<>\\|]";
-
     /** A logger for this class. */
     private static final java.util.logging.Logger LOGGER = java.util.logging
             .Logger.getLogger(Identity.class.getName());
@@ -518,13 +516,13 @@ public class Identity extends ConfigSource implements Comparable<Identity> {
                         : file.getKeyDomains().entrySet()) {
                     final String domain = entry.getKey();
 
-                    for (Map.Entry<String, String> subentry :
-                        new HashSet<Map.Entry<String, String>>(entry.getValue().entrySet())) {
+                    for (Map.Entry<String, String> subentry
+                        : new HashSet<Map.Entry<String, String>>(entry.getValue().entrySet())) {
                         final String key = subentry.getKey();
                         final String value = subentry.getValue();
 
-                        if (globalConfig.hasOptionString(domain, key) &&
-                                globalConfig.getOption(domain, key).equals(value)) {
+                        if (globalConfig.hasOptionString(domain, key)
+                                && globalConfig.getOption(domain, key).equals(value)) {
                             LOGGER.log(Level.FINEST,
                                     "{0}: found superfluous setting: {1}.{2} (= {3})",
                                     new Object[]{getName(), domain, key, value});

src/com/dmdirc/config/IdentityListener.java

@@ -27,7 +27,6 @@ package com.dmdirc.config;
  * and removed from the {@link IdentityManager}.
  *
  * @since 0.6.4
- * @author chris
  */
 public interface IdentityListener {
 

src/com/dmdirc/config/IdentityManager.java

@@ -47,8 +47,6 @@ import java.util.logging.Level;
 /**
  * The identity manager manages all known identities, providing easy methods
  * to access them.
- *
- * @author chris
  */
 public final class IdentityManager {
 

src/com/dmdirc/config/InvalidIdentityFileException.java

@@ -25,8 +25,6 @@ package com.dmdirc.config;
 /**
  * Thrown when an identity file is read that does not contain the required
  * fields.
- *
- * @author chris
  */
 public class InvalidIdentityFileException extends Exception {
 

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

@@ -24,8 +24,6 @@ package com.dmdirc.config.prefs;
 /**
  * Defines methods that should be implemented by objects who wish to be
  * notified about category changes.
- *
- * @author chris
  */
 public interface CategoryChangeListener {
 

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

@@ -31,8 +31,6 @@ import java.util.List;
  * Represents one category of preferences. Categories can contain 0 or more
  * subcategories, and either 0 or more PreferencesSettings or exactly 1
  * PreferencesInterface object.
- *
- * @author chris
  */
 public class PreferencesCategory {
 
@@ -53,7 +51,7 @@ public class PreferencesCategory {
     private String warning;
 
     /** Whether or not this category is inline. */
-    private boolean isInline = false;
+    private boolean isInline;
 
     /** Whether or not to show inline categories before settings. */
     private boolean inlineBefore = true;
@@ -172,8 +170,8 @@ public class PreferencesCategory {
      */
     public void addSetting(final PreferencesSetting setting) {
         if (hasObject()) {
-            throw new IllegalArgumentException("Can't add settings to a " +
-                    "category that uses a replacement object");
+            throw new IllegalArgumentException("Can't add settings to a "
+                    + "category that uses a replacement object");
         }
 
         settings.add(setting);
@@ -186,8 +184,8 @@ public class PreferencesCategory {
      */
     public void addSubCategory(final PreferencesCategory subcategory) {
         if (isInline() && !subcategory.isInline()) {
-            throw new IllegalArgumentException("Can't add non-inline " +
-                    "subcategories to inline ones");
+            throw new IllegalArgumentException("Can't add non-inline "
+                    + "subcategories to inline ones");
         }
 
         subcategory.setParent(this);

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

@@ -54,10 +54,10 @@ public class PreferencesSetting {
     protected final String helptext;
     /** The current value of the setting. */
     protected String current;
-    /** The original value of this vsetting. */
-    private String original;
     /** Whether or not we need a restart. */
     protected boolean restartNeeded;
+    /** The original value of this vsetting. */
+    private String original;
     /** A list of change listeners. */
     private final List<SettingChangeListener> listeners
             = new ArrayList<SettingChangeListener>();

src/com/dmdirc/config/validators/URLProtocolValidator.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.validators;
 
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
-import com.dmdirc.config.IdentityManager;
 
 /**
  * Validates URLProtocols.

src/com/dmdirc/interfaces/ActionListener.java

@@ -27,8 +27,6 @@ import com.dmdirc.actions.interfaces.ActionType;
 /**
  * Defines the method that has to be implemented by classes wanting to receive
  * action events.
- *
- * @author chris
  */
 public interface ActionListener {
 

src/com/dmdirc/interfaces/AwayStateListener.java

@@ -24,8 +24,6 @@ package com.dmdirc.interfaces;
 
 /**
  * AwayStateListeners are informed of changes to our away state.
- *
- * @author chris
  */
 public interface AwayStateListener {
 

src/com/dmdirc/interfaces/ConfigChangeListener.java

@@ -24,8 +24,6 @@ package com.dmdirc.interfaces;
 
 /**
  * Defines the method required for config change listeners.
-
- * @author Chris
  */
 public interface ConfigChangeListener {
 

src/com/dmdirc/interfaces/FrameCloseListener.java

@@ -29,7 +29,6 @@ import com.dmdirc.FrameContainer;
  * frame closing lifecycle of a {@link FrameContainer}.
  *
  * @since 0.6.5
- * @author chris
  */
 public interface FrameCloseListener {
 
@@ -41,4 +40,4 @@ public interface FrameCloseListener {
      */
     void windowClosing(final FrameContainer window);
 
-}
+}

src/com/dmdirc/interfaces/FrameInfoListener.java

@@ -58,4 +58,4 @@ public interface FrameInfoListener extends EventListener {
      */
     void titleChanged(final FrameContainer window, final String title);
 
-}
+}

src/com/dmdirc/interfaces/InviteListener.java

@@ -30,8 +30,6 @@ import java.util.EventListener;
 /**
  * Defines the methods that should be implemented by classes which wish to
  * receive information about invites.
- *
- * @author Chris
  */
 public interface InviteListener extends EventListener {
 
@@ -50,4 +48,4 @@ public interface InviteListener extends EventListener {
      * @param invite The invite that has expired
      */
     void inviteExpired(final Server server, final Invite invite);
-}
+}

src/com/dmdirc/interfaces/NotificationListener.java

@@ -30,8 +30,6 @@ import java.util.EventListener;
 /**
  * Defines the methods that should be implemented by classes which wish to
  * receive information about notification changes.
- *
- * @author Chris
  */
 public interface NotificationListener extends EventListener {
 
@@ -49,4 +47,4 @@ public interface NotificationListener extends EventListener {
      * @param window The window whose notification has been cleared
      */
     void notificationCleared(final FrameContainer window);
-}
+}

src/com/dmdirc/interfaces/SelectionListener.java

@@ -39,4 +39,4 @@ public interface SelectionListener extends EventListener {
      */
     void selectionChanged(final FrameContainer window);
 
-}
+}

src/com/dmdirc/logger/ErrorReportingThread.java

@@ -28,7 +28,6 @@ import java.util.concurrent.BlockingQueue;
  * Daemon thread which reports errors.
  *
  * @since 0.6.3m1
- * @author chris
  */
 public class ErrorReportingThread extends Thread {
 

src/com/dmdirc/logger/NullOutputStream.java

@@ -30,12 +30,8 @@ import java.io.OutputStream;
  */
 public class NullOutputStream extends OutputStream {
 
-    /** Instantiates a new null output stream. */
-    public NullOutputStream() {
-        super();
-    }
-
     /** {@inheritDoc} */
+    @Override
     public void write(final int b) throws IOException {
         //Ignore data.
     }

src/com/dmdirc/plugins/BasePlugin.java

@@ -35,11 +35,11 @@ public abstract class BasePlugin implements Plugin {
     /** Domain name for the settings in this plugin. */
     private String myDomain = "plugin-unknown";
     /** Has the domain been set? */
-    private boolean domainSet = false;
+    private boolean domainSet;
     /** Associated Plugin info. */
     private PluginInfo pluginInfo;
     /** Files directory for this plugin. */
-    private File filesDir = null;
+    private File filesDir;
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/plugins/NoSuchProviderException.java

@@ -24,8 +24,6 @@ package com.dmdirc.plugins;
 
 /**
  * Plugin Exception.
- *
- * @author            Shane Mc Cormack
  */
 public class NoSuchProviderException extends RuntimeException {
 

src/com/dmdirc/plugins/PluginInfo.java

@@ -58,19 +58,19 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     private static final java.util.logging.Logger LOGGER
             = java.util.logging.Logger.getLogger(PluginInfo.class.getName());
     /** Plugin Meta Data */
-    private volatile ConfigFile metaData = null;
+    private volatile ConfigFile metaData;
     /** URL that this plugin was loaded from */
     private final URL url;
     /** Filename for this plugin (taken from URL) */
     private final String filename;
     /** The actual Plugin from this jar */
-    private Plugin plugin = null;
+    private Plugin plugin;
     /** The classloader used for this Plugin */
-    private PluginClassLoader classloader = null;
+    private PluginClassLoader classloader;
     /** The resource manager used by this pluginInfo */
-    private ResourceManager myResourceManager = null;
+    private ResourceManager myResourceManager;
     /** Is this plugin only loaded temporarily? */
-    private boolean tempLoaded = false;
+    private boolean tempLoaded;
     /** List of classes this plugin has */
     private final List<String> myClasses = new ArrayList<String>();
     /** Requirements error message. */
@@ -78,7 +78,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     /** Last Error Message. */
     private String lastError = "No Error";
     /** Are we trying to load? */
-    private boolean isLoading = false;
+    private boolean isLoading;
     /** List of services we provide. */
     private final List<Service> provides = new ArrayList<Service>();
     /** List of children of this plugin. */
@@ -671,10 +671,10 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             return true;
         }
 
-        if (!checkOS(getKeyValue("requires", "os", ""), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch")) ||
-                !checkFiles(getKeyValue("requires", "files", "")) ||
-                (!preliminary && !checkPlugins(getKeyValue("requires", "plugins", ""))) ||
-                (!preliminary && !checkServices(metaData.getFlatDomain("required-services")))) {
+        if (!checkOS(getKeyValue("requires", "os", ""), System.getProperty("os.name"), System.getProperty("os.version"), System.getProperty("os.arch"))
+                || !checkFiles(getKeyValue("requires", "files", ""))
+                || (!preliminary && !checkPlugins(getKeyValue("requires", "plugins", "")))
+                || (!preliminary && !checkServices(metaData.getFlatDomain("required-services")))) {
             return false;
         }
 

src/com/dmdirc/plugins/PluginManager.java

@@ -46,21 +46,18 @@ import java.util.Map;
 
 /**
  * Searches for and manages plugins and services.
- *
- * @author shane
- * @author chris
  */
 public class PluginManager implements ActionListener {
 
+    /** Singleton instance of the plugin manager. */
+    private static PluginManager me;
+
     /** List of known plugins' file names to their corresponding {@link PluginInfo} objects. */
     private final Map<String, PluginInfo> knownPlugins = new HashMap<String, PluginInfo>();
 
     /** Directory where plugins are stored. */
     private final String myDir;
 
-    /** Singleton instance of the plugin manager. */
-    private static PluginManager me;
-
     /** Map of services. */
     private final Map<String, Map<String, Service>> services = new HashMap<String, Map<String, Service>>();