Fully configure the NB formatter and let it loose.

Change-Id: I7e8052839daa79fa113b89fd0b8c1c892a605b73
Reviewed-on: http://gerrit.dmdirc.com/3122
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

nbproject/project.properties

@@ -9,12 +9,48 @@ auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=100
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignJavadocExceptionDescriptions=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignJavadocParameterDescriptions=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignJavadocReturnDescription=true
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.allowConvertToStarImport=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLineAfterJavadocParameterDescriptions=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLineAfterJavadocReturnTag=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClassClosingBrace=1
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforePackage=1
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classMembersOrder=STATIC_INIT;STATIC FIELD;FIELD;INSTANCE_INIT;CONSTRUCTOR;METHOD;STATIC METHOD;STATIC CLASS;CLASS
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.countForUsingStaticStarImport=1
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.enableBlockCommentFormatting=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=true
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.importGroupsOrder=com.dmdirc;com.google;java;javax;net.miginfocom;org;*;static *
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.separateStaticImports=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=8
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-limit-width=100
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.text-line-wrap=words
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapAnnotationArgs=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapAnnotations=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapArrayInit=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapAssert=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapAssignOps=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapBinaryOps=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapChainedMethodCalls=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapDisjunctiveCatchTypes=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapDoWhileStatement=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapEnumConstants=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapExtendsImplementsKeyword=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapExtendsImplementsList=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapFor=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapForStatement=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapIfStatement=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapMethodCallArgs=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapMethodParams=WRAP_IF_LONG
 auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapOneLineComment=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapTernaryOps=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapThrowsKeyword=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapThrowsList=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapTryResources=WRAP_IF_LONG
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.wrapWhileStatement=WRAP_IF_LONG
 auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
 endorsed.classpath=
 javac.classpath=

src/com/dmdirc/Channel.java

@@ -59,56 +59,46 @@ import java.util.Map;
 import javax.annotation.Nonnull;
 
 /**
- * The Channel class represents the client's view of the channel. It handles
- * callbacks for channel events from the parser, maintains the corresponding
- * ChannelWindow, and handles user input for the channel.
+ * The Channel class represents the client's view of the channel. It handles callbacks for channel
+ * events from the parser, maintains the corresponding ChannelWindow, and handles user input for the
+ * channel.
  */
 @Factory(inject = true, providers = true, singleton = true)
 public class Channel extends MessageTarget implements ConfigChangeListener {
 
     /** List of registered listeners. */
     private final ListenerList listenerList = new ListenerList();
-
     /** The parser's pChannel class. */
     private ChannelInfo channelInfo;
-
     /** The server this channel is on. */
     private final Server server;
-
     /** The tabcompleter used for this channel. */
     private final TabCompleter tabCompleter;
-
     /** A list of previous topics we've seen. */
     private final RollingList<Topic> topics;
-
     /** Our event handler. */
     private final ChannelEventHandler eventHandler;
-
     /** The migrator to use to migrate our config provider. */
     private final ConfigProviderMigrator configMigrator;
-
     /** Whether we're in this channel or not. */
     private boolean isOnChannel;
-
     /** Whether we should send WHO requests for this channel. */
     private volatile boolean sendWho;
-
     /** Whether we should show mode prefixes in text. */
     private volatile boolean showModePrefix;
-
     /** Whether we should show colours in nicks. */
     private volatile boolean showColours;
 
     /**
      * Creates a new instance of Channel.
      *
-     * @param newServer The server object that this channel belongs to
-     * @param newChannelInfo The parser's channel object that corresponds to this channel
-     * @param configMigrator The config migrator which provides the config for this channel.
+     * @param newServer           The server object that this channel belongs to
+     * @param newChannelInfo      The parser's channel object that corresponds to this channel
+     * @param configMigrator      The config migrator which provides the config for this channel.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param commandController The controller to load commands from.
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param commandController   The controller to load commands from.
+     * @param messageSinkManager  The sink manager to use to despatch messages.
+     * @param urlBuilder          The URL builder to use when finding icons.
      */
     public Channel(
             @Unbound final Server newServer,
@@ -125,9 +115,9 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                    WindowComponent.INPUTFIELD.getIdentifier(),
-                    WindowComponent.TOPICBAR.getIdentifier(),
-                    WindowComponent.USERLIST.getIdentifier()));
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.TOPICBAR.getIdentifier(),
+                WindowComponent.USERLIST.getIdentifier()));
 
         this.configMigrator = configMigrator;
         channelInfo = newChannelInfo;
@@ -241,9 +231,9 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Sets this object's ChannelInfo reference to the one supplied. This only
-     * needs to be done if the channel window (and hence this channel object)
-     * has stayed open while the user has been out of the channel.
+     * Sets this object's ChannelInfo reference to the one supplied. This only needs to be done if
+     * the channel window (and hence this channel object) has stayed open while the user has been
+     * out of the channel.
      *
      * @param newChannelInfo The new ChannelInfo object
      */
@@ -269,8 +259,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Updates the title of the channel window, and of the main window if
-     * appropriate.
+     * Updates the title of the channel window, and of the main window if appropriate.
      */
     private void updateTitle() {
         String temp = Styliser.stipControlCodes(channelInfo.getName());
@@ -283,16 +272,14 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Joins the specified channel. This only makes sense if used after a call
-     * to part().
+     * Joins the specified channel. This only makes sense if used after a call to part().
      */
     public void join() {
         server.getParser().joinChannel(channelInfo.getName());
     }
 
     /**
-     * Parts this channel with the specified message. Parting does NOT close the
-     * channel window.
+     * Parts this channel with the specified message. Parting does NOT close the channel window.
      *
      * @param reason The reason for parting the channel
      */
@@ -349,8 +336,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Called every {general.whotime} seconds to check if the channel needs
-     * to send a who request.
+     * Called every {general.whotime} seconds to check if the channel needs to send a who request.
      */
     public void checkWho() {
         if (isOnChannel && sendWho) {
@@ -385,8 +371,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Replaces the list of known clients on this channel with the specified
-     * one.
+     * Replaces the list of known clients on this channel with the specified one.
      *
      * @param clients The list of clients to use
      */
@@ -413,8 +398,8 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Refreshes the list of clients stored by this channel. Should be called
-     * when (visible) user modes or nicknames change.
+     * Refreshes the list of clients stored by this channel. Should be called when (visible) user
+     * modes or nicknames change.
      */
     public void refreshClients() {
         if (!isOnChannel) {
@@ -425,12 +410,12 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Returns a string containing the most important mode for the specified
-     * client.
+     * Returns a string containing the most important mode for the specified client.
      *
      * @param channelClient The channel client to check.
-     * @return A string containing the most important mode, or an empty string
-     * if there are no (known) modes.
+     *
+     * @return A string containing the most important mode, or an empty string if there are no
+     *         (known) modes.
      */
     private String getModes(final ChannelClientInfo channelClient) {
         if (channelClient == null || !showModePrefix) {
@@ -457,25 +442,24 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     /**
-     * Returns a string[] containing the nickname/ident/host of a channel
-     * client.
+     * Returns a string[] containing the nickname/ident/host of a channel client.
      *
      * @param client The channel client to check
+     *
      * @return A string[] containing displayable components
      */
     private String[] getDetails(final ChannelClientInfo client) {
         if (client == null) {
             // WTF?
             throw new UnsupportedOperationException("getDetails called with"
-                     + " null ChannelClientInfo");
+                    + " null ChannelClientInfo");
         }
 
-        final String[] res = new String[] {
+        final String[] res = new String[]{
             getModes(client),
             Styliser.CODE_NICKNAME + client.getClient().getNickname() + Styliser.CODE_NICKNAME,
             client.getClient().getUsername(),
-            client.getClient().getHostname(),
-        };
+            client.getClient().getHostname(),};
 
         if (showColours) {
             final Map<?, ?> map = client.getMap();
@@ -484,11 +468,11 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
                 String prefix;
 
                 if (map.containsKey(ChannelClientProperty.TEXT_BACKGROUND)) {
-                    prefix = "," + ColourManager.getHex((Colour)
-                            map.get(ChannelClientProperty.TEXT_BACKGROUND));
+                    prefix = "," + ColourManager.getHex((Colour) map.get(
+                            ChannelClientProperty.TEXT_BACKGROUND));
                 } else {
-                    prefix = Styliser.CODE_HEXCOLOUR + ColourManager.getHex((Colour)
-                            map.get(ChannelClientProperty.TEXT_FOREGROUND));
+                    prefix = Styliser.CODE_HEXCOLOUR + ColourManager.getHex((Colour) map.get(
+                            ChannelClientProperty.TEXT_FOREGROUND));
                 }
 
                 res[1] = prefix + res[1] + Styliser.CODE_HEXCOLOUR;
@@ -541,7 +525,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     // ---------------------------------------------------- TOPIC HANDLING -----
-
     /**
      * Adds the specified topic to this channel's topic list.
      *
@@ -554,7 +537,6 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
         updateTitle();
 
         new Thread(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -567,8 +549,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     /**
      * Retrieve the topics that have been seen on this channel.
      *
-     * @return A list of topics that have been seen on this channel, including
-     * the current one.
+     * @return A list of topics that have been seen on this channel, including the current one.
      */
     public List<Topic> getTopics() {
         synchronized (topics) {
@@ -592,12 +573,10 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     }
 
     // ------------------------------------------ PARSER METHOD DELEGATION -----
-
     /**
      * Attempts to set the topic of this channel.
      *
-     * @param topic The new topic to be used. An empty string will clear the
-     * current topic
+     * @param topic The new topic to be used. An empty string will clear the current topic
      */
     public void setTopic(final String topic) {
         channelInfo.setTopic(topic);
@@ -607,6 +586,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
      * Retrieves the maximum length that a topic on this channel can be.
      *
      * @return The maximum length that this channel's topic may be
+     *
      * @since 0.6.3
      */
     public int getMaxTopicLength() {
@@ -655,4 +635,5 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     public Connection getConnection() {
         return server;
     }
+
 }

src/com/dmdirc/ChannelClientProperty.java

@@ -29,13 +29,10 @@ public enum ChannelClientProperty {
 
     /** Nicklist client foreground colour. */
     NICKLIST_FOREGROUND,
-
     /** Nicklist client background colour. */
     NICKLIST_BACKGROUND,
-
     /** Textpane client foreground colour. */
     TEXT_FOREGROUND,
-
     /** Textpane client background colour. */
     TEXT_BACKGROUND;
 

src/com/dmdirc/ChannelEventHandler.java

@@ -31,7 +31,24 @@ import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.*; //NOPMD
+import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+import com.dmdirc.parser.interfaces.callbacks.ChannelActionListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelCtcpListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelJoinListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelKickListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelListModeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelMessageListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelModeNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNamesListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNonUserModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNoticeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelPartListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelQuitListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelTopicListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
 
 import java.util.Date;
 
@@ -76,6 +93,7 @@ public class ChannelEventHandler extends EventHandler implements
      * Determines if the specified client represents us.
      *
      * @param client The client to be tested
+     *
      * @return True if the client is ourself, false otherwise.
      */
     protected boolean isMyself(final ChannelClientInfo client) {
@@ -117,7 +135,9 @@ public class ChannelEventHandler extends EventHandler implements
             if (newTopic.getTopic().isEmpty()) {
                 owner.doNotification(date, "channelNoTopic", CoreActionType.CHANNEL_NOTOPIC);
             } else {
-                owner.doNotification(date, "channelTopicDiscovered", CoreActionType.CHANNEL_GOTTOPIC,
+                owner.
+                        doNotification(date, "channelTopicDiscovered",
+                        CoreActionType.CHANNEL_GOTTOPIC,
                         newTopic);
             }
         } else {
@@ -253,7 +273,7 @@ public class ChannelEventHandler extends EventHandler implements
     /** {@inheritDoc} */
     @Override
     public void onChannelCTCP(final Parser parser, final Date date,
-            final ChannelInfo channel,  final ChannelClientInfo client,
+            final ChannelInfo channel, final ChannelClientInfo client,
             final String type, final String message, final String host) {
         checkParser(parser);
 

src/com/dmdirc/ClientModule.java

@@ -84,29 +84,30 @@ import dagger.Provides;
  * Provides dependencies for the client.
  */
 @Module(
-    injects = {Main.class, CommandLineParser.class},
-    includes = {CommandLineOptionsModule.class, CommandModule.class, UpdaterModule.class},
-    library = true
-)
+        injects = {Main.class, CommandLineParser.class},
+        includes = {CommandLineOptionsModule.class, CommandModule.class, UpdaterModule.class},
+        library = true)
 public class ClientModule {
 
     /** Qualifier that identities a global configuration source. */
     @Qualifier
-    public @interface GlobalConfig {}
+    public @interface GlobalConfig {
+    }
 
     /** Qualifier that identities the user settings config provider. */
     @Qualifier
-    public @interface UserConfig {}
-
+    public @interface UserConfig {
+    }
     /** The object graph to inject where necessary. */
     private ObjectGraph objectGraph;
 
     /**
      * Provides an identity manager for the client.
      *
-     * @param baseDirectory The base directory to load settings from.
+     * @param baseDirectory       The base directory to load settings from.
      * @param identitiesDirectory The directory to store and read identities in.
-     * @param commandLineParser The CLI parser to read command line settings from.
+     * @param commandLineParser   The CLI parser to read command line settings from.
+     *
      * @return An initialised {@link IdentityManager}.
      */
     @Provides
@@ -138,6 +139,7 @@ public class ClientModule {
      * Provides an identity controller.
      *
      * @param manager The identity manager to use as a controller.
+     *
      * @return An identity controller to use.
      */
     @Provides
@@ -149,6 +151,7 @@ public class ClientModule {
      * Provides a global config provider.
      *
      * @param controller The controller to retrieve the config from.
+     *
      * @return A global configuration provider.
      */
     @Provides
@@ -161,7 +164,8 @@ public class ClientModule {
      * Provides an icon manager backed by the global configuration.
      *
      * @param globalConfig The global configuration provider.
-     * @param urlBuilder The builder to use to construct icon URLs.
+     * @param urlBuilder   The builder to use to construct icon URLs.
+     *
      * @return An icon manager backed by the global config.
      */
     @Provides
@@ -177,6 +181,7 @@ public class ClientModule {
      * Provides the user's configuration provider.
      *
      * @param controller The controller to retrieve the config from.
+     *
      * @return The user's configuration provider.
      */
     @Provides
@@ -188,12 +193,13 @@ public class ClientModule {
     /**
      * Provides an action manager.
      *
-     * @param serverManager The server manager to use to iterate servers.
-     * @param identityController The identity controller to use to look up settings.
-     * @param actionFactory The factory to use to create actions.
+     * @param serverManager          The server manager to use to iterate servers.
+     * @param identityController     The identity controller to use to look up settings.
+     * @param actionFactory          The factory to use to create actions.
      * @param actionWrappersProvider Provider of action wrappers.
-     * @param updateManagerProvider Provider of an update manager.
-     * @param directory The directory to read and write actions in.
+     * @param updateManagerProvider  Provider of an update manager.
+     * @param directory              The directory to read and write actions in.
+     *
      * @return An unitialised action manager.
      */
     @Provides
@@ -215,6 +221,7 @@ public class ClientModule {
      * Provides an action controller.
      *
      * @param actionManager The action manager to use as a controller.
+     *
      * @return An action controller to use.
      */
     @Provides
@@ -226,6 +233,7 @@ public class ClientModule {
      * Provides a lifecycle controller.
      *
      * @param controller The concrete implementation to use.
+     *
      * @return The lifecycle controller the app should use.
      */
     @Provides
@@ -237,8 +245,9 @@ public class ClientModule {
      * Gets the message sink manager for the client.
      *
      * @param statusBarManager The status bar manager to use for status bar sinks.
-     * @param windowManager The window manager to use for sinks that iterate windows.
-     * @param urlBuilder The URL Builder to use when creating new containers.
+     * @param windowManager    The window manager to use for sinks that iterate windows.
+     * @param urlBuilder       The URL Builder to use when creating new containers.
+     *
      * @return The message sink manager the client should use.
      */
     @Provides
@@ -256,7 +265,8 @@ public class ClientModule {
      * Gets the command manager the client should use.
      *
      * @param serverManager The manager to use to iterate servers.
-     * @param globalConfig The global configuration provider to read settings from.
+     * @param globalConfig  The global configuration provider to read settings from.
+     *
      * @return The command manager the client should use.
      */
     @Provides
@@ -273,6 +283,7 @@ public class ClientModule {
      * Gets a command controller for use in the client.
      *
      * @param commandManager The manager to use as a controller.
+     *
      * @return The command controller the client should use.
      */
     @Provides
@@ -283,12 +294,13 @@ public class ClientModule {
     /**
      * Gets an initialised plugin manager for the client.
      *
-     * @param identityController The controller to read settings from.
-     * @param actionController The action controller to use for events.
-     * @param updateManager The update manager to inform about plugins.
+     * @param identityController  The controller to read settings from.
+     * @param actionController    The action controller to use for events.
+     * @param updateManager       The update manager to inform about plugins.
      * @param initialiserProvider Provider to use to create plugin initialisers.
-     * @param objectGraph The graph to provide to plugins for DI purposes.
-     * @param directory The directory to load and save plugins in.
+     * @param objectGraph         The graph to provide to plugins for DI purposes.
+     * @param directory           The directory to load and save plugins in.
+     *
      * @return An initialised plugin manager for the client.
      */
     @Provides
@@ -321,6 +333,7 @@ public class ClientModule {
      * Provides a service manager.
      *
      * @param pluginManager The plugin manager to use as the service manager implementation.
+     *
      * @return A service manager.
      */
     @Provides
@@ -332,7 +345,8 @@ public class ClientModule {
      * Gets a core plugin extractor.
      *
      * @param pluginManager The plugin manager to notify about updates.
-     * @param directory The directory to extract plugins to.
+     * @param directory     The directory to extract plugins to.
+     *
      * @return A plugin extractor for the client to use.
      */
     @Provides
@@ -346,7 +360,8 @@ public class ClientModule {
      * Gets a theme manager for the client.
      *
      * @param controller The identity controller to use to access settings.
-     * @param directory The directory to load themes from.
+     * @param directory  The directory to load themes from.
+     *
      * @return An initialised theme manager instance.
      */
     @Provides
@@ -363,6 +378,7 @@ public class ClientModule {
      * Gets the alias actions wrapper entry for the actions wrapper set.
      *
      * @param aliasWrapper The wrapper to use in the set.
+     *
      * @return An alias wrapper to use in the client.
      */
     @Provides(type = Provides.Type.SET)
@@ -387,6 +403,7 @@ public class ClientModule {
      * Gets the colour manager.
      *
      * @param globalConfig A global configuration provider to read settings from.
+     *
      * @return A colour manager for the client.
      */
     @Provides
@@ -409,6 +426,7 @@ public class ClientModule {
      * Gets a server factory.
      *
      * @param serverManager The manager to use as a factory.
+     *
      * @return A server factory.
      */
     @Provides
@@ -419,7 +437,8 @@ public class ClientModule {
     /**
      * Gets an identity factory.
      *
-     * @param identityManager  The manager to use as a factory.
+     * @param identityManager The manager to use as a factory.
+     *
      * @return An identity factory.
      */
     @Provides
@@ -459,14 +478,14 @@ public class ClientModule {
     }
 
     /**
-     * Called when the global config cannot be loaded due to an error. This
-     * method informs the user of the problem and installs a new default config
-     * file, backing up the old one.
+     * Called when the global config cannot be loaded due to an error. This method informs the user
+     * of the problem and installs a new default config file, backing up the old one.
      *
      * @param identityManager The identity manager to re-initialise after installing defaults.
-     * @param configdir The directory to extract default settings into.
+     * @param configdir       The directory to extract default settings into.
      */
-    private void handleInvalidConfigFile(final IdentityManager identityManager, final String configdir) {
+    private void handleInvalidConfigFile(final IdentityManager identityManager,
+            final String configdir) {
         final String date = new SimpleDateFormat("yyyyMMddkkmmss").format(new Date());
 
         final String message = "DMDirc has detected that your config file "
@@ -504,14 +523,13 @@ public class ClientModule {
     }
 
     /**
-     * Ensures that there is at least one provider of the specified
-     * service type by extracting matching core plugins. Plugins must be named
-     * so that their file name starts with the service type, and then an
-     * underscore.
+     * Ensures that there is at least one provider of the specified service type by extracting
+     * matching core plugins. Plugins must be named so that their file name starts with the service
+     * type, and then an underscore.
      *
      * @param corePluginExtractor Extractor to use if the service doesn't exist
-     * @param pm The plugin manager to use to access services
-     * @param serviceType The type of service that should exist
+     * @param pm                  The plugin manager to use to access services
+     * @param serviceType         The type of service that should exist
      */
     public void ensureExists(
             final CorePluginExtractor corePluginExtractor,
@@ -524,13 +542,13 @@ public class ClientModule {
     }
 
     /**
-     * Checks whether the plugins bundled with this release of DMDirc are newer
-     * than the plugins known by the specified {@link PluginManager}. If the
-     * bundled plugins are newer, they are automatically extracted.
+     * Checks whether the plugins bundled with this release of DMDirc are newer than the plugins
+     * known by the specified {@link PluginManager}. If the bundled plugins are newer, they are
+     * automatically extracted.
      *
      * @param corePluginExtractor Extractor to use if plugins need updating.
-     * @param pm The plugin manager to use to check plugins
-     * @param config The configuration source for bundled versions
+     * @param pm                  The plugin manager to use to check plugins
+     * @param config              The configuration source for bundled versions
      */
     private void checkBundledPlugins(
             final CorePluginExtractor corePluginExtractor,

src/com/dmdirc/CorePluginExtractor.java

@@ -46,7 +46,7 @@ public class CorePluginExtractor {
      * Creates a new instance of {@link CorePluginExtractor}.
      *
      * @param pluginManager The plugin manager to inform when plugins are updated.
-     * @param pluginDir The directory to extract plugins to.
+     * @param pluginDir     The directory to extract plugins to.
      */
     public CorePluginExtractor(final PluginManager pluginManager, final String pluginDir) {
         this.pluginManager = pluginManager;
@@ -54,11 +54,10 @@ public class CorePluginExtractor {
     }
 
     /**
-     * Extracts plugins bundled with DMDirc to the user's profile's plugin
-     * directory.
+     * Extracts plugins bundled with DMDirc to the user's profile's plugin directory.
      *
-     * @param prefix If non-null, only plugins whose file name starts with
-     * this prefix will be extracted.
+     * @param prefix If non-null, only plugins whose file name starts with this prefix will be
+     *               extracted.
      */
     public void extractCorePlugins(final String prefix) {
         final Map<String, byte[]> resources = ResourceManager.getResourceManager()

src/com/dmdirc/CustomWindow.java

@@ -37,9 +37,9 @@ public class CustomWindow extends FrameContainer {
     /**
      * Creates a new custom window as a child of the specified window.
      *
-     * @param name The name of this custom window
-     * @param title The title of this custom window
-     * @param parent The parent of this custom window
+     * @param name       The name of this custom window
+     * @param title      The title of this custom window
+     * @param parent     The parent of this custom window
      * @param urlBuilder The URL builder to use when finding icons.
      */
     public CustomWindow(
@@ -54,10 +54,10 @@ public class CustomWindow extends FrameContainer {
     /**
      * Creates a new custom window as a top-level window.
      *
-     * @param name The name of this custom window
-     * @param title The parent of this custom window
+     * @param name           The name of this custom window
+     * @param title          The parent of this custom window
      * @param configProvider The config provider to read settings from.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param urlBuilder     The URL builder to use when finding icons.
      */
     public CustomWindow(
             final String name,

src/com/dmdirc/EventHandler.java

@@ -38,8 +38,7 @@ import javax.annotation.Nonnull;
 public abstract class EventHandler implements CallbackInterface {
 
     /**
-     * Registers all callbacks that this event handler implements with the
-     * owner's parser.
+     * Registers all callbacks that this event handler implements with the owner's parser.
      */
     public void registerCallbacks() {
         final CallbackManager cbm = getConnection().getParser().getCallbackManager();
@@ -68,9 +67,10 @@ public abstract class EventHandler implements CallbackInterface {
     /**
      * Adds a callback to this event handler.
      *
-     * @param <T> The type of callback to be added
-     * @param cbm The callback manager to use
+     * @param <T>  The type of callback to be added
+     * @param cbm  The callback manager to use
      * @param type The type of the callback to be added
+     *
      * @throws CallbackNotFoundException if the specified callback isn't found
      */
     protected abstract <T extends CallbackInterface> void addCallback(
@@ -86,9 +86,8 @@ public abstract class EventHandler implements CallbackInterface {
     protected abstract Connection getConnection();
 
     /**
-     * Checks that the specified parser is the same as the one the server is
-     * currently claiming to be using. If it isn't, we raise an exception to
-     * prevent further (erroneous) processing.
+     * Checks that the specified parser is the same as the one the server is currently claiming to
+     * be using. If it isn't, we raise an exception to prevent further (erroneous) processing.
      *
      * @param parser The parser to check
      */

src/com/dmdirc/FrameContainer.java

@@ -49,66 +49,52 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
- * The frame container implements basic methods that should be present in
- * all objects that handle a frame.
+ * The frame container implements basic methods that should be present in all objects that handle a
+ * frame.
  */
 public abstract class FrameContainer {
 
     /** Listeners not yet using ListenerSupport. */
     protected final ListenerList listeners = new ListenerList();
-
     /** The colour of our frame's notifications. */
     private Colour notification = Colour.BLACK;
-
     /** The document used to store this container's content. */
     private IRCDocument document;
-
     /** The children of this frame. */
-    private final Collection<FrameContainer> children
-            = new CopyOnWriteArrayList<>();
-
+    private final Collection<FrameContainer> children = new CopyOnWriteArrayList<>();
     /** The parent of this frame. */
     private FrameContainer parent;
-
     /** The name of the icon being used for this container's frame. */
     private String icon;
-
     /** The name of this container. */
     private String name;
-
     /** The title of this container. */
     private String title;
-
     /** The config manager for this container. */
     private final AggregateConfigProvider configManager;
-
     /** The IconChanger for this container. */
     private final IconChanger changer = new IconChanger();
-
     /** The UI components that this frame requires. */
     private final Set<String> components;
-
     /** The styliser used by this container. */
     private Styliser styliser;
-
     /** Object used to synchronise styliser access. */
     private final Object styliserSync = new Object();
-
     /** Object used to synchronise styliser access. */
     private final Object documentSync = new Object();
-
     /** The icon manager to use for this container. */
     private final IconManager iconManager;
 
     /**
      * Instantiate new frame container.
      *
-     * @param icon The icon to use for this container
-     * @param name The name of this container
-     * @param title The title of this container
-     * @param config The config manager for this container
+     * @param icon       The icon to use for this container
+     * @param name       The name of this container
+     * @param title      The title of this container
+     * @param config     The config manager for this container
      * @param urlBuilder The URL builder to use when finding icons.
      * @param components The UI components that this frame requires
+     *
      * @since 0.6.4
      */
     protected FrameContainer(
@@ -155,6 +141,7 @@ public abstract class FrameContainer {
      * Returns a collection of direct children of this frame.
      *
      * @return This frame's children
+     *
      * @since 0.6.4
      */
     public Collection<FrameContainer> getChildren() {
@@ -162,10 +149,11 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Determines whether the specified target is a child of this container.
-     * Children may be indirect (i.e., a child of another child).
+     * Determines whether the specified target is a child of this container. Children may be
+     * indirect (i.e., a child of another child).
      *
      * @param target The window to be tested
+     *
      * @return True if the specified container is a child of this one
      */
     public boolean isChild(final FrameContainer target) {
@@ -186,6 +174,7 @@ public abstract class FrameContainer {
      * Adds a new child window to this frame.
      *
      * @param child The window to be added
+     *
      * @since 0.6.4
      */
     public void addChild(final FrameContainer child) {
@@ -197,6 +186,7 @@ public abstract class FrameContainer {
      * Removes a child window from this frame.
      *
      * @param child The window to be removed
+     *
      * @since 0.6.4
      */
     public void removeChild(final FrameContainer child) {
@@ -204,11 +194,11 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Sets the parent of this container to the one specified. If this
-     * container already had a parent, it will deregister itself with the
-     * old parent.
+     * Sets the parent of this container to the one specified. If this container already had a
+     * parent, it will deregister itself with the old parent.
      *
      * @param parent The new parent for this container
+     *
      * @since 0.6.4
      */
     public synchronized void setParent(final FrameContainer parent) {
@@ -232,7 +222,9 @@ public abstract class FrameContainer {
      * Gets an icon manager for this container.
      *
      * @param urlBuilder The builder to use to construct icon URLs.
+     *
      * @return An icon manager for this container.
+     *
      * @deprecated Don't bother passing in a URL builder. That was a bad idea.
      */
     @Deprecated
@@ -244,6 +236,7 @@ public abstract class FrameContainer {
      * Retrieves the {@link IRCDocument} used to store this frame's content.
      *
      * @return This frame's document
+     *
      * @since 0.6.4
      */
     public IRCDocument getDocument() {
@@ -256,8 +249,8 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Changes the name of this container, and notifies any
-     * {@link FrameInfoListener}s of the change.
+     * Changes the name of this container, and notifies any {@link FrameInfoListener}s of the
+     * change.
      *
      * @param name The new name for this frame.
      */
@@ -268,8 +261,8 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Changes the title of this container, and notifies any
-     * {@link FrameInfoListener}s of the change.
+     * Changes the title of this container, and notifies any {@link FrameInfoListener}s of the
+     * change.
      *
      * @param title The new title for this frame.
      */
@@ -280,8 +273,8 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Returns the collection of UI component identifiers that this frame
-     * container requires for its display.
+     * Returns the collection of UI component identifiers that this frame container requires for its
+     * display.
      *
      * @since 0.6.6
      * @return Collection of UI component identifiers
@@ -395,16 +388,17 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Adds a line to this container's window. If the window is null for some
-     * reason, the line is silently discarded.
+     * Adds a line to this container's window. If the window is null for some reason, the line is
+     * silently discarded.
      *
-     * @param type The message type to use
+     * @param type      The message type to use
      * @param timestamp The timestamp to use for this line
-     * @param args The message's arguments
+     * @param args      The message's arguments
+     *
      * @since 0.6.4
      */
     public void addLine(final String type, final Date timestamp,
-            final Object ... args) {
+            final Object... args) {
         if (type != null && !type.isEmpty()) {
             addLine(Formatter.formatMessage(getConfigManager(), type, args),
                     timestamp);
@@ -412,47 +406,48 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Adds a line to this container's window. If the window is null for some
-     * reason, the line is silently discarded.
+     * Adds a line to this container's window. If the window is null for some reason, the line is
+     * silently discarded.
      *
      * @param type The message type to use
      * @param args The message's arguments
      */
-    public void addLine(final String type, final Object ... args) {
+    public void addLine(final String type, final Object... args) {
         addLine(type, new Date(), args);
     }
 
     /**
-     * Adds a line to this container's window. If the window is null for some
-     * reason, the line is silently discarded.
+     * Adds a line to this container's window. If the window is null for some reason, the line is
+     * silently discarded.
      *
-     * @param type The message type to use
+     * @param type      The message type to use
      * @param timestamp The timestamp to use for this line
-     * @param args The message's arguments
+     * @param args      The message's arguments
+     *
      * @since 0.6.4
      */
     public void addLine(final StringBuffer type, final Date timestamp,
-            final Object ... args) {
+            final Object... args) {
         if (type != null) {
             addLine(type.toString(), timestamp, args);
         }
     }
 
     /**
-     * Adds a line to this container's window. If the window is null for some
-     * reason, the line is silently discarded.
+     * Adds a line to this container's window. If the window is null for some reason, the line is
+     * silently discarded.
      *
      * @param type The message type to use
      * @param args The message's arguments
      */
-    public void addLine(final StringBuffer type, final Object ... args) {
+    public void addLine(final StringBuffer type, final Object... args) {
         addLine(type, new Date(), args);
     }
 
     /**
      * Adds the specified raw line to the window, without using a formatter.
      *
-     * @param line The line to be added
+     * @param line      The line to be added
      * @param timestamp Whether or not to display the timestamp for this line
      */
     public void addLine(final String line, final boolean timestamp) {
@@ -460,12 +455,13 @@ public abstract class FrameContainer {
     }
 
     /**
-     * Adds the specified raw line to the window, without using a formatter,
-     * and using the specified timestamp. If the timestamp is <code>null</code>,
-     * no timestamp is added.
+     * Adds the specified raw line to the window, without using a formatter, and using the specified
+     * timestamp. If the timestamp is
+     * <code>null</code>, no timestamp is added.
      *
-     * @param line The line to be added
+     * @param line      The line to be added
      * @param timestamp The timestamp to use for the line
+     *
      * @since 0.6.4
      */
     public void addLine(final String line, final Date timestamp) {
@@ -474,13 +470,11 @@ public abstract class FrameContainer {
             if (timestamp != null) {
                 lines.add(new String[]{
                     Formatter.formatMessage(getConfigManager(), "timestamp",
-                            timestamp),
-                    myLine,
-                });
+                    timestamp),
+                    myLine,});
             } else {
                 lines.add(new String[]{
-                    myLine,
-                });
+                    myLine,});
             }
 
             ActionManager.getActionManager().triggerEvent(
@@ -578,4 +572,5 @@ public abstract class FrameContainer {
         }
 
     }
+
 }

src/com/dmdirc/FrameContainerComparator.java

@@ -33,9 +33,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class FrameContainerComparator implements Comparator<FrameContainer>, Serializable {
 
     /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
+     * A version number for this class. It should be changed whenever the class structure is changed
+     * (or anything else that would prevent serialized objects being unserialized with the new
+     * class).
      */
     private static final long serialVersionUID = 1;
 
@@ -44,8 +44,8 @@ public class FrameContainerComparator implements Comparator<FrameContainer>, Ser
      *
      * @param item1 The first container to compare
      * @param item2 The second container to compare
-     * @return -1 if item1 is before item2, 0 if they're equal,
-     * +1 if item1 is after item2.
+     *
+     * @return -1 if item1 is before item2, 0 if they're equal, +1 if item1 is after item2.
      */
     @Override
     @Precondition({
@@ -81,6 +81,7 @@ public class FrameContainerComparator implements Comparator<FrameContainer>, Ser
      *
      * @param item1 The new container to be tested
      * @param item2 The existing container to test against
+     *
      * @return True iff the new container should be before the old container
      */
     private static boolean sortBefore(
@@ -94,6 +95,7 @@ public class FrameContainerComparator implements Comparator<FrameContainer>, Ser
      *
      * @param item1 The new container to be tested
      * @param item2 The existing container to test against
+     *
      * @return True iff the new container should be after the old container
      */
     private static boolean sortAfter(final FrameContainer item1,
@@ -102,10 +104,10 @@ public class FrameContainerComparator implements Comparator<FrameContainer>, Ser
     }
 
     /**
-     * Returns an integer corresponding to the expected order of a frame
-     * container.
+     * Returns an integer corresponding to the expected order of a frame container.
      *
      * @param item The frame container to be tested
+     *
      * @return Position of the frame container
      */
     private static int getPosition(final FrameContainer item) {

src/com/dmdirc/GlobalWindow.java

@@ -54,11 +54,11 @@ public class GlobalWindow extends WritableFrameContainer {
     /**
      * Creates a new instance of GlobalWindow.
      *
-     * @param config The ConfigManager to retrieve settings from.
-     * @param parser The command parser to use to parse input.
+     * @param config              The ConfigManager to retrieve settings from.
+     * @param parser              The command parser to use to parse input.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param messageSinkManager  The sink manager to use to despatch messages.
+     * @param urlBuilder          The URL builder to use when finding icons.
      */
     public GlobalWindow(
             final AggregateConfigProvider config,
@@ -68,8 +68,8 @@ public class GlobalWindow extends WritableFrameContainer {
             final URLBuilder urlBuilder) {
         super("icon", "Global", "(Global)", config, parser, messageSinkManager, urlBuilder,
                 Arrays.asList(
-                        WindowComponent.TEXTAREA.getIdentifier(),
-                        WindowComponent.INPUTFIELD.getIdentifier()));
+                WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         tabCompleter = tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL);
     }
@@ -112,19 +112,19 @@ public class GlobalWindow extends WritableFrameContainer {
         private final Provider<GlobalCommandParser> globalCommandParserProvider;
         /** The URL builder to use when finding icons. */
         private final URLBuilder urlBuilder;
-
         /** The global window that's in use, if any. */
         private GlobalWindow globalWindow;
 
         /**
          * Creates a new instance of {@link GlobalWindowManager}.
          *
-         * @param globalConfig Configuration provider to read settings from.
-         * @param tabCompleterFactory Factory to use to create tab completers.
-         * @param windowManagerProvider The provider to use to retrieve a window manager.
-         * @param messageSinkManagerProvider The provider to use to retrieve a sink manager.
-         * @param globalCommandParserProvider The provider to use to retrieve a global command parser.
-         * @param urlBuilder The URL builder to use when finding icons.
+         * @param globalConfig                Configuration provider to read settings from.
+         * @param tabCompleterFactory         Factory to use to create tab completers.
+         * @param windowManagerProvider       The provider to use to retrieve a window manager.
+         * @param messageSinkManagerProvider  The provider to use to retrieve a sink manager.
+         * @param globalCommandParserProvider The provider to use to retrieve a global command
+         *                                    parser.
+         * @param urlBuilder                  The URL builder to use when finding icons.
          */
         @Inject
         public GlobalWindowManager(
@@ -157,8 +157,8 @@ public class GlobalWindow extends WritableFrameContainer {
         }
 
         /**
-         * Updates the state of the global window in line with the
-         * general.showglobalwindow config setting.
+         * Updates the state of the global window in line with the general.showglobalwindow config
+         * setting.
          */
         protected void updateWindowState() {
             synchronized (GlobalWindow.class) {

src/com/dmdirc/Invite.java

@@ -33,13 +33,10 @@ public class Invite {
 
     /** The connection this invite was on. */
     private final Connection connection;
-
     /** The channel this invite is for. */
     private final String channel;
-
     /** The time this invite was created. */
     private final long timestamp;
-
     /** The source of this invite. */
     private final String source;
 
@@ -47,8 +44,8 @@ public class Invite {
      * Creates a new instance of Invite.
      *
      * @param connection The connection that this invite was received on
-     * @param channel The channel that this invite is for
-     * @param source The source of this invite
+     * @param channel    The channel that this invite is for
+     * @param source     The source of this invite
      */
     public Invite(final Connection connection, final String channel, final String source) {
         this.connection = connection;
@@ -69,6 +66,7 @@ public class Invite {
      * Retrieves the source of this invite.
      *
      * @return This invite's source
+     *
      * @see Server#parseHostmask(java.lang.String)
      */
     public String[] getSource() {
@@ -88,4 +86,5 @@ public class Invite {
     public void decline() {
         connection.removeInvite(this);
     }
+
 }

src/com/dmdirc/Main.java

@@ -63,59 +63,49 @@ public class Main {
 
     /** Feedback nag delay. */
     private final int FEEDBACK_DELAY = 30 * 60 * 1000;
-
     /** The UI to use for the client. */
     private final Collection<UIController> CONTROLLERS = new HashSet<>();
-
     /** The identity manager the client will use. */
     private final IdentityController identityManager;
-
     /** The server manager the client will use. */
     private final ServerManager serverManager;
-
     /** The action manager the client will use. */
     private final ActionManager actionManager;
-
     /** The command-line parser used for this instance. */
     private final CommandLineParser commandLineParser;
-
     /** The plugin manager the client will use. */
     private final PluginManager pluginManager;
-
     /** The extractor to use for core plugins. */
     private final CorePluginExtractor corePluginExtractor;
-
     /** The command manager to use. */
     private final CommandManager commandManager;
-
     /** The global window manager to use. */
     private final GlobalWindowManager globalWindowManager;
-
     /** The colour-based action comparisons. */
     private final ColourActionComparison colourActionComparison;
-
     /** The event bus to dispatch events on. */
     private final EventBus eventBus;
-
     /** The commands to load into the command manager. */
     private final Set<CommandDetails> commands;
 
     /**
      * Creates a new instance of {@link Main}.
      *
-     * @param identityManager The identity manager the client will use.
-     * @param serverManager The server manager the client will use.
-     * @param actionManager The action manager the client will use.
-     * @param commandLineParser The command-line parser used for this instance.
-     * @param pluginManager The plugin manager the client will use.
-     * @param commandManager The command manager the client will use.
-     * @param messageSinkManager Unused for now - TODO: remove me when it's injected somewhere sensible.
-     * @param themeManager Unused for now - TODO: remove me when it's injected somewhere sensible.
-     * @param corePluginExtractor Extractor to use for core plugins.
-     * @param globalWindowManager Global window manager to use.
+     * @param identityManager        The identity manager the client will use.
+     * @param serverManager          The server manager the client will use.
+     * @param actionManager          The action manager the client will use.
+     * @param commandLineParser      The command-line parser used for this instance.
+     * @param pluginManager          The plugin manager the client will use.
+     * @param commandManager         The command manager the client will use.
+     * @param messageSinkManager     Unused for now - TODO: remove me when it's injected somewhere
+     *                               sensible.
+     * @param themeManager           Unused for now - TODO: remove me when it's injected somewhere
+     *                               sensible.
+     * @param corePluginExtractor    Extractor to use for core plugins.
+     * @param globalWindowManager    Global window manager to use.
      * @param colourActionComparison The colour-based action comparisons.
-     * @param eventBus The event bus to dispatch events on.
-     * @param commands The commands to be loaded into the command manager.
+     * @param eventBus               The event bus to dispatch events on.
+     * @param commands               The commands to be loaded into the command manager.
      */
     @Inject
     public Main(
@@ -202,10 +192,9 @@ public class Main {
     }
 
     /**
-     * Called when the UI has failed to initialise correctly. This method
-     * attempts to extract any and all UI plugins bundled with the client, and
-     * requests a restart. If this has already been attempted, it shows an error
-     * and exits.
+     * Called when the UI has failed to initialise correctly. This method attempts to extract any
+     * and all UI plugins bundled with the client, and requests a restart. If this has already been
+     * attempted, it shows an error and exits.
      */
     private void handleMissingUI() {
         // Check to see if we have already tried this
@@ -237,8 +226,7 @@ public class Main {
     }
 
     /**
-     * Attempts to find and activate a service which provides a UI that we
-     * can use.
+     * Attempts to find and activate a service which provides a UI that we can use.
      *
      * @param pm The plugin manager to use to load plugins
      */
@@ -279,7 +267,6 @@ public class Main {
             }
 
             new Timer().schedule(new TimerTask() {
-
                 /** {@inheritDoc} */
                 @Override
                 public void run() {

src/com/dmdirc/MessageEncoder.java

@@ -30,14 +30,13 @@ import com.dmdirc.parser.interfaces.Parser;
 import java.io.UnsupportedEncodingException;
 
 /**
- * An {@link Encoder} implementation that reads the desired encoding from
- * the relevant target's config file.
+ * An {@link Encoder} implementation that reads the desired encoding from the relevant target's
+ * config file.
  */
 public class MessageEncoder implements Encoder {
 
     /** The server that owns this encoder. */
     private final Server server;
-
     /** The parser that this encoder will work for. */
     private final Parser parser;
 

src/com/dmdirc/MessageTarget.java

@@ -30,22 +30,22 @@ import com.dmdirc.util.URLBuilder;
 import java.util.Collection;
 
 /**
- * Defines common methods for objects that you can send messages to (such as
- * channels and queries).
+ * Defines common methods for objects that you can send messages to (such as channels and queries).
  */
 public abstract class MessageTarget extends WritableFrameContainer {
 
     /**
      * Creates a new MessageTarget.
      *
-     * @param icon The icon to use for this target
-     * @param name The name of this target
-     * @param title The title of this target
-     * @param config The config manager to use for this target
-     * @param parser The command parser for this container
+     * @param icon               The icon to use for this target
+     * @param name               The name of this target
+     * @param title              The title of this target
+     * @param config             The config manager to use for this target
+     * @param parser             The command parser for this container
      * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param components The UI components that this frame requires
+     * @param urlBuilder         The URL builder to use when finding icons.
+     * @param components         The UI components that this frame requires
+     *
      * @since 0.6.4
      */
     public MessageTarget(
@@ -61,8 +61,7 @@ public abstract class MessageTarget extends WritableFrameContainer {
     }
 
     /**
-     * Sends the specified string as an action (CTCP) to the target that this
-     * object represents.
+     * Sends the specified string as an action (CTCP) to the target that this object represents.
      *
      * @param action The action to send
      */

src/com/dmdirc/MissingModeAliasException.java

@@ -32,20 +32,19 @@ import java.util.List;
 public class MissingModeAliasException extends Exception {
 
     /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
+     * A version number for this class. It should be changed whenever the class structure is changed
+     * (or anything else that would prevent serialized objects being unserialized with the new
+     * class).
      */
     private static final long serialVersionUID = 1;
 
     /**
-     * Creates a new exception detailing the missing modes aliases and
-     * supporting information.
+     * Creates a new exception detailing the missing modes aliases and supporting information.
      *
-     * @param network Network
-     * @param parser Assocaited parser
+     * @param network            Network
+     * @param parser             Assocaited parser
      * @param modeAliasesVersion Current mode aliases version
-     * @param missingModes Missing modes
+     * @param missingModes       Missing modes
      */
     public MissingModeAliasException(final String network, final Parser parser,
             final String modeAliasesVersion, final String missingModes) {
@@ -68,4 +67,5 @@ public class MissingModeAliasException extends Exception {
 
         return sb.toString();
     }
+
 }

src/com/dmdirc/ParserFactory.java

@@ -59,9 +59,11 @@ public class ParserFactory {
     /**
      * Retrieves a parser instance.
      *
-     * @param myInfo The client information to use
+     * @param myInfo  The client information to use
      * @param address The address of the server to connect to
+     *
      * @return An appropriately configured parser
+     *
      * @since 0.6.3
      */
     public Parser getParser(final MyInfo myInfo, final URI address) {
@@ -77,7 +79,9 @@ public class ParserFactory {
      * Retrieves a protocol description.
      *
      * @param address The address to retrieve a description for
+     *
      * @return A corresponding protocol description
+     *
      * @since 0.6.4
      */
     public ProtocolDescription getDescription(final URI address) {
@@ -91,17 +95,19 @@ public class ParserFactory {
 
     /**
      * Retrieves and executes an exported service with the specified name from a
-     * {@link ServiceProvider} which can provide a parser for the specified
-     * address. If no such provider or service is found, null is returned.
+     * {@link ServiceProvider} which can provide a parser for the specified address. If no such
+     * provider or service is found, null is returned.
      *
-     * @param address The address a provider is required for
+     * @param address     The address a provider is required for
      * @param serviceName The name of the service to be retrieved
-     * @param args The arguments to be passed to the exported service
+     * @param args        The arguments to be passed to the exported service
+     *
      * @return The result from a relevant exported service, or null
+     *
      * @since 0.6.4
      */
     protected Object getExportResult(final URI address,
-            final String serviceName, final Object ... args) {
+            final String serviceName, final Object... args) {
         // TODO: Move default scheme to a setting
         final String scheme = address.getScheme() == null ? "irc" : address.getScheme();
 

src/com/dmdirc/Precondition.java

@@ -25,9 +25,8 @@ package com.dmdirc;
 import java.lang.annotation.Documented;
 
 /**
- * The precondition annotation is used to indicate that a particular method
- * has one or more preconditions. The preconditions are specified in plain
- * English.
+ * The precondition annotation is used to indicate that a particular method has one or more
+ * preconditions. The preconditions are specified in plain English.
  */
 @Documented
 public @interface Precondition {

src/com/dmdirc/Query.java

@@ -54,9 +54,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * The Query class represents the client's view of a query with another user.
- * It handles callbacks for query events from the parser, maintains the
- * corresponding QueryWindow, and handles user input for the query.
+ * The Query class represents the client's view of a query with another user. It handles callbacks
+ * for query events from the parser, maintains the corresponding QueryWindow, and handles user input
+ * for the query.
  */
 @Factory(inject = true, providers = true, singleton = true)
 public class Query extends MessageTarget implements PrivateActionListener,
@@ -65,25 +65,22 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
     /** The Server this Query is on. */
     private final Server server;
-
     /** The full host of the client associated with this query. */
     private String host;
-
     /** The nickname of the client associated with this query. */
     private String nickname;
-
     /** The tab completer for the query window. */
     private final TabCompleter tabCompleter;
 
     /**
      * Creates a new instance of Query.
      *
-     * @param newHost host of the remove client
-     * @param newServer The server object that this Query belongs to
+     * @param newHost             host of the remove client
+     * @param newServer           The server object that this Query belongs to
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param commandController The controller to load commands from.
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param commandController   The controller to load commands from.
+     * @param messageSinkManager  The sink manager to use to despatch messages.
+     * @param urlBuilder          The URL builder to use when finding icons.
      */
     public Query(
             @Unbound final Server newServer,
@@ -98,8 +95,8 @@ public class Query extends MessageTarget implements PrivateActionListener,
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
-                        WindowComponent.TEXTAREA.getIdentifier(),
-                        WindowComponent.INPUTFIELD.getIdentifier()));
+                WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
         this.host = newHost;
@@ -128,16 +125,15 @@ public class Query extends MessageTarget implements PrivateActionListener,
     }
 
     /**
-     * Sends a line to the recipient of this query using the specified
-     * nickname or hostmask as a target. This allows for users to send
-     * messages with a server specified (e.g. <code>nick@server</code>)
-     * as though the query wasn't open.
+     * Sends a line to the recipient of this query using the specified nickname or hostmask as a
+     * target. This allows for users to send messages with a server specified (e.g.
+     * <code>nick@server</code>) as though the query wasn't open.
      * <p>
-     * The caller is responsible for ensuring that the <code>target</code>
-     * does actually correspond to this query.
+     * The caller is responsible for ensuring that the <code>target</code> does actually correspond
+     * to this query.
      *
      * @since 0.6.4
-     * @param line The line to be sent
+     * @param line   The line to be sent
      * @param target The target to send the line to
      */
     public void sendLine(final String line, final String target) {
@@ -271,8 +267,10 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             try {
                 callbackManager.addCallback(PrivateActionListener.class, this, client.getNickname());
-                callbackManager.addCallback(PrivateMessageListener.class, this, client.getNickname());
-                callbackManager.addCallback(CompositionStateChangeListener.class, this, client.getNickname());
+                callbackManager.
+                        addCallback(PrivateMessageListener.class, this, client.getNickname());
+                callbackManager.addCallback(CompositionStateChangeListener.class, this, client.
+                        getNickname());
             } catch (CallbackNotFoundException ex) {
                 Logger.appError(ErrorLevel.HIGH, "Unable to get query events", ex);
             }
@@ -300,7 +298,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final ClientInfo client, final String reason) {
         if (client.getNickname().equals(getNickname())) {
             final StringBuffer format = new StringBuffer(reason.isEmpty()
-                ? "queryQuit" : "queryQuitReason");
+                    ? "queryQuit" : "queryQuitReason");
 
             ActionManager.getActionManager().triggerEvent(
                     CoreActionType.QUERY_QUIT, format, this, reason);

src/com/dmdirc/Raw.java

@@ -42,8 +42,8 @@ import java.util.Arrays;
 import java.util.Date;
 
 /**
- * Handles the raw window (which shows the user raw data being sent and
- * received to/from the server).
+ * Handles the raw window (which shows the user raw data being sent and received to/from the
+ * server).
  */
 @Factory(inject = true, providers = true, singleton = true)
 public class Raw extends WritableFrameContainer
@@ -55,10 +55,10 @@ public class Raw extends WritableFrameContainer
     /**
      * Creates a new instance of Raw.
      *
-     * @param newServer the server to monitor
-     * @param commandController The controller to load commands from.
+     * @param newServer          the server to monitor
+     * @param commandController  The controller to load commands from.
      * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param urlBuilder         The URL builder to use when finding icons.
      */
     public Raw(
             @Unbound final Server newServer,
@@ -70,8 +70,8 @@ public class Raw extends WritableFrameContainer
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
-                    WindowComponent.TEXTAREA.getIdentifier(),
-                    WindowComponent.INPUTFIELD.getIdentifier()));
+                WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
 

src/com/dmdirc/Server.java

@@ -92,142 +92,111 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * The Server class represents the client's view of a server. It maintains
- * a list of all channels, queries, etc, and handles parser callbacks pertaining
- * to the server.
+ * The Server class represents the client's view of a server. It maintains a list of all channels,
+ * queries, etc, and handles parser callbacks pertaining to the server.
  */
 @Factory(inject = true, singleton = true, providers = true, name = "ServerFactoryImpl")
 public class Server extends WritableFrameContainer implements ConfigChangeListener,
         CertificateProblemListener, Connection {
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(Server.class);
-
     /** The name of the general domain. */
     private static final String DOMAIN_GENERAL = "general";
     /** The name of the profile domain. */
     private static final String DOMAIN_PROFILE = "profile";
     /** The name of the server domain. */
     private static final String DOMAIN_SERVER = "server";
-
     /** Open channels that currently exist on the server. */
     private final Map<String, Channel> channels = new ConcurrentSkipListMap<>();
     /** Open query windows on the server. */
     private final Map<String, Query> queries = new ConcurrentSkipListMap<>();
-
     /** The Parser instance handling this server. */
     private Parser parser;
     /** The Parser instance that used to be handling this server. */
     private Parser oldParser;
     /** The parser-supplied protocol description object. */
     private ProtocolDescription protocolDescription;
-
     /**
-     * Object used to synchronise access to parser. This object should be
-     * locked by anything requiring that the parser reference remains the same
-     * for a duration of time, or by anything which is updating the parser
-     * reference.
+     * Object used to synchronise access to parser. This object should be locked by anything
+     * requiring that the parser reference remains the same for a duration of time, or by anything
+     * which is updating the parser reference.
      *
-     * If used in conjunction with myStateLock, the parserLock must always be
-     * locked INSIDE the myStateLock to prevent deadlocks.
+     * If used in conjunction with myStateLock, the parserLock must always be locked INSIDE the
+     * myStateLock to prevent deadlocks.
      */
     private final ReadWriteLock parserLock = new ReentrantReadWriteLock();
-
     /** The raw frame used for this server instance. */
     private Raw raw;
-
     /** The address of the server we're connecting to. */
     private URI address;
-
     /** The profile we're using. */
     private ConfigProvider profile;
-
     /** Object used to synchronise access to myState. */
     private final Object myStateLock = new Object();
-
     /** The current state of this server. */
     private final ServerStatus myState = new ServerStatus(this, myStateLock);
-
     /** The timer we're using to delay reconnects. */
     private Timer reconnectTimer;
-
     /** The timer we're using to send WHO requests. */
     private final Timer whoTimer;
-
     /** The tabcompleter used for this server. */
     private final TabCompleter tabCompleter;
-
     /** Our reason for being away, if any. */
     private String awayMessage;
-
     /** Our event handler. */
     private final ServerEventHandler eventHandler = new ServerEventHandler(this);
-
     /** A list of outstanding invites. */
     private final List<Invite> invites = new ArrayList<>();
-
     /** A set of channels we want to join without focusing. */
     private final Set<String> backgroundChannels = new HashSet<>();
-
     /** Our ignore list. */
     private final IgnoreList ignoreList = new IgnoreList();
-
     /** Our string convertor. */
     private StringConverter converter = new DefaultStringConverter();
-
     /** The certificate manager in use, if any. */
     private CertificateManager certificateManager;
-
     /** ParserFactory we use for creating parsers. */
     private final ParserFactory parserFactory;
-
     /** ServerManager that created us. */
     private final ServerManager manager;
-
     /** Factory to use to create new identities. */
     private final IdentityFactory identityFactory;
-
     /** Window manager to pas to children. */
     private final WindowManager windowManager;
-
     /** The migrator to use to change our config provider. */
     private final ConfigProviderMigrator configMigrator;
-
     /** Factory to use for creating channels. */
     private final ChannelFactory channelFactory;
-
     /** Factory to use for creating queries. */
     private final QueryFactory queryFactory;
-
     /** Factory to use for creating raw windows. */
     private final RawFactory rawFactory;
-
     /** The config provider to write user settings to. */
     private final ConfigProvider userSettings;
-
     /** The manager to use to add status bar messages. */
     private final StatusBarManager statusBarManager;
 
     /**
-     * Creates a new server which will connect to the specified URL with
-     * the specified profile.
+     * Creates a new server which will connect to the specified URL with the specified profile.
      *
      * @since 0.6.3
-     * @param manager The server manager that owns this server.
-     * @param configMigrator The migrateable configuration manager to read config settings from.
-     * @param commandParser The parser to use for commands in this server's window.
-     * @param parserFactory The factory to use to generate parsers.
+     * @param manager             The server manager that owns this server.
+     * @param configMigrator      The migrateable configuration manager to read config settings
+     *                            from.
+     * @param commandParser       The parser to use for commands in this server's window.
+     * @param parserFactory       The factory to use to generate parsers.
      * @param tabCompleterFactory The factory to use for tab completers.
-     * @param identityFactory The factory to use to create identities.
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param statusBarManager The manager to use to add status bar messages.
-     * @param windowManager Window Manager
-     * @param channelFactory The factory to use to create channels.
-     * @param queryFactory The factory to use to create queries.
-     * @param rawFactory The factory to use to create raw windows.
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param userSettings The config provider to write user settings to.
-     * @param uri The address of the server to connect to
-     * @param profile The profile to use
+     * @param identityFactory     The factory to use to create identities.
+     * @param messageSinkManager  The sink manager to use to despatch messages.
+     * @param statusBarManager    The manager to use to add status bar messages.
+     * @param windowManager       Window Manager
+     * @param channelFactory      The factory to use to create channels.
+     * @param queryFactory        The factory to use to create queries.
+     * @param rawFactory          The factory to use to create raw windows.
+     * @param urlBuilder          The URL builder to use when finding icons.
+     * @param userSettings        The config provider to write user settings to.
+     * @param uri                 The address of the server to connect to
+     * @param profile             The profile to use
      */
     public Server(
             final ServerManager manager,
@@ -254,9 +223,9 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 messageSinkManager,
                 urlBuilder,
                 Arrays.asList(
-                    WindowComponent.TEXTAREA.getIdentifier(),
-                    WindowComponent.INPUTFIELD.getIdentifier(),
-                    WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
+                WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier(),
+                WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
         this.parserFactory = parserFactory;
@@ -292,11 +261,10 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     }
 
     /**
-     * Updates the connection details for this server. If the specified URI
-     * does not define a port, the default port from the protocol description
-     * will be used.
+     * Updates the connection details for this server. If the specified URI does not define a port,
+     * the default port from the protocol description will be used.
      *
-     * @param uri The new URI that this server should connect to
+     * @param uri     The new URI that this server should connect to
      * @param profile The profile that this server should use
      */
     private void setConnectionDetails(final URI uri, final ConfigProvider profile) {
@@ -399,7 +367,8 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
             parser.connect();
             if (parser instanceof ThreadedParser) {
-                ((ThreadedParser)parser).getControlThread().setName("Parser - " + connectAddress.getHost());
+                ((ThreadedParser) parser).getControlThread().setName("Parser - " + connectAddress.
+                        getHost());
             }
         }
 
@@ -440,17 +409,17 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
             log.info("Disconnecting. Current state: {}", myState.getState());
 
             switch (myState.getState()) {
-            case CLOSING:
-            case DISCONNECTING:
-            case DISCONNECTED:
-            case TRANSIENTLY_DISCONNECTED:
-                return;
-            case RECONNECT_WAIT:
-                log.debug("Cancelling reconnection timer");
-                reconnectTimer.cancel();
-                break;
-            default:
-                break;
+                case CLOSING:
+                case DISCONNECTING:
+                case DISCONNECTED:
+                case TRANSIENTLY_DISCONNECTED:
+                    return;
+                case RECONNECT_WAIT:
+                    log.debug("Cancelling reconnection timer");
+                    reconnectTimer.cancel();
+                    break;
+                default:
+                    break;
             }
 
             clearChannels();
@@ -642,7 +611,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     public Channel addChannel(final ChannelInfo chan) {
         return addChannel(chan, !backgroundChannels.contains(chan.getName())
                 || getConfigManager().getOptionBool(DOMAIN_GENERAL,
-                    "hidechannels"));
+                "hidechannels"));
     }
 
     /** {@inheritDoc} */
@@ -704,12 +673,14 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     }
 
     /**
-     * Retrieves the host component of the specified URI, or throws a relevant
-     * exception if this is not possible.
+     * Retrieves the host component of the specified URI, or throws a relevant exception if this is
+     * not possible.
      *
      * @param uri The URI to be processed
+     *
      * @return The URI's host component, as returned by {@link URI#getHost()}.
-     * @throws NullPointerException If <code>uri</code> is null
+     *
+     * @throws NullPointerException     If <code>uri</code> is null
      * @throws IllegalArgumentException If the specified URI has no host
      * @since 0.6.4
      */
@@ -875,13 +846,13 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     /** {@inheritDoc} */
     @Override
-    public void join(final ChannelJoinRequest ... requests) {
+    public void join(final ChannelJoinRequest... requests) {
         join(true, requests);
     }
 
     /** {@inheritDoc} */
     @Override
-    public void join(final boolean focus, final ChannelJoinRequest ... requests) {
+    public void join(final boolean focus, final ChannelJoinRequest... requests) {
         synchronized (myStateLock) {
             if (myState.getState() == ServerState.CONNECTED) {
                 final List<ChannelJoinRequest> pending = new ArrayList<>();
@@ -1009,10 +980,11 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     }
 
     /**
-     * Calculates a network name from the specified server name. This method
-     * implements parts 2-4 of the procedure documented at getNetwork().
+     * Calculates a network name from the specified server name. This method implements parts 2-4 of
+     * the procedure documented at getNetwork().
      *
      * @param serverName The server name to parse
+     *
      * @return A network name for the specified server
      */
     protected static String getNetworkFromServerName(final String serverName) {
@@ -1191,8 +1163,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 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(),
                         "serverName", arguments));
@@ -1213,8 +1184,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
     }
 
     /**
-     * Called when the server says that the nickname we're trying to use is
-     * already in use.
+     * Called when the server says that the nickname we're trying to use is already in use.
      *
      * @param nickname The nickname that we were trying to use
      */
@@ -1250,7 +1220,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
      * Called when the server sends a numeric event.
      *
      * @param numeric The numeric code for the event
-     * @param tokens The (tokenised) arguments of the event
+     * @param tokens  The (tokenised) arguments of the event
      */
     public void onNumeric(final int numeric, final String[] tokens) {
         String snumeric = String.valueOf(numeric);
@@ -1433,7 +1403,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
                 Long.valueOf(parser.getPingTime()));
 
         if (parser.getPingTime()
-                 >= getConfigManager().getOptionInt(DOMAIN_SERVER, "pingtimeout")) {
+                >= getConfigManager().getOptionInt(DOMAIN_SERVER, "pingtimeout")) {
             log.warn("Server appears to be stoned, reconnecting");
             handleNotification("stonedServer", getAddress());
             reconnect();
@@ -1601,7 +1571,7 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
 
     /** {@inheritDoc} */
     @Override
-    public void acceptInvites(final Invite ... invites) {
+    public void acceptInvites(final Invite... invites) {
         final ChannelJoinRequest[] requests = new ChannelJoinRequest[invites.length];
 
         for (int i = 0; i < invites.length; i++) {
@@ -1684,7 +1654,6 @@ public class Server extends WritableFrameContainer implements ConfigChangeListen
         awayMessage = message;
 
         new Thread(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {

src/com/dmdirc/ServerManager.java

@@ -48,27 +48,22 @@ import javax.inject.Singleton;
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
- * The ServerManager maintains a list of all servers, and provides methods to
- * search or iterate over them.
+ * The ServerManager maintains a list of all servers, and provides methods to search or iterate over
+ * them.
  */
 @Singleton
 public class ServerManager implements ServerFactory {
 
     /** All servers that currently exist. */
     private final Set<Server> servers = new CopyOnWriteArraySet<>();
-
     /** The identity controller to use to find profiles. */
     private final IdentityController identityController;
-
     /** A provider of {@link CommandController}s to pass to servers. */
     private final Provider<CommandController> commandController;
-
     /** The identity factory to give to servers. */
     private final IdentityFactory identityFactory;
-
     /** Window manager to add new servers to. */
     private final WindowManager windowManager;
-
     /** Concrete server factory to use. */
     private final ServerFactoryImpl serverFactoryImpl;
 
@@ -76,10 +71,10 @@ public class ServerManager implements ServerFactory {
      * Creates a new instance of ServerManager.
      *
      * @param identityController The identity controller to use to find profiles.
-     * @param identityFactory The factory to use to create new identities.
-     * @param commandController A provider of {@link CommandController}s to pass to servers.
-     * @param windowManager Window manager to add new servers to.
-     * @param serverFactory The factory to use to create servers.
+     * @param identityFactory    The factory to use to create new identities.
+     * @param commandController  A provider of {@link CommandController}s to pass to servers.
+     * @param windowManager      Window manager to add new servers to.
+     * @param serverFactory      The factory to use to create servers.
      */
     @Inject
     public ServerManager(
@@ -126,8 +121,8 @@ public class ServerManager implements ServerFactory {
     }
 
     /**
-     * Unregisters a server from the manager. The request is ignored if the
-     * ServerManager is in the process of closing all servers.
+     * Unregisters a server from the manager. The request is ignored if the ServerManager is in the
+     * process of closing all servers.
      *
      * @param server The server to be unregistered
      */
@@ -180,6 +175,7 @@ public class ServerManager implements ServerFactory {
      * Retrieves a list of servers connected to the specified network.
      *
      * @param network The network to search for
+     *
      * @return A list of servers connected to the network
      */
     public List<Server> getServersByNetwork(final String network) {
@@ -195,11 +191,12 @@ public class ServerManager implements ServerFactory {
     }
 
     /**
-     * Creates a new server which will connect to the specified URI with the
-     * default profile.
+     * Creates a new server which will connect to the specified URI with the default profile.
      *
      * @param uri The URI to connect to
+     *
      * @return The server which will be connecting
+     *
      * @since 0.6.3
      */
     public Server connectToAddress(final URI uri) {
@@ -208,12 +205,13 @@ public class ServerManager implements ServerFactory {
     }
 
     /**
-     * Creates a new server which will connect to the specified URI with the
-     * specified profile.
+     * Creates a new server which will connect to the specified URI with the specified profile.
      *
-     * @param uri The URI to connect to
+     * @param uri     The URI to connect to
      * @param profile The profile to use
+     *
      * @return The server which will be connecting
+     *
      * @since 0.6.3
      */
     public Server connectToAddress(final URI uri, final ConfigProvider profile) {

src/com/dmdirc/ServerState.java

@@ -32,49 +32,43 @@ public enum ServerState {
 
     /** Indicates the client is in the process of connecting. */
     CONNECTING(
-            "CONNECTED",                 // Connection attempt succeeded
-            "TRANSIENTLY_DISCONNECTED",  // Connection attempt failed
-            "DISCONNECTING",             // User ordered a disconnection
-            "CLOSING"                    // DMDirc is closing
+    "CONNECTED", // Connection attempt succeeded
+    "TRANSIENTLY_DISCONNECTED", // Connection attempt failed
+    "DISCONNECTING", // User ordered a disconnection
+    "CLOSING" // DMDirc is closing
     ),
-
     /** Indicates the client has connected to the server. */
     CONNECTED(
-            "DISCONNECTING",             // User ordered a disconnection
-            "TRANSIENTLY_DISCONNECTED",  // Server caused a disconnection
-            "CLOSING"                    // DMDirc is closing
+    "DISCONNECTING", // User ordered a disconnection
+    "TRANSIENTLY_DISCONNECTED", // Server caused a disconnection
+    "CLOSING" // DMDirc is closing
     ),
-
     /** Indicates that we've been temporarily disconnected. */
     TRANSIENTLY_DISCONNECTED(
-            "CONNECTING",                // User forced a connect attempt
-            "RECONNECT_WAIT",            // Waiting for auto-reconnect
-            "CLOSING"                    // DMDirc is closing
+    "CONNECTING", // User forced a connect attempt
+    "RECONNECT_WAIT", // Waiting for auto-reconnect
+    "CLOSING" // DMDirc is closing
     ),
-
     /** Indicates that the user has told us to disconnect. */
     DISCONNECTED(
-            "CONNECTING",                // User forced a connect attempt
-            "CLOSING"                    // DMDirc is closing
+    "CONNECTING", // User forced a connect attempt
+    "CLOSING" // DMDirc is closing
     ),
-
     /** In the process of disconnecting. */
     DISCONNECTING(
-            "DISCONNECTED",              // Socket closed
-            "CLOSING"                    // DMDirc is closing
+    "DISCONNECTED", // Socket closed
+    "CLOSING" // DMDirc is closing
     ),
-
     /** Indicates we're waiting for the auto-reconnect timer to fire. */
     RECONNECT_WAIT(
-            "CONNECTING",                // User forced a connect attempt
-            "TRANSIENTLY_DISCONNECTED",  // Reconnect timer expired
-            "DISCONNECTED",              // User forced a disconnect
-            "CLOSING"                    // DMDirc is closing
+    "CONNECTING", // User forced a connect attempt
+    "TRANSIENTLY_DISCONNECTED", // Reconnect timer expired
+    "DISCONNECTED", // User forced a disconnect
+    "CLOSING" // DMDirc is closing
     ),
-
-    /** Indicates that the server frame and its children are closing. */
+    /** Indicates that the server frame and its
+     * children are closing. */
     CLOSING;
-
     /** The allowed transitions from this state. */
     private final List<String> transitions;
 
@@ -82,19 +76,18 @@ public enum ServerState {
      * Creates a new instance of ServerState.
      *
      * @since 0.6.3m1
-     * @param transitions The names of the states to which a transition is
-     * allowed from this state
+     * @param transitions The names of the states to which a transition is allowed from this state
      */
-    ServerState(final String ... transitions) {
+    ServerState(final String... transitions) {
         this.transitions = Arrays.asList(transitions);
     }
 
     /**
-     * Determines whether a transition from this state to the specified state
-     * would be legal.
+     * Determines whether a transition from this state to the specified state would be legal.
      *
      * @since 0.6.3m1
      * @param state The state that is being transitioned to
+     *
      * @return True if the transition is allowed, false otherwise.
      */
     public boolean canTransitionTo(final ServerState state) {
@@ -105,9 +98,11 @@ public enum ServerState {
      * Determines where the current state is a disconnected one.
      *
      * @return True if the state is one of the disconnected states, false otherwise
+     *
      * @since 0.6.3m1
      */
     public boolean isDisconnected() {
         return this == ServerState.DISCONNECTED || this == ServerState.TRANSIENTLY_DISCONNECTED;
     }
+
 }

src/com/dmdirc/ServerStatus.java

@@ -29,8 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Describes the status of a server and manages transitions between different
- * states.
+ * Describes the status of a server and manages transitions between different states.
  *
  * @since 0.6.3m1
  */
@@ -38,24 +37,21 @@ public class ServerStatus {
 
     /** The server to which this status belongs. */
     private final Server server;
-
     /** Object to notify when the state of the server changes. */
     private final Object notifier;
-
     /** The current state of the server. */
     private ServerState state = ServerState.DISCONNECTED;
-
     /** A history of transactions for debugging purposes. */
     private RollingList<String> history = new RollingList<>(10);
-
     /** A list of known parser hashcodes. */
     private final List<Integer> parsers = new ArrayList<>();
 
     /**
      * Creates a new ServerStatus instance for the specified server.
      *
-     * @param server The server to which this status belongs
+     * @param server   The server to which this status belongs
      * @param notifier The object to notify when the state changes
+     *
      * @since 0.6.3
      */
     public ServerStatus(final Server server, final Object notifier) {
@@ -67,6 +63,7 @@ public class ServerStatus {
      * Transitions the status of this object to the specified state.
      *
      * @param newState The state to transition to
+     *
      * @throws IllegalArgumentException If the specified transition is invalid
      */
     public synchronized void transition(final ServerState newState) {
@@ -94,13 +91,12 @@ public class ServerStatus {
     }
 
     /**
-     * Adds a history entry to this status object. The history entry contains
-     * the name of the states being transitioned between, the details of the
-     * method (and class and line) which initiated the transition, and the
-     * name of the thread in which the transition is occuring.
+     * Adds a history entry to this status object. The history entry contains the name of the states
+     * being transitioned between, the details of the method (and class and line) which initiated
+     * the transition, and the name of the thread in which the transition is occuring.
      *
      * @param fromState The state which is being transitioned from
-     * @param toState The state which is being transitioned to
+     * @param toState   The state which is being transitioned to
      */
     protected void addHistoryEntry(final ServerState fromState, final ServerState toState) {
         final StringBuilder builder = new StringBuilder();
@@ -122,8 +118,8 @@ public class ServerStatus {
      * Retrieves the transition history of this status object as a string.
      *
      * @see #addHistoryEntry(com.dmdirc.ServerState, com.dmdirc.ServerState)
-     * @return A line feed ('\n') delimited string containing one entry for
-     * each of the entries in this status's transition history.
+     * @return A line feed ('\n') delimited string containing one entry for each of the entries in
+     *         this status's transition history.
      */
     public String getTransitionHistory() {
         final StringBuilder builder = new StringBuilder();
@@ -140,10 +136,11 @@ public class ServerStatus {
     }
 
     /**
-     * Returns a unique, ID for the specified parser. Each parser that has been
-     * seen to be used by this server is given a sequential id.
+     * Returns a unique, ID for the specified parser. Each parser that has been seen to be used by
+     * this server is given a sequential id.
      *
      * @param parser The parser whose ID is being requested
+     *
      * @return A unique ID for the specified parser, or 0 if the parser is null
      */
     public int getParserID(final Parser parser) {

src/com/dmdirc/SystemLifecycleController.java

@@ -35,7 +35,6 @@ public class SystemLifecycleController implements LifecycleController {
 
     /** Controller to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
-
     /** Manager to use to disconnect servers. */
     private final ServerManager serverManager;
 

src/com/dmdirc/Topic.java

@@ -37,9 +37,9 @@ public class Topic {
     /**
      * Creates a new topic.
      *
-     * @param topic Topic
+     * @param topic  Topic
      * @param client Topic client
-     * @param time Topic time
+     * @param time   Topic time
      */
     public Topic(final String topic, final String client, final long time) {
         this.topic = topic;

src/com/dmdirc/WritableFrameContainer.java

@@ -37,35 +37,32 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * The writable frame container adds additional methods to the frame container
- * class that allow the sending of lines back to whatever the container's
- * data source is (e.g. an IRC channel or server).
+ * The writable frame container adds additional methods to the frame container class that allow the
+ * sending of lines back to whatever the container's data source is (e.g. an IRC channel or server).
  */
 public abstract class WritableFrameContainer extends FrameContainer {
 
     /** The name of the server notification target. */
     protected static final String NOTIFICATION_SERVER = "server";
-
     /** The name of the channel notification target. */
     protected static final String NOTIFICATION_CHANNEL = "channel";
-
     /** The command parser used for commands in this container. */
     protected final CommandParser commandParser;
-
     /** The manager to use to despatch messages to sinks. */
     private final MessageSinkManager messageSinkManager;
 
     /**
      * Creates a new WritableFrameContainer.
      *
-     * @param icon The icon to use for this container
-     * @param name The name of this container
-     * @param title The title of this container
-     * @param config The config manager for this container
-     * @param parser The command parser for this container
+     * @param icon               The icon to use for this container
+     * @param name               The name of this container
+     * @param title              The title of this container
+     * @param config             The config manager for this container
+     * @param parser             The command parser for this container
      * @param messageSinkManager The sink manager to use to despatch messages
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param components The UI components that this frame requires
+     * @param urlBuilder         The URL builder to use when finding icons.
+     * @param components         The UI components that this frame requires
+     *
      * @since 0.6.4
      */
     public WritableFrameContainer(
@@ -108,18 +105,19 @@ public abstract class WritableFrameContainer extends FrameContainer {
     public abstract TabCompleter getTabCompleter();
 
     /**
-     * Returns the maximum length that a line passed to sendLine() should be,
-     * in order to prevent it being truncated or causing protocol violations.
+     * Returns the maximum length that a line passed to sendLine() should be, in order to prevent it
+     * being truncated or causing protocol violations.
      *
      * @return The maximum line length for this container
      */
     public abstract int getMaxLineLength();
 
     /**
-     * Splits the specified line into chunks that contain a number of bytes
-     * less than or equal to the value returned by {@link #getMaxLineLength()}.
+     * Splits the specified line into chunks that contain a number of bytes less than or equal to
+     * the value returned by {@link #getMaxLineLength()}.
      *
      * @param line The line to be split
+     *
      * @return An ordered list of chunks of the desired length
      */
     protected List<String> splitLine(final String line) {
@@ -154,6 +152,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * Returns the number of lines that the specified string would be sent as.
      *
      * @param line The string to be split and sent
+     *
      * @return The number of lines required to send the specified string
      */
     public final int getNumLines(final String line) {
@@ -176,8 +175,9 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * Processes and displays a notification.
      *
      * @param messageType The name of the formatter to be used for the message
-     * @param actionType The action type to be used
-     * @param args The arguments for the message
+     * @param actionType  The action type to be used
+     * @param args        The arguments for the message
+     *
      * @return True if any further behaviour should be executed, false otherwise
      */
     public boolean doNotification(final String messageType,
@@ -188,10 +188,11 @@ public abstract class WritableFrameContainer extends FrameContainer {
     /**
      * Processes and displays a notification.
      *
-     * @param date The date/time at which the event occured
+     * @param date        The date/time at which the event occured
      * @param messageType The name of the formatter to be used for the message
-     * @param actionType The action type to be used
-     * @param args The arguments for the message
+     * @param actionType  The action type to be used
+     * @param args        The arguments for the message
+     *
      * @return True if any further behaviour should be executed, false otherwise
      */
     public boolean doNotification(final Date date, final String messageType,
@@ -223,7 +224,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
     /**
      * Allows subclasses to modify the lists of arguments for notifications.
      *
-     * @param actionArgs The list of arguments to be passed to the actions system
+     * @param actionArgs  The list of arguments to be passed to the actions system
      * @param messageArgs The list of arguments to be passed to the formatter
      */
     protected void modifyNotificationArgs(final List<Object> actionArgs,
@@ -234,8 +235,9 @@ public abstract class WritableFrameContainer extends FrameContainer {
     /**
      * Allows subclasses to process specific types of notification arguments.
      *
-     * @param arg The argument to be processed
+     * @param arg  The argument to be processed
      * @param args The list of arguments that any data should be appended to
+     *
      * @return True if the arg has been processed, false otherwise
      */
     protected boolean processNotificationArg(final Object arg, final List<Object> args) {
@@ -243,25 +245,23 @@ public abstract class WritableFrameContainer extends FrameContainer {
     }
 
     /**
-     * Handles general server notifications (i.e., ones not tied to a
-     * specific window). The user can select where the notifications should
-     * go in their config.
+     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
+     * select where the notifications should go in their config.
      *
      * @param messageType The type of message that is being sent
-     * @param args The arguments for the message
+     * @param args        The arguments for the message
      */
     public void handleNotification(final String messageType, final Object... args) {
         handleNotification(new Date(), messageType, args);
     }
 
     /**
-     * Handles general server notifications (i.e., ones not tied to a
-     * specific window). The user can select where the notifications should
-     * go in their config.
+     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
+     * select where the notifications should go in their config.
      *
-     * @param date The date/time at which the event occured
+     * @param date        The date/time at which the event occured
      * @param messageType The type of message that is being sent
-     * @param args The arguments for the message
+     * @param args        The arguments for the message
      */
     public void handleNotification(final Date date, final String messageType, final Object... args) {
         messageSinkManager.despatchMessage(this, date, messageType, args);

src/com/dmdirc/actions/Action.java

@@ -66,31 +66,28 @@ public class Action extends ActionModel implements ConfigChangeListener {
     private static final String DOMAIN_CONCURRENCY = "concurrency";
     /** The domain name for misc settings. */
     private static final String DOMAIN_MISC = "misc";
-
     /** The base directory to save actions in. */
     private final String actionsDirectory;
     /** The controller to use to read and update settings. */
     private final IdentityController identityController;
     /** The controller to use to retrieve components, comparisons, etc. */
     private final ActionController actionController;
-
     /** 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.
+     * 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.
      *
      * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
-     * @param substitutorFactory Factory to use to create action substitutors.
-     * @param actionController The controller that owns this action.
-     * @param identityController The controller to use to retrieve and update settings.
-     * @param actionsDirectory The base directory to store actions in.
-     * @param group The group the action belongs to
-     * @param name The name of the action
+     * @param substitutorFactory          Factory to use to create action substitutors.
+     * @param actionController            The controller that owns this action.
+     * @param identityController          The controller to use to retrieve and update settings.
+     * @param actionsDirectory            The base directory to store actions in.
+     * @param group                       The group the action belongs to
+     * @param name                        The name of the action
      */
     public Action(
             final Provider<GlobalCommandParser> globalCommandParserProvider,
@@ -124,21 +121,20 @@ public class Action extends ActionModel implements ConfigChangeListener {
     }
 
     /**
-     * Creates a new instance of Action with the specified properties and saves
-     * it to disk.
+     * Creates a new instance of Action with the specified properties and saves it to disk.
      *
      * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
-     * @param substitutorFactory Factory to use to create action substitutors.
-     * @param actionController The controller that owns this action.
-     * @param identityController The controller to use to retrieve and update settings.
-     * @param actionsDirectory The base directory to store actions in.
-     * @param group The group the action belongs to
-     * @param name The name of the action
-     * @param triggers The triggers to use
-     * @param response The response to use
-     * @param conditions The conditions to use
-     * @param conditionTree The condition tree to use
-     * @param newFormat The new formatter to use
+     * @param substitutorFactory          Factory to use to create action substitutors.
+     * @param actionController            The controller that owns this action.
+     * @param identityController          The controller to use to retrieve and update settings.
+     * @param actionsDirectory            The base directory to store actions in.
+     * @param group                       The group the action belongs to
+     * @param name                        The name of the action
+     * @param triggers                    The triggers to use
+     * @param response                    The response to use
+     * @param conditions                  The conditions to use
+     * @param conditionTree               The condition tree to use
+     * @param newFormat                   The new formatter to use
      */
     public Action(
             final Provider<GlobalCommandParser> globalCommandParserProvider,
@@ -159,7 +155,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
         this.actionController = actionController;
         this.identityController = identityController;
         this.actionsDirectory = actionsDirectory;
-        this.location = actionsDirectory + group + File.separator + name.replaceAll("[^A-Za-z0-9\\-_]", "_");
+        this.location = actionsDirectory + group + File.separator
+                + name.replaceAll("[^A-Za-z0-9\\-_]", "_");
 
         new File(actionsDirectory + group).mkdirs();
 
@@ -246,8 +243,8 @@ public class Action extends ActionModel implements ConfigChangeListener {
     }
 
     /**
-     * Checks to see if this action contains group meta-data, and adds it to
-     * the group as appropriate.
+     * Checks to see if this action contains group meta-data, and adds it to the group as
+     * appropriate.
      */
     private void checkMetaData() {
         if (config.isKeyDomain(DOMAIN_METADATA)) {
@@ -296,6 +293,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * Loads a list of triggers with the specified names.
      *
      * @param newTriggers A list of trigger names
+     *
      * @return True if all triggers are valid and compatible, false otherwise.
      */
     private boolean loadTriggers(final List<String> newTriggers) {
@@ -410,6 +408,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * Reads a condition from the specified configuration section.
      *
      * @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) {
@@ -460,7 +459,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
         }
 
         if ((arg != -1 && !comparison.appliesTo().equals(component.getType()))
-            || (arg == -1 && !comparison.appliesTo().equals(String.class))) {
+                || (arg == -1 && !comparison.appliesTo().equals(String.class))) {
             error(ActionErrorType.CONDITIONS,
                     "Comparison cannot be applied to specified component: " + data.get("comparison"));
             return false;
@@ -488,9 +487,9 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * Reads a component from the specified data section for the specified argument.
      *
      * @param data The relevant section of the action configuration
-     * @param arg The argument number that the component should apply to
-     * @return The corresponding ActionComponent, or null if the specified
-     * component is invalid.
+     * @param arg  The argument number that the component should apply to
+     *
+     * @return The corresponding ActionComponent, or null if the specified component is invalid.
      */
     private ActionComponent readComponent(final Map<String, String> data, final int arg) {
         final String componentName = data.get("component");
@@ -525,7 +524,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
     /**
      * Raises a trivial error, informing the user of the problem.
      *
-     * @param type The type of error that occurred.
+     * @param type    The type of error that occurred.
      * @param message The message to be raised
      */
     private void error(final ActionErrorType type, final String message) {

src/com/dmdirc/actions/ActionComponentChain.java

@@ -32,8 +32,7 @@ import java.util.List;
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
- * An action component chain supports chaining of multiple action components
- * together.
+ * An action component chain supports chaining of multiple action components together.
  */
 public class ActionComponentChain implements ActionComponent {
 
@@ -43,11 +42,11 @@ public class ActionComponentChain implements ActionComponent {
     private final List<ActionComponent> components = new ArrayList<>();
 
     /**
-     * Creates a new component chain from the specified text representation.
-     * Chains are separated with full stops (.).
+     * Creates a new component chain from the specified text representation. Chains are separated
+     * with full stops (.).
      *
-     * @param source The class that this chain needs to start with
-     * @param chain The textual representation of the chain
+     * @param source  The class that this chain needs to start with
+     * @param chain   The textual representation of the chain
      * @param manager The action manager to use to look up components
      */
     public ActionComponentChain(final Class<?> source, final String chain,
@@ -143,8 +142,8 @@ public class ActionComponentChain implements ActionComponent {
     }
 
     /**
-     * Determines if any components in this chain require a server to have
-     * an established connection in order to function.
+     * Determines if any components in this chain require a server to have an established connection
+     * in order to function.
      *
      * @since 0.6.4
      * @return True iff at least one component requires a connection

src/com/dmdirc/actions/ActionCondition.java

@@ -32,27 +32,23 @@ public class ActionCondition {
 
     /** The argument number that this action condition applies to. */
     private int arg;
-
     /** The component that this action condition applies to. */
     private ActionComponent component;
-
     /** The comparison that should be used for this condition. */
     private ActionComparison comparison;
-
     /** The target of the comparison for this condition. */
     private String target = "";
-
     /** The source target for this comparison. */
     private String starget = "";
 
     /**
-     * Creates a new instance of ActionCondition that compares the output of
-     * a component to a string.
+     * Creates a new instance of ActionCondition that compares the output of a component to a
+     * string.
      *
-     * @param arg The argument number to be tested
-     * @param component The component to be tested
+     * @param arg        The argument number to be tested
+     * @param component  The component to be tested
      * @param comparison The comparison to be used
-     * @param target The target of the comparison
+     * @param target     The target of the comparison
      */
     public ActionCondition(final int arg, final ActionComponent component,
             final ActionComparison comparison, final String target) {
@@ -67,9 +63,9 @@ public class ActionCondition {
     /**
      * Creates a new instance of ActionCondition that compares two strings.
      *
-     * @param starget The first target for comparison.
+     * @param starget    The first target for comparison.
      * @param comparison The comparison to be used
-     * @param target The second target for the comparison
+     * @param target     The second target for the comparison
      */
     public ActionCondition(final String starget, final ActionComparison comparison,
             final String target) {
@@ -84,11 +80,12 @@ public class ActionCondition {
     /**
      * Tests to see if this condition holds.
      *
-     * @param sub The substitutor to use for this
+     * @param sub  The substitutor to use for this
      * @param args The event arguments to be tested
+     *
      * @return True if the condition holds, false otherwise
      */
-    public boolean test(final ActionSubstitutor sub, final Object ... args) {
+    public boolean test(final ActionSubstitutor sub, final Object... args) {
         final String thisTarget = sub.doSubstitution(getTarget(), args);
 
         if (arg == -1) {
@@ -164,6 +161,7 @@ public class ActionCondition {
 
     /**
      * Sets the target of the comparison for this condition.
+     *
      * @param target Target for comparison
      */
     public void setTarget(final String target) {

src/com/dmdirc/actions/ActionErrorType.java

@@ -31,16 +31,12 @@ public enum ActionErrorType {
 
     /** A low-level problem occurred trying to read the action's file. */
     FILE,
-
     /** A problem with the action's triggers. */
     TRIGGERS,
-
     /** A problem with the action's response. */
     RESPONSE,
-
     /** A problem with the action's condition tree. */
     CONDITION_TREE,
-
     /** A problem with the action's conditions. */
     CONDITIONS;
 

src/com/dmdirc/actions/ActionFactory.java

@@ -55,11 +55,12 @@ public class ActionFactory {
     /**
      * Creates a new instance of {@link ActionFactory}.
      *
-     * @param actionController The controller that will own actions.
-     * @param identityController The controller to use to retrieve and update settings.
-     * @param globalCommandParserProvider The global command parser to use for actions without windows.
-     * @param substitutorFactory The factory to use to create substitutors.
-     * @param actionsDirectory The base directory to store actions in.
+     * @param actionController            The controller that will own actions.
+     * @param identityController          The controller to use to retrieve and update settings.
+     * @param globalCommandParserProvider The global command parser to use for actions without
+     *                                    windows.
+     * @param substitutorFactory          The factory to use to create substitutors.
+     * @param actionsDirectory            The base directory to store actions in.
      */
     @Inject
     public ActionFactory(
@@ -76,11 +77,12 @@ public class ActionFactory {
     }
 
     /**
-     * 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.
+     * 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.
      *
      * @param group The group the action belongs to
-     * @param name The name of the action
+     * @param name  The name of the action
+     *
      * @return A relevant action.
      */
     public Action getAction(final String group, final String name) {
@@ -89,16 +91,16 @@ public class ActionFactory {
     }
 
     /**
-     * Creates a new instance of Action with the specified properties and saves
-     * it to disk.
+     * Creates a new instance of Action with the specified properties and saves it to disk.
      *
-     * @param group The group the action belongs to
-     * @param name The name of the action
-     * @param triggers The triggers to use
-     * @param response The response to use
-     * @param conditions The conditions to use
+     * @param group         The group the action belongs to
+     * @param name          The name of the action
+     * @param triggers      The triggers to use
+     * @param response      The response to use
+     * @param conditions    The conditions to use
      * @param conditionTree The condition tree to use
-     * @param newFormat The new formatter to use
+     * @param newFormat     The new formatter to use
+     *
      * @return A relevant action.
      */
     public Action getAction(final String group, final String name,

src/com/dmdirc/actions/ActionGroup.java

@@ -41,30 +41,23 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class ActionGroup implements Iterable<Action> {
 
     /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
+     * A version number for this class. It should be changed whenever the class structure is changed
+     * (or anything else that would prevent serialized objects being unserialized with the new
+     * class).
      */
     private static final long serialVersionUID = 1;
-
     /** The actions in this group. */
     private final List<Action> actions = new ArrayList<>();
-
     /** The name of this action group. */
     private final String name;
-
     /** The description of this action group. */
     private String description;
-
     /** The author of this action group. */
     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;
-
     /** A list of settings used by this action group. */
     private final Map<String, PreferencesSetting> settings = new HashMap<>();
 
@@ -137,6 +130,7 @@ public class ActionGroup implements Iterable<Action> {
      * Retrieves the version number of this action group.
      *
      * @return This action group's version number, or null if none is specified.
+     *
      * @since 0.6.4
      */
     public Version getVersion() {
@@ -147,6 +141,7 @@ public class ActionGroup implements Iterable<Action> {
      * Sets the version of this action group.
      *
      * @param version This action group's new version.
+     *
      * @since 0.6.4
      */
     public void setVersion(final Version version) {
@@ -156,8 +151,7 @@ public class ActionGroup implements Iterable<Action> {
     /**
      * Retrieves the addon site component number for this action group.
      *
-     * @return The component number for this action group, or -1 if none is
-     * specified.
+     * @return The component number for this action group, or -1 if none is specified.
      */
     public int getComponent() {
         return component;
@@ -224,6 +218,7 @@ public class ActionGroup implements Iterable<Action> {
      * Deletes an action from this group.
      *
      * @param action The action to be deleted
+     *
      * @since 0.6.3
      */
     @Precondition({

src/com/dmdirc/actions/ActionManager.java

@@ -51,6 +51,7 @@ import java.util.Set;
 import javax.inject.Provider;
 
 import org.slf4j.LoggerFactory;
+
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -59,66 +60,50 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public class ActionManager implements ActionController {
 
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(ActionManager.class);
-
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ActionManager.class);
     /** The ActionManager Instance. */
     private static ActionManager me;
-
     /** The identity manager to load configuration from. */
     private final IdentityController identityManager;
-
     /** The ServerManager currently in use. */
     private final ServerManager serverManager;
-
     /** The factory to use to create actions. */
     private final ActionFactory factory;
-
     /** Provider for action wrappers. */
     private final Provider<Set<ActionGroup>> actionWrappersProvider;
-
     /** Provider of an update manager. */
     private final Provider<UpdateManager> updateManagerProvider;
-
     /** A list of registered action types. */
     private final List<ActionType> types = new ArrayList<>();
-
     /** A list of registered action components. */
     private final List<ActionComponent> components = new ArrayList<>();
-
     /** A list of registered action comparisons. */
     private final List<ActionComparison> comparisons = new ArrayList<>();
-
     /** A map linking types and a list of actions that're registered for them. */
     private final MapList<ActionType, Action> actions = new MapList<>();
-
     /** A map linking groups and a list of actions that're in them. */
     private final Map<String, ActionGroup> groups = new HashMap<>();
-
     /** A map of objects to synchronise on for concurrency groups. */
     private final Map<String, Object> locks = new HashMap<>();
-
     /** A map of the action type groups to the action types within. */
     private final MapList<String, ActionType> typeGroups = new MapList<>();
-
     /** The listeners that we have registered. */
     private final MapList<ActionType, ActionListener> listeners = new MapList<>();
-
     /** The directory to load and save actions in. */
     private final String directory;
-
     /** Indicates whether or not user actions should be killed (not processed). */
-    @ConfigBinding(domain="actions", key="killswitch")
+    @ConfigBinding(domain = "actions", key = "killswitch")
     private boolean killSwitch;
 
     /**
      * Creates a new instance of ActionManager.
      *
-     * @param serverManager The ServerManager in use.
-     * @param identityManager The IdentityManager to load configuration from.
-     * @param factory The factory to use to create new actions.
+     * @param serverManager          The ServerManager in use.
+     * @param identityManager        The IdentityManager to load configuration from.
+     * @param factory                The factory to use to create new actions.
      * @param actionWrappersProvider Provider of action wrappers.
-     * @param updateManagerProvider Provider of an update manager, to register components.
-     * @param directory The directory to load and save actions in.
+     * @param updateManagerProvider  Provider of an update manager, to register components.
+     * @param directory              The directory to load and save actions in.
      */
     public ActionManager(
             final ServerManager serverManager,
@@ -148,6 +133,8 @@ public class ActionManager implements ActionController {
      * Create the singleton instance of the Action Manager.
      *
      * @param actionManager The manager to return for calls to {@link #getActionManager()}.
+     *
+     * @deprecated Singleton use should be removed.
      */
     @Deprecated
     public static void setActionManager(final ActionManager actionManager) {
@@ -170,7 +157,7 @@ public class ActionManager implements ActionController {
      */
     // TODO: Refactor to take a list of comparisons/sources.
     public void initialise(final ColourActionComparison colourComparisons) {
-        log.info("Initialising the actions manager");
+        LOG.info("Initialising the actions manager");
 
         identityManager.getGlobalConfiguration().getBinder().bind(this, ActionManager.class);
 
@@ -209,7 +196,7 @@ public class ActionManager implements ActionController {
     /** {@inheritDoc} */
     @Override
     public void registerSetting(final String name, final String value) {
-        log.debug("Registering new action setting: {} = {}", name, value);
+        LOG.debug("Registering new action setting: {} = {}", name, value);
         identityManager.getAddonSettings().setOption("actions", name, value);
     }
 
@@ -226,7 +213,7 @@ public class ActionManager implements ActionController {
             checkNotNull(type);
 
             if (!types.contains(type)) {
-                log.debug("Registering action type: {}", type);
+                LOG.debug("Registering action type: {}", type);
                 types.add(type);
                 typeGroups.add(type.getType().getGroup(), type);
             }
@@ -239,7 +226,7 @@ public class ActionManager implements ActionController {
         for (ActionComponent comp : comps) {
             checkNotNull(comp);
 
-            log.debug("Registering action component: {}", comp);
+            LOG.debug("Registering action component: {}", comp);
             components.add(comp);
         }
     }
@@ -250,7 +237,7 @@ public class ActionManager implements ActionController {
         for (ActionComparison comp : comps) {
             checkNotNull(comp);
 
-            log.debug("Registering action comparison: {}", comp);
+            LOG.debug("Registering action comparison: {}", comp);
             comparisons.add(comp);
         }
     }
@@ -324,7 +311,7 @@ public class ActionManager implements ActionController {
         checkNotNull(dir);
         checkArgument(dir.isDirectory());
 
-        log.debug("Loading actions from directory: {}", dir.getAbsolutePath());
+        LOG.debug("Loading actions from directory: {}", dir.getAbsolutePath());
 
         if (!groups.containsKey(dir.getName())) {
             groups.put(dir.getName(), new ActionGroup(dir.getName()));
@@ -340,12 +327,12 @@ public class ActionManager implements ActionController {
     public void addAction(final Action action) {
         checkNotNull(action);
 
-        log.debug("Registering action: {}/{} (status: {})",
-                new Object[] { action.getGroup(), action.getName(), action.getStatus() });
+        LOG.debug("Registering action: {}/{} (status: {})",
+                new Object[]{action.getGroup(), action.getName(), action.getStatus()});
 
         if (action.getStatus() != ActionStatus.FAILED) {
             for (ActionType trigger : action.getTriggers()) {
-                log.trace("Action has trigger {}", trigger);
+                LOG.trace("Action has trigger {}", trigger);
                 actions.add(trigger, action);
             }
         }
@@ -382,12 +369,12 @@ public class ActionManager implements ActionController {
     /** {@inheritDoc} */
     @Override
     public boolean triggerEvent(final ActionType type,
-            final StringBuffer format, final Object ... arguments) {
+            final StringBuffer format, final Object... arguments) {
         checkNotNull(type);
         checkNotNull(type.getType());
         checkArgument(type.getType().getArity() == arguments.length);
 
-        log.trace("Calling listeners for event of type {}", type);
+        LOG.trace("Calling listeners for event of type {}", type);
 
         boolean res = false;
 
@@ -412,20 +399,21 @@ public class ActionManager implements ActionController {
     /**
      * Triggers actions that respond to the specified type.
      *
-     * @param type The type of the event to process
-     * @param format The format of the message that's going to be displayed for
-     * the event. Actions may change this format.
+     * @param type      The type of the event to process
+     * @param format    The format of the message that's going to be displayed for the event.
+     *                  Actions may change this format.
      * @param arguments The arguments for the event
+     *
      * @return True if the event should be skipped, or false if it can continue
      */
     @Precondition("The specified ActionType is not null")
     private boolean triggerActions(final ActionType type,
-            final StringBuffer format, final Object ... arguments) {
+            final StringBuffer format, final Object... arguments) {
         checkNotNull(type);
 
         boolean res = false;
 
-        log.trace("Executing actions for event of type {}", type);
+        LOG.trace("Executing actions for event of type {}", type);
 
         if (actions.containsKey(type)) {
             for (Action action : new ArrayList<>(actions.get(type))) {
@@ -620,6 +608,7 @@ public class ActionManager implements ActionController {
      * Installs an action pack located at the specified path.
      *
      * @param path The full path of the action pack .zip.
+     *
      * @throws IOException If the zip cannot be extracted
      */
     public static void installActionPack(final String path) throws IOException {
@@ -634,7 +623,7 @@ public class ActionManager implements ActionController {
 
     /** {@inheritDoc} */
     @Override
-    public void registerListener(final ActionListener listener, final ActionType ... types) {
+    public void registerListener(final ActionListener listener, final ActionType... types) {
         for (ActionType type : types) {
             listeners.add(type, listener);
         }
@@ -642,7 +631,7 @@ public class ActionManager implements ActionController {
 
     /** {@inheritDoc} */
     @Override
-    public void unregisterListener(final ActionListener listener, final ActionType ... types) {
+    public void unregisterListener(final ActionListener listener, final ActionType... types) {
         for (ActionType type : types) {
             listeners.remove(type, listener);
         }
@@ -653,4 +642,5 @@ public class ActionManager implements ActionController {
     public void unregisterListener(final ActionListener listener) {
         listeners.removeFromAll(listener);
     }
+
 }

src/com/dmdirc/actions/ActionModel.java

@@ -36,53 +36,39 @@ import java.util.List;
 import javax.inject.Provider;
 
 /**
- * Represents the basic model of an action, and its triggering mechanism.
- * Saving and loading are handled by the Action class.
+ * Represents the basic model of an action, and its triggering mechanism. Saving and loading are
+ * handled by the Action class.
  */
 public class ActionModel {
 
     /** Provider of global command parsers, for use when triggering window-less actions. */
     private final Provider<GlobalCommandParser> globalCommandParserProvider;
-
     /** Factory to use to creator substitutors. */
     private final ActionSubstitutorFactory substitutorFactory;
-
     /** The group this action belongs to. */
     protected String group;
-
     /** The name of this action. */
     protected String name;
-
     /** The ActionTypes that trigger this action. */
     protected ActionType[] triggers;
-
     /** The commands to execute if this action is triggered. */
     protected String[] response;
-
     /** The change that should be made to the format string, if any. */
     protected String newFormat;
-
     /** The conditions for this action. */
     protected List<ActionCondition> conditions = new ArrayList<>();
-
     /** The condition tree used for evaluating conditions. */
     protected ConditionTree conditionTree;
-
     /** Whether this action has been modified or not. */
     protected boolean modified;
-
     /** Whether this action wishes the event to be stopped. */
     protected boolean stop;
-
     /** The concurrency group this action belongs to, if any. */
     protected String concurrencyGroup;
-
     /** The status of this action. */
     protected ActionStatus status = ActionStatus.ACTIVE;
-
     /** A description of any error that occurs while creating the action. */
     protected String error;
-
     /** The type of error that occurred, if any. */
     protected ActionErrorType errorType;
 
@@ -90,9 +76,9 @@ public class ActionModel {
      * Creates a new instance of ActionModel with the specified properties.
      *
      * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
-     * @param substitutorFactory Factory to use to create action substitutors.
-     * @param group The group the action belongs to
-     * @param name The name of the action
+     * @param substitutorFactory          Factory to use to create action substitutors.
+     * @param group                       The group the action belongs to
+     * @param name                        The name of the action
      */
     public ActionModel(
             final Provider<GlobalCommandParser> globalCommandParserProvider,
@@ -109,14 +95,14 @@ public class ActionModel {
      * Creates a new instance of ActionModel with the specified properties.
      *
      * @param globalCommandParserProvider Provider of global command parsers for triggering actions.
-     * @param substitutorFactory Factory to use to create action substitutors.
-     * @param group The group the action belongs to
-     * @param name The name of the action
-     * @param triggers The triggers to use
-     * @param response The response to use
-     * @param conditions The conditions to use
-     * @param conditionTree The condition tree to use
-     * @param newFormat The new formatter to use
+     * @param substitutorFactory          Factory to use to create action substitutors.
+     * @param group                       The group the action belongs to
+     * @param name                        The name of the action
+     * @param triggers                    The triggers to use
+     * @param response                    The response to use
+     * @param conditions                  The conditions to use
+     * @param conditionTree               The condition tree to use
+     * @param newFormat                   The new formatter to use
      */
     public ActionModel(
             final Provider<GlobalCommandParser> globalCommandParserProvider,
@@ -138,10 +124,11 @@ public class ActionModel {
      * Triggers this action.
      *
      * @param serverManager The server manager used to iterate servers
-     * @param format The format of the message that's going to be displayed.
-     * @param arguments The arguments from the action that caused this trigger.
-     * @return True if the execution of the event should be stopped, or false
-     * if the event may continue
+     * @param format        The format of the message that's going to be displayed.
+     * @param arguments     The arguments from the action that caused this trigger.
+     *
+     * @return True if the execution of the event should be stopped, or false if the event may
+     *         continue
      */
     @Precondition({
         "This action has at least one trigger",
@@ -193,12 +180,13 @@ public class ActionModel {
     /**
      * Tests to see if this action should be triggered or not.
      *
-     * @param sub The ActionsSubstitutor to use to substitute args
+     * @param sub       The ActionsSubstitutor to use to substitute args
      * @param arguments The arguments for the action event
+     *
      * @return True if the action should be executed, false otherwise
      */
     public boolean test(final ActionSubstitutor sub,
-            final Object ... arguments) {
+            final Object... arguments) {
         final boolean[] results = new boolean[conditions.size()];
 
         int i = 0;
@@ -239,8 +227,7 @@ public class ActionModel {
     }
 
     /**
-     * Retrieves a plain text description of any error that occurred while
-     * loading this action.
+     * Retrieves a plain text description of any error that occurred while loading this action.
      *
      * @since 0.6.5
      * @return This action's error message, or null if no error was encountered
@@ -355,8 +342,8 @@ public class ActionModel {
     }
 
     /**
-     * Retrieves the condition tree used for this action. Condition trees may
-     * be null, in which case the arguments are conjoined together.
+     * Retrieves the condition tree used for this action. Condition trees may be null, in which case
+     * the arguments are conjoined together.
      *
      * @return This action's condition tree
      */
@@ -365,9 +352,8 @@ public class ActionModel {
     }
 
     /**
-     * Retrieves a concrete condition tree used for this action. If there is
-     * no condition tree defined for this action, returns a conjunction tree
-     * for the arguments.
+     * Retrieves a concrete condition tree used for this action. If there is no condition tree
+     * defined for this action, returns a conjunction tree for the arguments.
      *
      * @since 0.6
      * @return A {@link ConditionTree} object for this action
@@ -391,6 +377,7 @@ public class ActionModel {
      * Retrieves the concurrency group of this action.
      *
      * @return This action's concurrency group
+     *
      * @since 0.6.3
      */
     public String getConcurrencyGroup() {
@@ -401,6 +388,7 @@ public class ActionModel {
      * Sets the concurrency group of this action.
      *
      * @param concurrencyGroup This action's new concurrency group
+     *
      * @since 0.6.3
      */
     public void setConcurrencyGroup(final String concurrencyGroup) {
@@ -409,10 +397,10 @@ public class ActionModel {
     }
 
     /**
-     * Determines whether or not this action will stop the event execution
-     * if it is triggered.
+     * Determines whether or not this action will stop the event execution if it is triggered.
      *
      * @return The stopping preference of this action
+     *
      * @see #setStopping(boolean)
      * @since 0.6.4
      */
@@ -421,12 +409,12 @@ public class ActionModel {
     }
 
     /**
-     * Sets the stopping preference of this action. If the stopping preference
-     * is <code>true</code> then when this action is successfully triggered,
-     * it will request that execution of the event is stopped. This will
-     * prevent the default behaviour of the callee being executed.
+     * Sets the stopping preference of this action. If the stopping preference is {@code true} then
+     * when this action is successfully triggered,it will request that execution of the event is
+     * stopped. This will prevent the default behaviour of the callee being executed.
      *
      * @param stop The new stopping preference of this action
+     *
      * @see #isStopping()
      * @since 0.6.4
      */
@@ -435,8 +423,8 @@ public class ActionModel {
     }
 
     /**
-     * Determine if this model has been modified since it was constructed or
-     * its modified status was reset.
+     * Determine if this model has been modified since it was constructed or its modified status was
+     * reset.
      *
      * @return True if this model has been modified, false otherwise
      */
@@ -445,9 +433,8 @@ public class ActionModel {
     }
 
     /**
-     * Resets the modified status of this model. After a call to
-     * resetModified(), this model will report that it has not been modified,
-     * until one of the set* methods is used.
+     * Resets the modified status of this model. After a call to resetModified(), this model will
+     * report that it has not been modified, until one of the set* methods is used.
      */
     public void resetModified() {
         this.modified = false;
@@ -461,4 +448,5 @@ public class ActionModel {
                 + Arrays.toString(response) + ", "
                 + conditions + ", format='" + newFormat + "']";
     }
+
 }

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -58,7 +58,6 @@ public class ActionSubstitutor {
     private static final String ERR_NULL_CHAIN = "null_component";
     /** Substitution to use to replace subs with illegal components. */
     private static final String ERR_ILLEGAL_COMPONENT = "illegal_component";
-
     /** Pattern used to match braced substitutions. */
     private static final Pattern BRACES_PATTERN = Pattern.compile("(?<!\\\\)((?:\\\\\\\\)*)"
             + "(\\$\\{([^{}]*?)\\})");
@@ -71,10 +70,10 @@ public class ActionSubstitutor {
     /** Pattern to determine if a substitution is a word number type. */
     private static final Pattern NUMBER_PATTERN = Pattern.compile("([0-9]+)(-([0-9]+)?)?");
     /** Pattern to determine if a substitution is an argument+component type. */
-    private static final Pattern COMP_PATTERN = Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
+    private static final Pattern COMP_PATTERN =
+            Pattern.compile("([0-9]+)\\.([A-Z_]+(\\.[A-Z_]+)*)");
     /** Pattern to determine if a substitution is a server component type. */
     private static final Pattern SERVER_PATTERN = Pattern.compile("[A-Z_]+(\\.[A-Z_]+)*");
-
     /** The action controller to use to find components. */
     private final ActionController actionController;
     /** The global config to read settings from. */
@@ -87,15 +86,16 @@ public class ActionSubstitutor {
     /**
      * Creates a new substitutor for the specified action type.
      *
-     * @param actionController The action controller to use to find components.
+     * @param actionController  The action controller to use to find components.
      * @param commandController The command controller to use when building command arguments.
-     * @param globalConfig The global config to read settings from.
-     * @param type The action type this substitutor is for
+     * @param globalConfig      The global config to read settings from.
+     * @param type              The action type this substitutor is for
      */
     public ActionSubstitutor(
             final ActionController actionController,
             final CommandController commandController,
-            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider globalConfig,
+            @SuppressWarnings("qualifiers") @GlobalConfig
+            final AggregateConfigProvider globalConfig,
             @Unbound final ActionType type) {
         this.actionController = actionController;
         this.globalConfig = globalConfig;
@@ -104,8 +104,8 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Retrieves a list of global config variables that will be substituted.
-     * Note: does not include initial $.
+     * Retrieves a list of global config variables that will be substituted. Note: does not include
+     * initial $.
      *
      * @return A list of global variable names that will be substituted
      */
@@ -114,9 +114,8 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Retrieves a list of substitutions derived from argument and component
-     * combinations, along with a corresponding friendly name for them.
-     * Note: does not include initial $.
+     * Retrieves a list of substitutions derived from argument and component combinations, along
+     * with a corresponding friendly name for them. Note: does not include initial $.
      *
      * @return A map of component substitution names and their descriptions
      */
@@ -139,9 +138,8 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Retrieves a list of server substitutions, if this action type supports
-     * them.
-     * Note: does not include initial $.
+     * Retrieves a list of server substitutions, if this action type supports them. Note: does not
+     * include initial $.
      *
      * @return A map of server substitution names and their descriptions.
      */
@@ -149,7 +147,8 @@ public class ActionSubstitutor {
         final Map<String, String> res = new HashMap<>();
 
         if (hasFrameContainer()) {
-            for (ActionComponent comp : actionController.findCompatibleComponents(Connection.class)) {
+            for (ActionComponent comp : actionController
+                    .findCompatibleComponents(Connection.class)) {
                 final String key = "{" + comp.toString() + "}";
                 final String desc = "The connection's " + comp.getName();
 
@@ -161,8 +160,7 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Returns true if this action type's first argument is a frame container,
-     * or descendent of one.
+     * Returns true if this action type's first argument is a frame container, or descendent of one.
      *
      * @return True if this action type's first arg extends or is a FrameContainer
      */
@@ -181,8 +179,8 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Determines whether or not word substitutions will work for this action
-     * type. Word substitutions take the form $1, $1-5, $6-, etc.
+     * Determines whether or not word substitutions will work for this action type. Word
+     * substitutions take the form $1, $1-5, $6-, etc.
      *
      * @return True if word substitutions are supported, false otherwise.
      */
@@ -193,16 +191,16 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Performs all applicable substitutions on the specified string, with the
-     * specified arguments.
+     * Performs all applicable substitutions on the specified string, with the specified arguments.
      *
      * @param target The string to be altered
-     * @param args The arguments for the action type
+     * @param args   The arguments for the action type
+     *
      * @return The substituted string
      */
     @Precondition("Number of arguments given equals the number of arguments "
-    + "required by this substitutor's type")
-    public String doSubstitution(final String target, final Object ... args) {
+            + "required by this substitutor's type")
+    public String doSubstitution(final String target, final Object... args) {
         if (type.getType().getArity() != args.length) {
             throw new IllegalArgumentException("Invalid number of arguments "
                     + "for doSubstitution: expected " + type.getType().getArity() + ", got "
@@ -237,10 +235,11 @@ public class ActionSubstitutor {
      * Retrieves the value which should be used for the specified substitution.
      *
      * @param substitution The substitution, without leading $
-     * @param args The arguments for the action
+     * @param args         The arguments for the action
+     *
      * @return The substitution to be used
      */
-    private String getSubstitution(final String substitution, final Object ... args) {
+    private String getSubstitution(final String substitution, final Object... args) {
         final Matcher numberMatcher = NUMBER_PATTERN.matcher(substitution);
         final Matcher compMatcher = COMP_PATTERN.matcher(substitution);
         final Matcher serverMatcher = SERVER_PATTERN.matcher(substitution);
@@ -289,7 +288,7 @@ public class ActionSubstitutor {
             if (connection != null) {
                 try {
                     final ActionComponentChain chain = new ActionComponentChain(
-                        Connection.class, substitution, actionController);
+                            Connection.class, substitution, actionController);
                     return escape(checkConnection(chain, args, connection));
                 } catch (IllegalArgumentException ex) {
                     return ERR_ILLEGAL_COMPONENT;
@@ -301,23 +300,23 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Checks the connection status of any server associated with the specified
-     * arguments. If the specified component chain requires a server with an
-     * established connection and no such server is present, this method
-     * returns the string <code>not_connected</code> without attempting to
+     * Checks the connection status of any server associated with the specified arguments. If the
+     * specified component chain requires a server with an established connection and no such server
+     * is present, this method returns the string {@code not_connected} without attempting to
      * evaluate any components in the chain.
      *
      * @since 0.6.4
-     * @param chain The chain to be checked
-     * @param args The arguments for this invocation
+     * @param chain    The chain to be checked
+     * @param args     The arguments for this invocation
      * @param argument The argument used as a base for the chain
+     *
      * @return The value of the evaluated chain, or <code>not_connected</code>
      */
     protected String checkConnection(final ActionComponentChain chain,
             final Object[] args, final Object argument) {
         if ((chain.requiresConnection() && args[0] instanceof FrameContainer
-                    && ((FrameContainer) args[0]).getConnection().getState()
-                    == ServerState.CONNECTED) || !chain.requiresConnection()) {
+                && ((FrameContainer) args[0]).getConnection().getState()
+                == ServerState.CONNECTED) || !chain.requiresConnection()) {
             final Object res = chain.get(argument);
             return res == null ? ERR_NULL_CHAIN : res.toString();
         }
@@ -326,16 +325,17 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Tries to retrieve an appropriate configuration manager from the
-     * specified set of arguments. If any of the arguments is an instance of
-     * {@link FrameContainer} or {@link Window}, the config manager is
-     * requested from them. Otherwise, the global config is returned.
+     * Tries to retrieve an appropriate configuration manager from the specified set of arguments.
+     * If any of the arguments is an instance of {@link FrameContainer} or {@link Window}, the
+     * config manager is requested from them. Otherwise, the global config is returned.
      *
      * @param args The arguments to be tested
+     *
      * @return The best config manager to use for those arguments
+     *
      * @since 0.6.3m2
      */
-    protected AggregateConfigProvider getConfigManager(final Object ... args) {
+    protected AggregateConfigProvider getConfigManager(final Object... args) {
         for (Object arg : args) {
             if (arg instanceof FrameContainer) {
                 return ((FrameContainer) arg).getConfigManager();
@@ -348,12 +348,14 @@ public class ActionSubstitutor {
     }
 
     /**
-     * Escapes all special characters in the specified input. This will result
-     * in the input being treated as a plain string when passed through the
-     * substitutor (i.e., no substitutions will occur).
+     * Escapes all special characters in the specified input. This will result in the input being
+     * treated as a plain string when passed through the substitutor (i.e., no substitutions will
+     * occur).
      *
      * @param input The string to be escaped
+     *
      * @return An escaped version of the specified string
+     *
      * @since 0.6.4
      */
     protected static String escape(final String input) {

src/com/dmdirc/actions/ActionTypeComparator.java

@@ -33,9 +33,9 @@ import java.util.Comparator;
 public final class ActionTypeComparator implements Comparator<ActionType>, Serializable {
 
     /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
+     * A version number for this class. It should be changed whenever the class structure is changed
+     * (or anything else that would prevent serialized objects being unserialized with the new
+     * class).
      */
     private static final long serialVersionUID = 1;
 

src/com/dmdirc/actions/ColourActionComparison.java

@@ -59,47 +59,66 @@ public class ColourActionComparison {
      * @return The available comparisons.
      */
     public ActionComparison[] getComparisons() {
-        return new ActionComparison[] { equalsComparison, notEqualsComparison };
+        return new ActionComparison[]{equalsComparison, notEqualsComparison};
     }
 
     /** Checks if the colour is the same as another colour. */
     private class Equals implements ActionComparison {
+
         /** {@inheritDoc} */
         @Override
         public boolean test(final Object arg1, final Object arg2) {
-            return ((Colour) arg1).equals(colourManager.get().getColourFromString((String) arg2, null));
+            return ((Colour) arg1).equals(colourManager.get().getColourFromString((String) arg2,
+                    null));
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Colour.class; }
+        public Class<?> appliesTo() {
+            return Colour.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "equals"; }
+        public String getName() {
+            return "equals";
+        }
+
         /** {@inheritDoc} */
         @Override
         public String name() {
             return "COLOUR_EQUALS";
         }
+
     }
 
     /** Checks if the colour is not the same as another colour. */
     private class NotEquals implements ActionComparison {
+
         /** {@inheritDoc} */
         @Override
         public boolean test(final Object arg1, final Object arg2) {
             return !equalsComparison.test(arg1, arg2);
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Colour.class; }
+        public Class<?> appliesTo() {
+            return Colour.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "does not equal"; }
+        public String getName() {
+            return "does not equal";
+        }
+
         /** {@inheritDoc} */
         @Override
         public String name() {
             return "COLOUR_NEQUALS";
         }
+
     }
 
 }

src/com/dmdirc/actions/ConditionTree.java

@@ -26,13 +26,13 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 
 /**
- * A condition tree specifies in which order a group of conditions will be
- * executed.
+ * A condition tree specifies in which order a group of conditions will be executed.
  */
-public class ConditionTree {
+public final class ConditionTree {
 
     /** The possible operations on a condition tree. */
     public static enum OPERATION {
+
         /** Only passes if both subtrees are true. */
         AND,
         /** Passes if either of the subtrees are true. */
@@ -43,25 +43,22 @@ public class ConditionTree {
         NOT,
         /** Doesn't do anything (an empty tree). */
         NOOP
-    }
 
+    }
     /** The left subtree of this tree. */
-    private ConditionTree leftArg = null;
-
+    private ConditionTree leftArg;
     /** The right subtree of this tree. */
-    private ConditionTree rightArg = null;
-
+    private ConditionTree rightArg;
     /** The argument of this tree (only used for VAR ops). */
     private int argument = -1;
-
     /** The operation that this tree performs. */
     private final OPERATION op;
 
     /**
      * Creates a new ConditionTree for a binary operation.
      *
-     * @param op The binary operation to perform
-     * @param leftArg The left argument/subtree
+     * @param op       The binary operation to perform
+     * @param leftArg  The left argument/subtree
      * @param rightArg The right argument/subtree
      */
     private ConditionTree(final OPERATION op, final ConditionTree leftArg,
@@ -74,8 +71,8 @@ public class ConditionTree {
     /**
      * Creates a new ConditionTree for a unary operation.
      *
-     * @param op
-     * @param argument
+     * @param op       The unary operation to perform.
+     * @param argument The argument/subtree to perform it on.
      */
     private ConditionTree(final OPERATION op, final ConditionTree argument) {
         this.op = op;
@@ -83,8 +80,7 @@ public class ConditionTree {
     }
 
     /**
-     * Creates a new ConditionTree for a VAR operation with the specified
-     * argument number.
+     * Creates a new ConditionTree for a VAR operation with the specified argument number.
      *
      * @param argument The number of the argument that's to be tested.
      */
@@ -118,11 +114,10 @@ public class ConditionTree {
     }
 
     /**
-     * Evaluates this tree with the specified conditions. Returns the result
-     * of the evaluation.
+     * Evaluates this tree with the specified conditions. Returns the result of the evaluation.
+     *
+     * @param conditions The binary values of each of the conditions used in this three
      *
-     * @param conditions The binary values of each of the conditions used in
-     * this three
      * @return The result of the evaluation of this tree
      */
     public boolean evaluate(final boolean[] conditions) {
@@ -154,26 +149,25 @@ public class ConditionTree {
     }
 
     /**
-     * Retrieves a String representation of this ConditionTree. The string
-     * representation is a normalised formula describing this tree and all of
-     * its children. The output of this method will generate an identical tree
-     * if passed to parseString.
+     * Retrieves a String representation of this ConditionTree. The string representation is a
+     * normalised formula describing this tree and all of its children. The output of this method
+     * will generate an identical tree if passed to parseString.
      *
      * @return A string representation of this tree
      */
     @Override
     public String toString() {
         switch (op) {
-        case VAR:
-            return String.valueOf(argument);
-        case NOT:
-            return "!" + leftArg;
-        case AND:
-            return "(" + leftArg + "&" + rightArg + ")";
-        case OR:
-            return "(" + leftArg + "|" + rightArg + ")";
-        default:
-            return "";
+            case VAR:
+                return String.valueOf(argument);
+            case NOT:
+                return "!" + leftArg;
+            case AND:
+                return "(" + leftArg + "&" + rightArg + ")";
+            case OR:
+                return "(" + leftArg + "|" + rightArg + ")";
+            default:
+                return "";
         }
     }
 
@@ -181,8 +175,9 @@ public class ConditionTree {
      * Parses the specified string into a condition tree.
      *
      * @param string The string to be parsed
-     * @return The corresponding condition tree, or null if there was an error
-     * while parsing the data
+     *
+     * @return The corresponding condition tree, or null if there was an error while parsing the
+     *         data
      */
     public static ConditionTree parseString(final String string) {
         final Deque<Object> stack = new ArrayDeque<>();
@@ -212,12 +207,12 @@ public class ConditionTree {
     }
 
     /**
-     * Parses the specified stack of elements, and returns a corresponding
-     * ConditionTree.
+     * Parses the specified stack of elements, and returns a corresponding ConditionTree.
      *
      * @param stack The stack to be read.
-     * @return The corresponding condition tree, or null if there was an error
-     * while parsing the data.
+     *
+     * @return The corresponding condition tree, or null if there was an error while parsing the
+     *         data.
      */
     private static ConditionTree parseStack(final Deque<Object> stack) {
         final Deque<Object> myStack = new ArrayDeque<>();
@@ -288,8 +283,9 @@ public class ConditionTree {
      * Reads and returns a single term from the specified stack.
      *
      * @param stack The stack to be read
-     * @return The ConditionTree representing the last element on the stack,
-     * or null if it was not possible to create one.
+     *
+     * @return The ConditionTree representing the last element on the stack, or null if it was not
+     *         possible to create one.
      */
     private static ConditionTree readTerm(final Deque<Object> stack) {
         final Object first = stack.pollFirst();
@@ -310,12 +306,12 @@ public class ConditionTree {
     }
 
     /**
-     * Pops elements off of the end of the specified stack until an opening
-     * bracket is reached, and then returns the parsed content of the bracket.
+     * Pops elements off of the end of the specified stack until an opening bracket is reached, and
+     * then returns the parsed content of the bracket.
      *
      * @param stack The stack to be read for the bracket
-     * @return The parsed contents of the bracket, or null if the brackets were
-     * mismatched.
+     *
+     * @return The parsed contents of the bracket, or null if the brackets were mismatched.
      */
     private static ConditionTree readBracket(final Deque<Object> stack) {
         final Deque<Object> tempStack = new ArrayDeque<>();
@@ -342,6 +338,7 @@ public class ConditionTree {
      * Determines if the specified character represents a single digit.
      *
      * @param target The character to be tested
+     *
      * @return True if the character is a digit, false otherwise
      */
     private static boolean isInt(final char target) {
@@ -349,10 +346,10 @@ public class ConditionTree {
     }
 
     /**
-     * Creates a condition tree by disjoining the specified number of arguments
-     * together.
+     * Creates a condition tree by disjoining the specified number of arguments together.
      *
      * @param numArgs The number of arguments to be disjoined
+     *
      * @return The corresponding condition tree
      */
     public static ConditionTree createDisjunction(final int numArgs) {
@@ -370,10 +367,10 @@ public class ConditionTree {
     }
 
     /**
-     * Creates a condition tree by conjoining the specified number of arguments
-     * together.
+     * Creates a condition tree by conjoining the specified number of arguments together.
      *
      * @param numArgs The number of arguments to be conjoined
+     *
      * @return The corresponding condition tree
      */
     public static ConditionTree createConjunction(final int numArgs) {

src/com/dmdirc/actions/ConditionTreeFactory.java

@@ -23,8 +23,7 @@
 package com.dmdirc.actions;
 
 /**
- * Provides methods to automatically generated condition tree for a specified
- * number of arguments.
+ * Provides methods to automatically generated condition tree for a specified number of arguments.
  *
  * @since 0.6
  */
@@ -34,6 +33,7 @@ public abstract class ConditionTreeFactory {
      * Retrieves a condition tree for the specified number of arguments.
      *
      * @param args The number of arguments in the {@link Action}
+     *
      * @return A ConditionTree for the specified number of args
      */
     public abstract ConditionTree getConditionTree(final int args);
@@ -46,25 +46,27 @@ public abstract class ConditionTreeFactory {
     public abstract ConditionTreeFactoryType getType();
 
     /**
-     * The possible types of ConditionTreeFactories
+     * The possible types of ConditionTreeFactories.
      */
     public static enum ConditionTreeFactoryType {
+
         /** Factories that produce disjunction (OR) trees. */
         DISJUNCTION,
         /** Factories that produce conjunction (AND) trees. */
         CONJUNCTION,
         /** Factories that produce custom trees. */
         CUSTOM,
+
     }
 
     /**
-     * Retrieves a factory that will extrapolate the specified
-     * {@link ConditionTree} for different number of arguments, if applicable.
+     * 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
+     *
+     * @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))) {
@@ -144,4 +146,5 @@ public abstract class ConditionTreeFactory {
         }
 
     }
+
 }

src/com/dmdirc/actions/CoreActionComparison.java

@@ -27,8 +27,8 @@ import com.dmdirc.interfaces.actions.ActionComparison;
 import java.util.regex.PatternSyntaxException;
 
 /**
- * A CoreActionComparison represents a possible comparison between two types of
- * data used in an action condition.
+ * A CoreActionComparison represents a possible comparison between two types of data used in an
+ * action condition.
  */
 public enum CoreActionComparison implements ActionComparison {
 
@@ -43,29 +43,40 @@ public enum CoreActionComparison implements ActionComparison {
                 return false;
             }
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "matches regex"; }
+        public String getName() {
+            return "matches regex";
+        }
     },
-
-    /** Compares if two strings content are the same, case insensitive. */
+    /** Compares if two strings content are
+     * the same, case insensitive. */
     STRING_EQUALS {
         /** {@inheritDoc} */
         @Override
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).equalsIgnoreCase((String) arg2);
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "equals"; }
+        public String getName() {
+            return "equals";
+        }
     },
-
     /** Compares if two strings content aren't the same, case insensitive. */
     STRING_NEQUALS {
         /** {@inheritDoc} */
@@ -73,14 +84,19 @@ public enum CoreActionComparison implements ActionComparison {
         public boolean test(final Object arg1, final Object arg2) {
             return !STRING_EQUALS.test(arg1, arg2);
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "does not equal"; }
+        public String getName() {
+            return "does not equal";
+        }
     },
-
     /** Checks if the string starts with another strings. */
     STRING_STARTSWITH {
         /** {@inheritDoc} */
@@ -88,14 +104,19 @@ public enum CoreActionComparison implements ActionComparison {
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).startsWith((String) arg2);
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "starts with"; }
+        public String getName() {
+            return "starts with";
+        }
     },
-
     /** Checks if the string containts another string. */
     STRING_CONTAINS {
         /** {@inheritDoc} */
@@ -103,14 +124,19 @@ public enum CoreActionComparison implements ActionComparison {
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).indexOf((String) arg2) != -1;
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "contains"; }
+        public String getName() {
+            return "contains";
+        }
     },
-
     /** Checks if the string doesn't containt another string. */
     STRING_NCONTAINS {
         /** {@inheritDoc} */
@@ -118,14 +144,19 @@ public enum CoreActionComparison implements ActionComparison {
         public boolean test(final Object arg1, final Object arg2) {
             return ((String) arg1).indexOf((String) arg2) == -1;
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return String.class; }
+        public Class<?> appliesTo() {
+            return String.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "doesn't contain"; }
+        public String getName() {
+            return "doesn't contain";
+        }
     },
-
     /** Checks if two boolean values are equal. */
     BOOL_IS {
         /** {@inheritDoc} */
@@ -133,14 +164,19 @@ public enum CoreActionComparison implements ActionComparison {
         public boolean test(final Object arg1, final Object arg2) {
             return ((Boolean) arg1).equals(Boolean.valueOf((String) arg2));
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Boolean.class; }
+        public Class<?> appliesTo() {
+            return Boolean.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "is"; }
+        public String getName() {
+            return "is";
+        }
     },
-
     /** Checks if the int is equals to another int. */
     INT_EQUALS {
         /** {@inheritDoc} */
@@ -152,14 +188,19 @@ public enum CoreActionComparison implements ActionComparison {
                 return false;
             }
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Integer.class; }
+        public Class<?> appliesTo() {
+            return Integer.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "equals"; }
+        public String getName() {
+            return "equals";
+        }
     },
-
     /** Checks if the int is larger than another int. */
     INT_GREATER {
         /** {@inheritDoc} */
@@ -171,14 +212,19 @@ public enum CoreActionComparison implements ActionComparison {
                 return false;
             }
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Integer.class; }
+        public Class<?> appliesTo() {
+            return Integer.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "is greater than"; }
+        public String getName() {
+            return "is greater than";
+        }
     },
-
     /** Checks if the int is smaller than another int. */
     INT_LESS {
         /** {@inheritDoc} */
@@ -190,12 +236,18 @@ public enum CoreActionComparison implements ActionComparison {
                 return false;
             }
         }
+
         /** {@inheritDoc} */
         @Override
-        public Class<?> appliesTo() { return Integer.class; }
+        public Class<?> appliesTo() {
+            return Integer.class;
+        }
+
         /** {@inheritDoc} */
         @Override
-        public String getName() { return "is less than"; }
+        public String getName() {
+            return "is less than";
+        }
     };
 
 }

src/com/dmdirc/actions/CoreActionType.java

@@ -51,10 +51,8 @@ public enum CoreActionType implements ActionType {
     CLIENT_FOCUS_LOST(ClientEvents.CLIENT_EVENT, "Client lost focus"),
     /** Client gained focus. */
     CLIENT_FOCUS_GAINED(ClientEvents.CLIENT_EVENT, "Client gained focus"),
-
     /** Function key pressed. */
     CLIENT_KEY_PRESSED(ClientEvents.CLIENT_EVENT_WITH_KEY, "Function key pressed"),
-
     /** Frame changed. */
     CLIENT_FRAME_CHANGED(ClientEvents.WINDOW_EVENT, "Frame changed"),
     /** User input. */
@@ -63,17 +61,14 @@ public enum CoreActionType implements ActionType {
     CLIENT_LINE_ADDED(ClientEvents.WINDOW_EVENT_WITH_MESSAGE, "Line added to a window"),
     /** Popup generated. */
     CLIENT_POPUP_GENERATED(ClientEvents.POPUP_EVENT, "Popup menu generated"),
-
     /** Prefs dialog opened. */
     CLIENT_PREFS_OPENED(ClientEvents.CLIENT_EVENT_WITH_PREFS, "Preferences dialog opened"),
     /** Context-specific prefs requested. */
     CLIENT_PREFS_REQUESTED(ClientEvents.CLIENT_EVENT_WITH_PREFS_CAT, "Preferences requested"),
     /** Prefs dialog closed. */
     CLIENT_PREFS_CLOSED(ClientEvents.CLIENT_EVENT, "Preferences dialog opened"),
-
     /** Unknown command. */
     UNKNOWN_COMMAND(ClientEvents.UNKNOWN_COMMAND, "Unknown command entered"),
-
     /** Server numeric received. */
     SERVER_NUMERIC(ServerEvents.SERVER_NUMERIC, "Numeric event received"),
     /** Server connected. */
@@ -90,7 +85,6 @@ public enum CoreActionType implements ActionType {
     SERVER_AWAY(ServerEvents.SERVER_EVENT_WITH_ARG, "Marked as 'away'"),
     /** Error. */
     SERVER_ERROR(ServerEvents.SERVER_EVENT_WITH_ARG, "Server error"),
-
     /** Auth notice received. */
     SERVER_AUTHNOTICE(ServerEvents.SERVER_EVENT_WITH_ARG, "Received auth notice"),
     /** Unknown action received. */
@@ -99,47 +93,38 @@ public enum CoreActionType implements ActionType {
     SERVER_UNKNOWNNOTICE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown notice"),
     /** Unknown message received. */
     SERVER_UNKNOWNMESSAGE(ServerEvents.SERVER_UNKNOWN_EVENT, "Received unknown message"),
-
     /** User modes changed. */
     SERVER_USERMODES(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "User modes changed"),
-
     /** Private CTCP received. */
     SERVER_CTCP(ServerEvents.SERVER_CTCP_EVENT, "CTCP received"),
     /** Private CTCPR received. */
     SERVER_CTCPR(ServerEvents.SERVER_CTCP_EVENT, "CTCP reply received"),
-
     /** Private notice received. */
     SERVER_NOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Notice received"),
     /** Private server notice received. */
     SERVER_SERVERNOTICE(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Server notice received"),
-
     /** MOTD starting. */
     SERVER_MOTDSTART(ServerEvents.SERVER_EVENT_WITH_ARG, "Start of MOTD received"),
     /** MOTD ended. */
     SERVER_MOTDEND(ServerEvents.SERVER_EVENT_WITH_ARG, "End of MOTD received"),
     /** MOTD line. */
     SERVER_MOTDLINE(ServerEvents.SERVER_EVENT_WITH_ARG, "MOTD line received"),
-
     /** Ping reply received. */
     SERVER_GOTPING(ServerEvents.SERVER_PING, "Received server ping reply"),
     /** Missed server ping reply. */
     SERVER_NOPING(ServerEvents.SERVER_PING, "Missed server ping reply"),
     /** Ping sent. */
     SERVER_PINGSENT(ServerEvents.SERVER_EVENT, "Ping request sent"),
-
     /** Invite received. */
     SERVER_INVITERECEIVED(ServerEvents.SERVER_INVITE, "Invite received"),
-
     /** Wallops. */
     SERVER_WALLOPS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Wallop received"),
     /** Wallusers. */
     SERVER_WALLUSERS(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walluser received"),
     /** Walldesync. */
     SERVER_WALLDESYNC(ServerEvents.SERVER_SOURCED_EVENT_WITH_ARG, "Walldesync received"),
-
     /** Nick change. */
     SERVER_NICKCHANGE(ServerEvents.SERVER_NICKCHANGE, "My nickname changed"),
-
     /** Channel window opened. */
     CHANNEL_OPENED(ChannelEvents.CHANNEL_EVENT, "Channel window opened"),
     /** Channel window closed. */
@@ -150,24 +135,23 @@ public enum CoreActionType implements ActionType {
     CHANNEL_NOTOPIC(ChannelEvents.CHANNEL_EVENT, "Channel topic is not set"),
     /** Channel topic received. */
     CHANNEL_GOTTOPIC(ChannelEvents.CHANNEL_TOPICEVENT, "Channel topic received"),
-
     /** Channel message sent. */
     CHANNEL_SELF_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message sent"),
     /** Channel action sent. */
     CHANNEL_SELF_ACTION(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel action sent"),
-
     /** Channel message received. */
     CHANNEL_MESSAGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel message received"),
     /** Channel actions received. */
     CHANNEL_ACTION(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel action received"),
     /** Channel notice received. */
     CHANNEL_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Channel notice received"),
-    /** Channel mode notice received. @since 0.6.3m2 */
-    CHANNEL_MODE_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_CHARARG, "Channel mode notice received"),
-
+    /** Channel mode notice received.
+     *
+     * @since 0.6.3m2 */
+    CHANNEL_MODE_NOTICE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_CHARARG,
+    "Channel mode notice received"),
     /** Channel CTCP received. */
     CHANNEL_CTCP(ChannelEvents.CHANNEL_CTCP, "Channel CTCP received"),
-
     /** Someone joined a channel. */
     CHANNEL_JOIN(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone joined a channel"),
     /** Someone left a channel. */
@@ -176,27 +160,27 @@ public enum CoreActionType implements ActionType {
     CHANNEL_QUIT(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone quit IRC"),
     /** Someone was kicked. */
     CHANNEL_KICK(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM, "Someone kicked someone"),
-
     /** Someone marked as away. */
     CHANNEL_USERAWAY(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'away'"),
     /** Someone marked as back. */
     CHANNEL_USERBACK(ChannelEvents.CHANNEL_SOURCED_EVENT, "Someone is marked as 'back'"),
-
-    /** Channel list mode retrieved. @since 0.6.3 */
-    CHANNEL_LISTMODERETRIEVED(ChannelEvents.CHANNEL_LISTMODEEVENT, "Channel list mode value retrieved"),
+    /** Channel list mode retrieved.
+     *
+     * @since 0.6.3 */
+    CHANNEL_LISTMODERETRIEVED(ChannelEvents.CHANNEL_LISTMODEEVENT,
+    "Channel list mode value retrieved"),
     /** Channel mode discovered. */
     CHANNEL_MODESDISCOVERED(ChannelEvents.CHANNEL_MODEEVENT, "Channel modes discovered"),
     /** Channel mode changes. */
     CHANNEL_MODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel modes"),
     /** Someone changed someone else's user modes. */
-    CHANNEL_USERMODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM, "Someone changed someone else's modes"),
-
+    CHANNEL_USERMODECHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_VICTIM,
+    "Someone changed someone else's modes"),
     /** Someone changed nickname. */
     CHANNEL_NICKCHANGE(ChannelEvents.CHANNEL_NICKEVENT, "Someone changed nicknames"),
-
     /** Someone changed a topic. */
-    CHANNEL_TOPICCHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG, "Someone changed channel topic"),
-
+    CHANNEL_TOPICCHANGE(ChannelEvents.CHANNEL_SOURCED_EVENT_WITH_ARG,
+    "Someone changed channel topic"),
     /** Query opened. */
     QUERY_OPENED(QueryEvents.QUERY_EVENT, "Query window opened"),
     /** Query closed. */
@@ -213,36 +197,32 @@ public enum CoreActionType implements ActionType {
     QUERY_QUIT(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user quit"),
     /** Query nick change. */
     QUERY_NICKCHANGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user changed nicks"),
-
     /** Plugin loaded. */
     PLUGIN_LOADED(PluginEvents.PLUGIN_EVENT, "Plugin loaded"),
     /** Plugin unloaded. */
     PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded"),
     /** Plugins have been refreshed. */
     PLUGIN_REFRESH(PluginEvents.PLUGIN_EVENT, "Plugins refreshed"),
-
     /** Action created. */
     ACTION_CREATED(ActionEvents.ACTION_EVENT, "Action created"),
     /** Action updated. */
     ACTION_UPDATED(ActionEvents.ACTION_EVENT, "Action updated"),
     /** Action deleted. */
     ACTION_DELETED(ActionEvents.ACTION_DELETED, "Action deleted"),
-
     /** Channel clicked. */
     LINK_CHANNEL_CLICKED(LinkEvents.CHANNEL_CLICKED, "A channel link was clicked"),
     /** Channel clicked. */
     LINK_NICKNAME_CLICKED(LinkEvents.NICKNAME_CLICKED, "A nickname link was clicked"),
     /** Link clicked. */
     LINK_URL_CLICKED(LinkEvents.LINK_CLICKED, "A Link was clicked");
-
     /** The type of this action. */
     private final ActionMetaType type;
-
     /** The name of this action. */
     private final String name;
 
     /**
      * Constructs a new core action.
+     *
      * @param type The type of this action
      * @param name The name of this action
      */
@@ -262,4 +242,5 @@ public enum CoreActionType implements ActionType {
     public String getName() {
         return name;
     }
+
 }

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

@@ -41,14 +41,12 @@ public class WhoisNumericFormatter implements ActionListener {
 
     /** The name of the target of any current whois requests. */
     private final Map<Connection, String> targets = new HashMap<>();
-
     /** The identity to add formatters to. */
     private final ConfigProvider identity;
 
     /**
-     * Creates a new whois numeric formatter that will add automatic formats
-     * to the specified identity. This will normally be a temporary global
-     * identity.
+     * Creates a new whois numeric formatter that will add automatic formats to the specified
+     * identity. This will normally be a temporary global identity.
      *
      * @param identity The identity to write formatters to
      */
@@ -57,8 +55,7 @@ public class WhoisNumericFormatter implements ActionListener {
     }
 
     /**
-     * Registers this this whois numeric formatter with the global actions
-     * manager.
+     * Registers this this whois numeric formatter with the global actions manager.
      */
     public void register() {
         ActionManager.getActionManager().registerListener(this,
@@ -79,8 +76,8 @@ public class WhoisNumericFormatter implements ActionListener {
     }
 
     /**
-     * Handles a server disconnected event. This clears any entry for that
-     * server in the <code>target</code> map.
+     * Handles a server disconnected event. This clears any entry for that server in the
+     * {@link #targets} map.
      *
      * @param server The server that was disconnected
      */
@@ -89,15 +86,15 @@ public class WhoisNumericFormatter implements ActionListener {
     }
 
     /**
-     * Handles a received numeric event. This method has special handling for
-     * numerics 311 and 318, used to signal the start and end of a WHOIS
-     * request. It then monitors any other numerics without formatters for
-     * events which look like WHOIS information, and formats them automatically.
+     * Handles a received numeric event. This method has special handling for numerics 311 and 318,
+     * used to signal the start and end of a WHOIS request. It then monitors any other numerics
+     * without formatters for events which look like WHOIS information, and formats them
+     * automatically.
      *
-     * @param server The server on which the event was received
-     * @param numeric The numeric code of the event
+     * @param server    The server on which the event was received
+     * @param numeric   The numeric code of the event
      * @param arguments The arguments to the numeric event
-     * @param format The format that should be used to display the event
+     * @param format    The format that should be used to display the event
      */
     private void handleNumeric(final Connection server, final int numeric,
             final String[] arguments, final StringBuffer format) {
@@ -134,7 +131,7 @@ public class WhoisNumericFormatter implements ActionListener {
     /**
      * Ensures that the specified formatter exists in our identity.
      *
-     * @param target The target to be checked and added if necessary
+     * @param target    The target to be checked and added if necessary
      * @param arguments The number of arguments for the numeric
      */
     private void ensureExists(final String target, final int arguments) {

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

@@ -34,7 +34,6 @@ public enum ActionEvents implements ActionMetaType {
     ACTION_EVENT(new String[]{"action"}, Action.class),
     /** Action event type. */
     ACTION_DELETED(new String[]{"Action group", "Action name"}, Action.class, String.class);
-
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -46,7 +45,7 @@ public enum ActionEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    ActionEvents(final String[] argNames, final Class ... argTypes) {
+    ActionEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -41,18 +41,24 @@ public enum ChannelEvents implements ActionMetaType {
     /** Channel topic event type. */
     CHANNEL_TOPICEVENT(new String[]{"channel", "topic"}, Channel.class, Topic.class),
     /** Channel CTCP type. */
-    CHANNEL_CTCP(new String[]{"channel", "user", "type", "content"}, Channel.class, ChannelClientInfo.class, String.class, String.class),
+    CHANNEL_CTCP(new String[]{"channel", "user", "type", "content"}, Channel.class,
+    ChannelClientInfo.class, String.class, String.class),
     /** Channel event with source. */
     CHANNEL_SOURCED_EVENT(new String[]{"channel", "user"}, Channel.class, ChannelClientInfo.class),
     /** Chanel event with source and argument. */
-    CHANNEL_SOURCED_EVENT_WITH_ARG(new String[]{"channel", "user", "message"}, Channel.class, ChannelClientInfo.class, String.class),
+    CHANNEL_SOURCED_EVENT_WITH_ARG(new String[]{"channel", "user", "message"}, Channel.class,
+    ChannelClientInfo.class, String.class),
     /** Chanel event with source and nickname. */
-    CHANNEL_NICKEVENT(new String[]{"channel", "user", "old nickname"}, Channel.class, ChannelClientInfo.class, String.class),
-    /** Chanel event with source, message and mode character argument. @since 0.6.3m2 */
-    CHANNEL_SOURCED_EVENT_WITH_CHARARG(new String[]{"channel", "user", "mode", "message"}, Channel.class, ChannelClientInfo.class, String.class, String.class),
+    CHANNEL_NICKEVENT(new String[]{"channel", "user", "old nickname"}, Channel.class,
+    ChannelClientInfo.class, String.class),
+    /** Chanel event with source, message and mode character argument.
+     *
+     * @since 0.6.3m2 */
+    CHANNEL_SOURCED_EVENT_WITH_CHARARG(new String[]{"channel", "user", "mode", "message"},
+    Channel.class, ChannelClientInfo.class, String.class, String.class),
     /** Channel event with source and victim. */
-    CHANNEL_SOURCED_EVENT_WITH_VICTIM(new String[]{"channel", "user", "victim", "message"}, Channel.class, ChannelClientInfo.class, ChannelClientInfo.class, String.class);
-
+    CHANNEL_SOURCED_EVENT_WITH_VICTIM(new String[]{"channel", "user", "victim", "message"},
+    Channel.class, ChannelClientInfo.class, ChannelClientInfo.class, String.class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -64,7 +70,7 @@ public enum ChannelEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    ChannelEvents(final String[] argNames, final Class ... argTypes) {
+    ChannelEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -45,20 +45,25 @@ public enum ClientEvents implements ActionMetaType {
     /** Client event with frame and message. */
     WINDOW_EVENT_WITH_MESSAGE(new String[]{"window", "message"}, FrameContainer.class, String.class),
     /** A popup-related event. */
-    POPUP_EVENT(new String[]{"popup type", "popup", "configuration provider"}, PopupType.class, PopupMenu.class, AggregateConfigProvider.class),
+    POPUP_EVENT(new String[]{"popup type", "popup", "configuration provider"}, PopupType.class,
+    PopupMenu.class, AggregateConfigProvider.class),
     /** Client event type, with a key argument. */
     CLIENT_EVENT_WITH_KEY(new String[]{"key event"}, KeyStroke.class),
-    /** Client event with an origin and editable buffer. */
-    CLIENT_EVENT_WITH_BUFFER(new String[]{"origin", "buffer"}, FrameContainer.class, StringBuffer.class),
+    /** Client event with an origin and
+     * editable buffer. */
+    CLIENT_EVENT_WITH_BUFFER(new String[]{"origin", "buffer"}, FrameContainer.class,
+    StringBuffer.class),
     /** Client event with preferences manager. */
     CLIENT_EVENT_WITH_PREFS(new String[]{"preferences manager"}, PreferencesDialogModel.class),
     /** Client event with preferences category. */
-    CLIENT_EVENT_WITH_PREFS_CAT(new String[]{"preferences category", "is server"}, PreferencesCategory.class, Boolean.class),
+    CLIENT_EVENT_WITH_PREFS_CAT(new String[]{"preferences category", "is server"},
+    PreferencesCategory.class, Boolean.class),
     /** Client event with a styled doc. */
-    CLIENT_EVENT_WITH_STYLE(new String[]{"styled document", "start offset", "length"}, StyledDocument.class, Integer.class, Integer.class),
+    CLIENT_EVENT_WITH_STYLE(new String[]{"styled document", "start offset", "length"},
+    StyledDocument.class, Integer.class, Integer.class),
     /** Unknown command event type. */
-    UNKNOWN_COMMAND(new String[]{"source", "command", "arguments"}, FrameContainer.class, String.class, String[].class);
-
+    UNKNOWN_COMMAND(new String[]{"source", "command", "arguments"}, FrameContainer.class,
+    String.class, String[].class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -70,7 +75,7 @@ public enum ClientEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    ClientEvents(final String[] argNames, final Class ... argTypes) {
+    ClientEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -75,4 +75,5 @@ public enum LinkEvents implements ActionMetaType {
     public String getGroup() {
         return "Link Events";
     }
+
 }

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

@@ -32,7 +32,6 @@ public enum PluginEvents implements ActionMetaType {
 
     /** Plugin event type. */
     PLUGIN_EVENT(new String[]{"plugin"}, PluginInfo.class);
-
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -44,7 +43,7 @@ public enum PluginEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    PluginEvents(final String[] argNames, final Class ... argTypes) {
+    PluginEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -36,8 +36,8 @@ public enum QueryEvents implements ActionMetaType {
     /** Query event with argument. */
     QUERY_EVENT_WITH_ARG(new String[]{"query", "message"}, Query.class, String.class),
     /** Query event with argument and source. */
-    QUERY_SOURCED_EVENT_WITH_ARG(new String[]{"query", "source", "message"}, Query.class, ClientInfo.class, String.class);
-
+    QUERY_SOURCED_EVENT_WITH_ARG(new String[]{"query", "source", "message"}, Query.class,
+    ClientInfo.class, String.class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -49,7 +49,7 @@ public enum QueryEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    QueryEvents(final String[] argNames, final Class ... argTypes) {
+    QueryEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -34,22 +34,27 @@ public enum ServerEvents implements ActionMetaType {
     /** Server ping event type. */
     SERVER_PING(new String[]{"server", "ping"}, Connection.class, Long.class),
     /** Server numeric event type. */
-    SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Connection.class, Integer.class, String[].class),
+    SERVER_NUMERIC(new String[]{"server", "numeric", "arguments"}, Connection.class, Integer.class,
+    String[].class),
     /** Server event with argument. */
     SERVER_EVENT_WITH_ARG(new String[]{"server", "message"}, Connection.class, String.class),
     /** Server nick change. */
-    SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Connection.class, String.class, String.class),
+    SERVER_NICKCHANGE(new String[]{"server", "old nickname", "new nickname"}, Connection.class,
+    String.class, String.class),
     /** Server event, with source and argument. */
-    SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Connection.class, ClientInfo.class, String.class),
+    SERVER_SOURCED_EVENT_WITH_ARG(new String[]{"server", "user", "message"}, Connection.class,
+    ClientInfo.class, String.class),
     /** Server CTCP event. */
-    SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Connection.class, ClientInfo.class, String.class, String.class),
+    SERVER_CTCP_EVENT(new String[]{"server", "user", "type", "content"}, Connection.class,
+    ClientInfo.class, String.class, String.class),
     /** Server event with argument. */
-    SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Connection.class, String.class, String.class, String.class),
+    SERVER_UNKNOWN_EVENT(new String[]{"server", "source", "target", "message"}, Connection.class,
+    String.class, String.class, String.class),
     /** Server invite event. */
-    SERVER_INVITE(new String[]{"server", "source", "channel"}, Connection.class, ClientInfo.class, String.class),
+    SERVER_INVITE(new String[]{"server", "source", "channel"}, Connection.class, ClientInfo.class,
+    String.class),
     /** Server event type. */
     SERVER_EVENT(new String[]{"server"}, Connection.class);
-
     /** The names of the arguments for this meta type. */
     private String[] argNames;
     /** The classes of the arguments for this meta type. */
@@ -61,7 +66,7 @@ public enum ServerEvents implements ActionMetaType {
      * @param argNames The names of the meta-type's arguments
      * @param argTypes The types of the meta-type's arguments
      */
-    ServerEvents(final String[] argNames, final Class ... argTypes) {
+    ServerEvents(final String[] argNames, final Class... argTypes) {
         this.argNames = argNames;
         this.argTypes = argTypes;
     }

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

@@ -46,7 +46,7 @@ public class ActionNameValidator implements Validator<String> {
     /**
      * Instantiates a new action name validator for an existing action.
      *
-     * @param group Associated action group
+     * @param group        Associated action group
      * @param originalName Existing action name
      */
     public ActionNameValidator(final ActionGroup group,
@@ -66,4 +66,5 @@ public class ActionNameValidator implements Validator<String> {
         }
         return new ValidationResponse();
     }
+
 }

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

@@ -37,8 +37,8 @@ public class ConditionRuleValidator implements Validator<String> {
     /**
      * Creates a new ConditionRuleValidator.
      *
-     * @param args The number of arguments allowed in the ConditionTree (i.e.,
-     * the number of ActionConditions)
+     * @param args The number of arguments allowed in the ConditionTree (i.e., the number of
+     *             ActionConditions)
      */
     public ConditionRuleValidator(final int args) {
         this.args = args;

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

@@ -42,22 +42,18 @@ import java.util.List;
 public class Alias implements Serializable {
 
     /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
+     * A version number for this class. It should be changed whenever the class structure is changed
+     * (or anything else that would prevent serialized objects being unserialized with the new
+     * class).
      */
     private static final long serialVersionUID = 1;
-
     /** The factory to use to create actions. */
     // TODO: This should be injected.
     private final ActionFactory actionFactory;
-
     /** Alias command. */
     private String command;
-
     /** Alias arguments. */
     private List<ActionCondition> arguments;
-
     /** Alias response. */
     private String[] response;
 
@@ -65,7 +61,7 @@ public class Alias implements Serializable {
      * Creates a new Alias wrapper.
      *
      * @param actionFactory Factory to use to create alias actions.
-     * @param command Alias command
+     * @param command       Alias command
      */
     public Alias(final ActionFactory actionFactory, final String command) {
         this.actionFactory = actionFactory;
@@ -73,16 +69,16 @@ public class Alias implements Serializable {
         this.arguments = new ArrayList<>();
         this.arguments.add(new ActionCondition(1, CoreActionComponent.STRING_STRING,
                 CoreActionComparison.STRING_EQUALS, command));
-        this.response = new String[]{"", };
+        this.response = new String[]{"",};
     }
 
     /**
      * Wraps an existing Action in an Alias.
      *
      * @param actionFactory Factory to use to create alias actions.
-     * @param command Alias command
-     * @param arguments List of arguments for the alias
-     * @param response Response for the alias
+     * @param command       Alias command
+     * @param arguments     List of arguments for the alias
+     * @param response      Response for the alias
      */
     public Alias(final ActionFactory actionFactory, final String command,
             final List<ActionCondition> arguments, final String[] response) {
@@ -235,7 +231,7 @@ public class Alias implements Serializable {
         return actionFactory.getAction(
                 AliasWrapper.GROUP_NAME,
                 getName(),
-                new ActionType[] {CoreActionType.UNKNOWN_COMMAND, },
+                new ActionType[]{CoreActionType.UNKNOWN_COMMAND,},
                 getResponse(),
                 getArguments(),
                 ConditionTree.createConjunction(getArguments().size()),
@@ -250,4 +246,5 @@ public class Alias implements Serializable {
                 + Arrays.toString(response) + ", "
                 + arguments + ", format='']";
     }
+
 }

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

@@ -48,13 +48,10 @@ public class AliasWrapper extends ActionGroup {
 
     /** The name of the actions group we wrap. */
     protected static final String GROUP_NAME = "aliases";
-
     /** A list of registered alias names. */
     private final List<String> aliases = new ArrayList<>();
-
     /** Command controller to get command info from. */
     private final CommandController commandController;
-
     /** Server Manager. */
     private final WindowManager windowManager;
 
@@ -62,7 +59,7 @@ public class AliasWrapper extends ActionGroup {
      * Creates a new instance of AliasWrapper.
      *
      * @param commandController Command controller to get command info from.
-     * @param windowManager The window manager to use to find root windows.
+     * @param windowManager     The window manager to use to find root windows.
      */
     @Inject
     public AliasWrapper(
@@ -133,8 +130,9 @@ public class AliasWrapper extends ActionGroup {
      * Retrieves the command name of the specified alias action.
      *
      * @param action The action whose name is to be determined
-     * @return The command name for the specified alias, or null if it has
-     *         no appropriate conditions.
+     *
+     * @return The command name for the specified alias, or null if it has no appropriate
+     *         conditions.
      */
     public String getCommandName(final Action action) {
         for (ActionCondition condition : action.getConditions()) {

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

@@ -33,8 +33,7 @@ public enum PerformType {
     SERVER("Server"),
     /** A perform targeting a network. */
     NETWORK("Network");
-
-     /** Friendly name. */
+    /** Friendly name. */
     private final String friendlyName;
 
     /**
@@ -51,4 +50,5 @@ public enum PerformType {
     public String toString() {
         return friendlyName;
     }
+
 }

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

@@ -52,7 +52,6 @@ public class PerformWrapper extends ActionGroup {
 
     /** The component name for per-profile perform conditions. */
     private static final String PP_COMP_NAME = "SERVER_PROFILE.IDENTITY_NAME";
-
     /** Factory to use for actions. */
     private final ActionFactory actionFactory;
 
@@ -102,13 +101,13 @@ public class PerformWrapper extends ActionGroup {
     }
 
     /**
-     * Sets the perform for the specified target of the specified type.
-     * If the specified perform is empty - that is, any non-null elements are
-     * empty Strings - then the perform is removed. If a profile is specified,
-     * the perform will only be executed for that profile.
+     * Sets the perform for the specified target of the specified type. If the specified perform is
+     * empty - that is, any non-null elements are empty Strings - then the perform is removed. If a
+     * profile is specified, the perform will only be executed for that profile.
      *
      * @param perform The perform to be set
      * @param content The new content of that perform
+     *
      * @since 0.6.4
      */
     public void setPerform(final PerformDescription perform, final String[] content) {
@@ -143,11 +142,13 @@ public class PerformWrapper extends ActionGroup {
     }
 
     /**
-     * Retrieves the perform for the relevant target. If no such perform exists,
-     * a zero-length array is returned.
+     * Retrieves the perform for the relevant target. If no such perform exists, a zero-length array
+     * is returned.
      *
      * @param perform The perform to be retrieved
+     *
      * @return The corresponding perform, or a zero-length array if none set
+     *
      * @since 0.6.4
      */
     public String[] getPerform(final PerformDescription perform) {
@@ -163,11 +164,13 @@ public class PerformWrapper extends ActionGroup {
     }
 
     /**
-     * Determines if the specified perform is "empty". An empty perform is one
-     * that does not contain any non-empty Strings.
+     * Determines if the specified perform is "empty". An empty perform is one that does not contain
+     * any non-empty Strings.
      *
      * @param perform The perform to test
+     *
      * @return True if the perform is empty, false otherwise
+     *
      * @since 0.6.4
      */
     private static boolean isEmpty(final String[] perform) {
@@ -184,6 +187,7 @@ public class PerformWrapper extends ActionGroup {
      * Checks that the specified conditions are valid for a perform action.
      *
      * @param conditions The conditions to be checked
+     *
      * @since 0.6.3m2
      * @return True if the conditions are valid, false otherwise
      */
@@ -209,13 +213,13 @@ public class PerformWrapper extends ActionGroup {
     }
 
     /**
-     * Creates a new, empty, perform wrapper for the specified server or
-     * network. Note that both server and network must be specified, and
-     * exactly one of them must be empty.
+     * Creates a new, empty, perform wrapper for the specified server or network. Note that both
+     * server and network must be specified, and exactly one of them must be empty.
      *
-     * @param server The server to create the action for
+     * @param server  The server to create the action for
      * @param network The network to create the action for
      * @param profile The profile the action is for (or null if "global")
+     *
      * @since 0.6.3
      * @return The new perform wrapper action
      */
@@ -231,7 +235,8 @@ public class PerformWrapper extends ActionGroup {
 
         if (profile != null) {
             conditions.add(new ActionCondition(0,
-                    new ActionComponentChain(Connection.class, PP_COMP_NAME, ActionManager.getActionManager()),
+                    new ActionComponentChain(Connection.class, PP_COMP_NAME, ActionManager.
+                    getActionManager()),
                     CoreActionComparison.STRING_EQUALS, profile));
         }
 
@@ -243,13 +248,14 @@ public class PerformWrapper extends ActionGroup {
     }
 
     /**
-     * Retrieve an action with a condition that checks the specified component,
-     * and matches it against the specified target.
+     * Retrieve an action with a condition that checks the specified component, and matches it
+     * against the specified target.
      *
      * @param component The action component to look for
-     * @param target The string the component is matched against
-     * @param profile The name of the profile that the action must target, or
-     * null for a non-profile specific action
+     * @param target    The string the component is matched against
+     * @param profile   The name of the profile that the action must target, or null for a
+     *                  non-profile specific action
+     *
      * @since 0.6.3
      * @return The matching action if one exists, or null
      */
@@ -310,8 +316,8 @@ public class PerformWrapper extends ActionGroup {
         /**
          * 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 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,
@@ -328,7 +334,7 @@ public class PerformWrapper extends ActionGroup {
         /**
          * Creates a new perform description with the specified arguments.
          *
-         * @param type The type of the perform in question
+         * @param type   The type of the perform in question
          * @param target The target of the perform
          */
         public PerformDescription(final PerformType type, final String target) {

src/com/dmdirc/commandline/CommandLineOptionsModule.java

@@ -40,6 +40,7 @@ public class CommandLineOptionsModule {
      * Enumeration of directory types supported by the client.
      */
     public enum DirectoryType {
+
         /** The base directory, where everything else lives. */
         BASE,
         /** The directory that identities are stored in. */
@@ -50,23 +51,27 @@ public class CommandLineOptionsModule {
         THEMES,
         /** The directory that actions are stored in. */
         ACTIONS,
-        /** The directory to use for temporary files (downloads in flight, caches, etc). */
+        /** The
+         * directory to use for temporary files (downloads in flight, caches, etc). */
         TEMPORARY;
+
     }
 
     /**
-     * Provides a mean of identifying the type of directory a class wants
-     * injected.
+     * Provides a mean of identifying the type of directory a class wants injected.
      */
     @Qualifier
     public @interface Directory {
+
         DirectoryType value();
+
     }
 
     /**
      * Provides the base directory that all DMDirc user data is stored in.
      *
      * @param parser The parser to get the user-supplied directory from.
+     *
      * @return The base directory.
      */
     @Provides
@@ -84,6 +89,7 @@ public class CommandLineOptionsModule {
      * Provides the path to the plugins directory.
      *
      * @param baseDirectory The base DMDirc directory.
+     *
      * @return The plugin directory.
      */
     @Provides
@@ -97,6 +103,7 @@ public class CommandLineOptionsModule {
      * Provides the path to the actions directory.
      *
      * @param baseDirectory The base DMDirc directory.
+     *
      * @return The actions directory.
      */
     @Provides
@@ -110,6 +117,7 @@ public class CommandLineOptionsModule {
      * Provides the path to the identities directory.
      *
      * @param baseDirectory The base DMDirc directory.
+     *
      * @return The identities directory.
      */
     @Provides
@@ -123,6 +131,7 @@ public class CommandLineOptionsModule {
      * Provides the path to the themes directory.
      *
      * @param baseDirectory The base DMDirc directory.
+     *
      * @return The themes directory.
      */
     @Provides
@@ -139,6 +148,7 @@ public class CommandLineOptionsModule {
      * explicitly.
      *
      * @param baseDirectory The base DMDirc directory.
+     *
      * @return The temporary directory.
      */
     @Provides

src/com/dmdirc/commandline/CommandLineParser.java

@@ -48,9 +48,8 @@ import javax.inject.Singleton;
 public class CommandLineParser {
 
     /**
-     * The arguments that the client supports, in groups of four, in the
-     * following order: short option, long option, description, whether or not
-     * the option takes an argument.
+     * The arguments that the client supports, in groups of four, in the following order: short
+     * option, long option, description, whether or not the option takes an argument.
      */
     private static final Object[][] ARGUMENTS = new Object[][]{
         {'c', "connect", "Connect to the specified server", Boolean.TRUE},
@@ -61,30 +60,21 @@ public class CommandLineParser {
         {'p', "portable", "Enable portable mode", Boolean.FALSE},
         {'r', "disable-reporting", "Disable automatic error reporting", Boolean.FALSE},
         {'v', "version", "Display client version and exit", Boolean.FALSE},
-        {'k', "check", "Check if an existing instance of DMDirc exists.", Boolean.FALSE},
-    };
-
+        {'k', "check", "Check if an existing instance of DMDirc exists.", Boolean.FALSE},};
     /** A list of addresses to autoconnect to. */
     private final List<URI> addresses = new ArrayList<>();
-
     /** Provider to use to get server managers. */
     private final Provider<ServerManager> serverManagerProvider;
-
     /** Provider to use to get the global config. */
     private final Provider<AggregateConfigProvider> globalConfigProvider;
-
     /** Whether to disable error reporting or not. */
     private boolean disablereporting;
-
     /** The version string passed for the launcher. */
     private String launcherVersion;
-
     /** The configuration directory. */
     private String configDirectory;
-
     /** The RMI server we're using. */
     private RemoteInterface server;
-
     /** The parser to use for URIs. */
     private final URIParser uriParser;
 
@@ -92,8 +82,8 @@ public class CommandLineParser {
      * Creates a new instance of CommandLineParser.
      *
      * @param serverManagerProvider Provider to use to get server managers.
-     * @param globalConfigProvider Provider to use to get the global config.
-     * @param uriParser The parser to use for URIs.
+     * @param globalConfigProvider  Provider to use to get the global config.
+     * @param uriParser             The parser to use for URIs.
      */
     @Inject
     public CommandLineParser(
@@ -110,7 +100,7 @@ public class CommandLineParser {
      *
      * @param arguments The arguments to be parsed
      */
-    public void parse(final String ... arguments) {
+    public void parse(final String... arguments) {
         boolean inArg = false;
         char previousArg = '.';
 
@@ -149,11 +139,11 @@ public class CommandLineParser {
     }
 
     /**
-     * Checks whether the specified arg type takes an argument. If it does,
-     * this method returns true. If it doesn't, the method processes the
-     * argument and returns false.
+     * Checks whether the specified arg type takes an argument. If it does, this method returns
+     * true. If it doesn't, the method processes the argument and returns false.
      *
      * @param argument The short code of the argument
+     *
      * @return True if the arg requires an argument, false otherwise
      */
     private boolean checkArgument(final char argument) {
@@ -179,6 +169,7 @@ public class CommandLineParser {
      * Processes the specified string as a single long argument.
      *
      * @param arg The string entered
+     *
      * @return The short form of the corresponding argument
      */
     private char processLongArg(final String arg) {
@@ -198,6 +189,7 @@ public class CommandLineParser {
      * Processes the specified string as a single short argument.
      *
      * @param arg The string entered
+     *
      * @return The short form of the corresponding argument
      */
     private char processShortArg(final String arg) {
@@ -216,7 +208,7 @@ public class CommandLineParser {
     /**
      * Processes the specified command-line argument.
      *
-     * @param arg The short form of the argument used
+     * @param arg   The short form of the argument used
      * @param param The (optional) string parameter for the option
      */
     private void processArgument(final char arg, final String param) {
@@ -258,8 +250,7 @@ public class CommandLineParser {
     }
 
     /**
-     * Informs the user that they entered an unknown argument, prints the
-     * client help, and exits.
+     * Informs the user that they entered an unknown argument, prints the client help, and exits.
      *
      * @param message The message about the unknown argument to be displayed
      */
@@ -379,8 +370,7 @@ public class CommandLineParser {
     /**
      * Returns the user-supplied configuration directory.
      *
-     * @return The user-supplied config directory, or {@code null} if none
-     * was supplied.
+     * @return The user-supplied config directory, or {@code null} if none was supplied.
      */
     public String getConfigDirectory() {
         return configDirectory;
@@ -398,21 +388,20 @@ public class CommandLineParser {
     /**
      * Returns the provided launcher version, if any.
      *
-     * @return The version supplied by the launcher, or {@code null} if no
-     * launcher is identified.
+     * @return The version supplied by the launcher, or {@code null} if no launcher is identified.
      */
     public String getLauncherVersion() {
         return launcherVersion;
     }
 
     /**
-     * Processes arguments once the client has been loaded properly.
-     * This allows us to auto-connect to servers, etc.
+     * Processes arguments once the client has been loaded properly. This allows us to auto-connect
+     * to servers, etc.
      *
      * @param serverManager The server manager to use to connect servers.
      */
     public void processArguments(final ServerManager serverManager) {
-        for (URI address : addresses)  {
+        for (URI address : addresses) {
             serverManager.connectToAddress(address);
         }
     }

src/com/dmdirc/commandline/RemoteInterface.java

@@ -36,6 +36,7 @@ public interface RemoteInterface extends Remote {
      * Connects to the specified list of addresses.
      *
      * @param addresses The addresses to connect to.
+     *
      * @throws java.rmi.RemoteException on problems communicating
      * @since 0.6.3
      */

src/com/dmdirc/commandline/RemoteServer.java

@@ -66,8 +66,7 @@ public class RemoteServer implements RemoteInterface {
     }
 
     /**
-     * Binds to the RMI registry so that other clients may find this remote
-     * server.
+     * Binds to the RMI registry so that other clients may find this remote server.
      */
     public void bind() {
         RemoteInterface stub;
@@ -91,9 +90,8 @@ public class RemoteServer implements RemoteInterface {
     }
 
     /**
-     * Retrieves a reference to an existing RemoteServer, if there is one.
-     * Note that this must be called before bind(), unless you want a reference
-     * to our own client for some reason.
+     * Retrieves a reference to an existing RemoteServer, if there is one. Note that this must be
+     * called before bind(), unless you want a reference to our own client for some reason.
      *
      * @return The RemoteServer instance, or null if none was available
      */

src/com/dmdirc/commandparser/BaseCommandInfo.java

@@ -23,17 +23,15 @@
 package com.dmdirc.commandparser;
 
 /**
- * A basic {@link CommandInfo} implementation whose parameters can be
- * configured via the constructor.
+ * A basic {@link CommandInfo} implementation whose parameters can be configured via the
+ * constructor.
  */
 public class BaseCommandInfo implements CommandInfo {
 
     /** The name of the command. */
     private final String name;
-
     /** The help text for this command. */
     private final String help;
-
     /** The type of the command. */
     private final CommandType type;
 

src/com/dmdirc/commandparser/CommandArguments.java

@@ -33,10 +33,9 @@ import java.util.regex.Pattern;
 import static com.google.common.base.Preconditions.checkPositionIndex;
 
 /**
- * Represents a command and its arguments. In this class, input is split into
- * 'words' which are separated by any number of whitespace characters;
- * 'arguments' are the same but exclude the first word, which will normally be
- * the command name.
+ * Represents a command and its arguments. In this class, input is split into 'words' which are
+ * separated by any number of whitespace characters; 'arguments' are the same but exclude the first
+ * word, which will normally be the command name.
  *
  * @since 0.6.3m1
  */
@@ -44,19 +43,18 @@ public class CommandArguments {
 
     /** The raw line that was input. */
     private final String line;
-
     /** The line split into whitespace-delimited words. */
     private String[] words;
-
     /** Command controller to consult for command chars, etc. */
     private final CommandController controller;
 
     /**
      * Creates a new command arguments parser for the specified line.
      *
-     * @param controller The command controller to consult for information
-     * about command characters, etc.
-     * @param line The line to be parsed
+     * @param controller The command controller to consult for information about command characters,
+     *                   etc.
+     * @param line       The line to be parsed
+     *
      * @since 0.6.7
      */
     public CommandArguments(final CommandController controller, final String line) {
@@ -67,9 +65,10 @@ public class CommandArguments {
     /**
      * Creates a new command arguments parser for the specified words.
      *
-     * @param controller The command controller to consult for information
-     * about command characters, etc.
-     * @param words The words which form the line ot be parsed
+     * @param controller The command controller to consult for information about command characters,
+     *                   etc.
+     * @param words      The words which form the line ot be parsed
+     *
      * @since 0.6.7
      */
     public CommandArguments(final CommandController controller, final Collection<String> words) {
@@ -90,8 +89,7 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the raw line that was input, including any command character(s)
-     * and names.
+     * Retrieves the raw line that was input, including any command character(s) and names.
      *
      * @return The raw line entered
      */
@@ -100,8 +98,8 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the raw line that was input, including the command name but
-     * stripped of any command characters.
+     * Retrieves the raw line that was input, including the command name but stripped of any command
+     * characters.
      *
      * @return The raw line entered, without command chars
      */
@@ -112,9 +110,8 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the input split into distinct, whitespace-separated words. The
-     * first item in the array will be the command name complete with any
-     * command characters.
+     * Retrieves the input split into distinct, whitespace-separated words. The first item in the
+     * array will be the command name complete with any command characters.
      *
      * @return An array of 'words' that make up the input
      */
@@ -125,8 +122,7 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the arguments to the command split into disticnt,
-     * whitespace-separated words.
+     * Retrieves the arguments to the command split into disticnt, whitespace-separated words.
      *
      * @return An array of 'words' that make up the command's arguments
      */
@@ -137,8 +133,8 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves all the arguments to the command (i.e., not including the
-     * command name) with their original whitespace separation preserved.
+     * Retrieves all the arguments to the command (i.e., not including the command name) with their
+     * original whitespace separation preserved.
      *
      * @return A String representation of the command arguments
      */
@@ -147,11 +143,11 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves arguments to the command (i.e., not including the
-     * command name) starting with the specified argument, with their original
-     * whitespace separation preserved.
+     * Retrieves arguments to the command (i.e., not including the command name) starting with the
+     * specified argument, with their original whitespace separation preserved.
      *
      * @param start The index of the first argument to include
+     *
      * @return A String representation of the command arguments
      */
     public String getArgumentsAsString(final int start) {
@@ -161,12 +157,12 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves arguments to the command (i.e., not including the
-     * command name) starting with the specified argument, with their original
-     * whitespace separation preserved.
+     * Retrieves arguments to the command (i.e., not including the command name) starting with the
+     * specified argument, with their original whitespace separation preserved.
      *
      * @param start The index of the first argument to include
-     * @param end The index of the last argument to include
+     * @param end   The index of the last argument to include
+     *
      * @return A String representation of the command arguments
      */
     public String getArgumentsAsString(final int start, final int end) {
@@ -174,10 +170,10 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the specified words with their original whitespace separation
-     * preserved.
+     * Retrieves the specified words with their original whitespace separation preserved.
      *
      * @param start The index of the first word to include (starting at 0)
+     *
      * @return A String representation of the requested words
      */
     public String getWordsAsString(final int start) {
@@ -187,11 +183,11 @@ public class CommandArguments {
     }
 
     /**
-     * Retrieves the specified words with their original whitespace separation
-     * preserved.
+     * Retrieves the specified words with their original whitespace separation preserved.
      *
      * @param start The index of the first word to include (starting at 0)
-     * @param end The index of the last word to include
+     * @param end   The index of the last word to include
+     *
      * @return A String representation of the requested words
      */
     @Precondition("Start index is less than or equal to end index")

src/com/dmdirc/commandparser/CommandInfo.java

@@ -37,14 +37,14 @@ public interface CommandInfo {
     /**
      * Returns a string representing the help message for this command.
      * <p>
-     * The help text should generally be one line, and must start with
-     * the name of the command. It should then summarise the arguments of
-     * that command, using <code>&lt;angled&gt;</code> brackets for required
-     * arguments, and <code>[square]</code> brackets for optional arguments.
-     * Where multiple possibilities exist, they are typically separated by a
-     * pipe (<code>|</code>), for example: <code>command [--arg1|--arg2]</code>.
-     * The usage summary should then be followed by a dash and a brief
-     * summary of the purpose of the command.
+     * The help text should generally be one line, and must start with the name of the command. It
+     * should then summarise the arguments of that command, using
+     * <code>&lt;angled&gt;</code> brackets for required arguments, and
+     * <code>[square]</code> brackets for optional arguments. Where multiple possibilities exist,
+     * they are typically separated by a pipe (
+     * <code>|</code>), for example:
+     * <code>command [--arg1|--arg2]</code>. The usage summary should then be followed by a dash and
+     * a brief summary of the purpose of the command.
      * <p>
      * A typical help message would look similar to:
      * <p>

src/com/dmdirc/commandparser/CommandInfoPair.java

@@ -25,8 +25,7 @@ package com.dmdirc.commandparser;
 import com.dmdirc.commandparser.commands.Command;
 
 /**
- * A combination of a {@link Command} and the {@link CommandInfo} which
- * triggered it.
+ * A combination of a {@link Command} and the {@link CommandInfo} which triggered it.
  *
  * @since 0.6.4
  */
@@ -34,7 +33,6 @@ public class CommandInfoPair {
 
     /** The command info which caused the command to be triggered. */
     private final CommandInfo commandInfo;
-
     /** The command in question. */
     private final Command command;
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -40,24 +40,20 @@ import java.util.List;
 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.
+ * 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.
  */
 public class CommandManager implements CommandController {
 
     /** A list of commands that have been instantiated. */
     private final Map<CommandInfo, Command> commands = new HashMap<>();
-
     /** A list of command parsers that have been instantiated. */
     private final MapList<CommandType, CommandParser> parsers = new MapList<>();
-
     /** The manager to use to iterate servers. */
     private final ServerManager serverManager;
-
     /** The command char we're using. */
     @ConfigBinding(domain = "general", key = "commandchar")
     private char commandChar;
-
     /** The silence char we're using. */
     @ConfigBinding(domain = "general", key = "silencechar")
     private char silenceChar;
@@ -105,10 +101,10 @@ public class CommandManager implements CommandController {
     /**
      * Registers or unregisters a command.
      *
-     * @param info The information about the command
-     * @param command The command to be (un)registered
-     * @param register True if the command should be registered, false if it
-     * should be unregistered.
+     * @param info     The information about the command
+     * @param command  The command to be (un)registered
+     * @param register True if the command should be registered, false if it should be unregistered.
+     *
      * @since 0.6.3m1
      */
     private void registerCommand(final CommandInfo info, final Command command,
@@ -129,10 +125,11 @@ public class CommandManager implements CommandController {
     /**
      * Registers or unregisters the specified command with all of the specified parsers.
      *
-     * @param info The command information object
-     * @param command The command to be registered
+     * @param info      The command information object
+     * @param command   The command to be registered
      * @param myParsers The parsers to register the command with
-     * @param register Whether to register or unregister the commands
+     * @param register  Whether to register or unregister the commands
+     *
      * @since 0.6.3m1
      */
     private void registerCommand(final CommandInfo info, final Command command,
@@ -147,12 +144,11 @@ public class CommandManager implements CommandController {
     }
 
     /**
-     * Registers or unregisters the specified command's name with the relevant
-     * tab completers.
+     * Registers or unregisters the specified command's name with the relevant tab completers.
+     *
+     * @param command  The command to be registered
+     * @param register True if the command should be registered, false if it should be unregistered.
      *
-     * @param command The command to be registered
-     * @param register True if the command should be registered, false if it
-     * should be unregistered.
      * @since 0.6.3m1
      */
     private void registerCommandName(final CommandInfo command,
@@ -186,19 +182,18 @@ public class CommandManager implements CommandController {
     }
 
     /**
-     * Registers or unregisters the specified command with the specified tab-
-     * completer.
+     * Registers or unregisters the specified command with the specified tab- completer.
      *
      * @param completer The tab completer to be used
-     * @param name The command name to be registered
-     * @param register True if the command should be registered, false if it
-     * should be unregistered.
+     * @param name      The command name to be registered
+     * @param register  True if the command should be registered, false if it should be
+     *                  unregistered.
      */
     private void registerCommandName(final TabCompleter completer,
             final String name, final boolean register) {
         if (register) {
             completer.addEntry(TabCompletionType.COMMAND, name);
-        }  else {
+        } else {
             completer.removeEntry(TabCompletionType.COMMAND, name);
         }
     }
@@ -206,7 +201,7 @@ public class CommandManager implements CommandController {
     /** {@inheritDoc} */
     @Override
     public void loadCommands(final CommandParser parser,
-            final CommandType ... supertypes) {
+            final CommandType... supertypes) {
         for (CommandType supertype : supertypes) {
             for (CommandType type : supertype.getComponentTypes()) {
                 for (Map.Entry<CommandInfo, Command> pair : getCommands(type, null).entrySet()) {
@@ -259,12 +254,13 @@ public class CommandManager implements CommandController {
     }
 
     /**
-     * Retrieves a map of all commands of the specified type, with the
-     * specified name.
+     * Retrieves a map of all commands of the specified type, with the specified name.
      *
      * @param type The type of command to list, or null for all types
      * @param name The name of the command to look for, or null for any name
+     *
      * @return A map of {@link CommandInfo}s and their associated {@link Command}.
+     *
      * @since 0.6.3m1
      */
     private Map<CommandInfo, Command> getCommands(final CommandType type,

src/com/dmdirc/commandparser/CommandType.java

@@ -29,9 +29,11 @@ public enum CommandType {
 
     /** A global command, which may be executed anywhere. */
     TYPE_GLOBAL,
-    /** A server command, which only makes sense in the context of a connection. */
+    /** A server command, which only makes sense in the context of a
+     * connection. */
     TYPE_SERVER,
-    /** A chat command, which needs a MessageTarget to make sense. */
+    /** A chat command, which needs a MessageTarget to make
+     * sense. */
     TYPE_CHAT,
     /** A channel command. */
     TYPE_CHANNEL,
@@ -39,11 +41,10 @@ public enum CommandType {
     TYPE_QUERY;
 
     /**
-     * Retrieves an array of component types that make up this command type.
-     * Generally this will only contain the type itself, but some commands may
-     * be registered in multiple queues (such as CHANNEL commands going into
-     * both CHAT and CHANNEL queues). Note that for obvious reasons there is
-     * no recursion done on the values returned here.
+     * Retrieves an array of component types that make up this command type. Generally this will
+     * only contain the type itself, but some commands may be registered in multiple queues (such as
+     * CHANNEL commands going into both CHAT and CHANNEL queues). Note that for obvious reasons
+     * there is no recursion done on the values returned here.
      *
      * @since 0.6.3m1
      * @return An array of types which this type should be registered as.
@@ -74,4 +75,5 @@ public enum CommandType {
                 return "Unknown";
         }
     }
+
 }

src/com/dmdirc/commandparser/PopupManager.java

@@ -48,11 +48,12 @@ public class PopupManager {
     }
 
     /**
-     * Returns the popup menu that should be used for the specified type.
-     * Configuration data is read from the specified config manager.
+     * Returns the popup menu that should be used for the specified type. Configuration data is read
+     * from the specified config manager.
      *
-     * @param menuType The type of the menu that is needed
+     * @param menuType      The type of the menu that is needed
      * @param configManager The config manager to be used for the menu
+     *
      * @return The PopupMenu that should be displayed
      */
     public PopupMenu getMenu(final PopupType menuType, final AggregateConfigProvider configManager) {
@@ -68,9 +69,10 @@ public class PopupManager {
     /**
      * Retrieves the menu with the specified name.
      *
-     * @param menuName The name of the menu to read
-     * @param type The type of the menu that is needed
+     * @param menuName      The name of the menu to read
+     * @param type          The type of the menu that is needed
      * @param configManager The config manager to be used for the menu
+     *
      * @return The PopupMenu with the specified name
      */
     private PopupMenu getMenu(final String menuName,
@@ -91,9 +93,10 @@ public class PopupManager {
     /**
      * Creates a PopupMenuItem for the specified item.
      *
-     * @param item The item to be turned into a PopupMenuItem
-     * @param type The type of popup item to create
+     * @param item          The item to be turned into a PopupMenuItem
+     * @param type          The type of popup item to create
      * @param configManager The config manager to beused for the menu
+     *
      * @return The corresponding PopupMenuItem
      */
     private PopupMenuItem getItem(final String item,

src/com/dmdirc/commandparser/PopupMenuItem.java

@@ -56,7 +56,7 @@ public class PopupMenuItem {
      * Creates a new PopupMenuItem that is used as a submenu.
      *
      * @param manager The command manager to use to retrieve command information
-     * @param name The name of the menu item
+     * @param name    The name of the menu item
      * @param submenu The submenu of this item
      */
     public PopupMenuItem(final CommandController manager, final String name, final PopupMenu submenu) {
@@ -69,11 +69,12 @@ public class PopupMenuItem {
      * Creates a new PopupMenuItem that executes a command.
      *
      * @param manager The command manager to use to retrieve command information
-     * @param name The name of the menu item
-     * @param arity The arity of the command this item will execute
+     * @param name    The name of the menu item
+     * @param arity   The arity of the command this item will execute
      * @param command The command to be executed
      */
-    public PopupMenuItem(final CommandController manager, final String name, final int arity, final String command) {
+    public PopupMenuItem(final CommandController manager, final String name, final int arity,
+            final String command) {
         this.name = name;
         this.arity = arity;
         this.command = command;
@@ -117,12 +118,12 @@ public class PopupMenuItem {
     }
 
     /**
-     * Retrieves the command for this menu item, with the specified arguments
-     * substituted in. Note that the result may actually consist of multiple
-     * commands on separate lines.
+     * Retrieves the command for this menu item, with the specified arguments substituted in. Note
+     * that the result may actually consist of multiple commands on separate lines.
+     *
+     * @param arguments A two dimensional array containing one array of arguments for each subject
+     *                  of the command.
      *
-     * @param arguments A two dimensional array containing one array of
-     * arguments for each subject of the command.
      * @return The command to be passed to a command parser
      */
     public String getCommand(final Object[][] arguments) {

src/com/dmdirc/commandparser/PopupType.java

@@ -23,8 +23,7 @@
 package com.dmdirc.commandparser;
 
 /**
- * An enumeration of the types of popup menu which are supported by the
- * PopupManager.
+ * An enumeration of the types of popup menu which are supported by the PopupManager.
  */
 public enum PopupType {
 
@@ -34,84 +33,72 @@ public enum PopupType {
      * Expected arguments: none.
      */
     CHAN_NORMAL(0),
-
     /**
      * The menu that appears when right clicking in a nickname in a channel window.
      *
      * Expected arguments: the nickname of the user who was clicked on.
      */
     CHAN_NICK(1),
-
     /**
      * The menu that appears when right clicking in a channel in a channel window.
      *
      * Expected arguments: the nickname of the user who was clicked on.
      */
     CHAN_CHANNEL(1),
-
     /**
      * The menu that appears when right clicking in a hyperlink in a channel window.
      *
      * Expected arguments: the hyperlink clicked.
      */
     CHAN_HYPERLINK(1),
-
     /**
      * The menu that appears when right clicking in a query window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_NORMAL(1),
-
     /**
      * The menu that appears when right clicking in a nickname in a query window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_NICK(1),
-
     /**
      * The menu that appears when right clicking in a channel in a query window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     QUERY_CHANNEL(1),
-
     /**
      * The menu that appears when right clicking in a hyperlink in a query window.
      *
      * Expected arguments: the hyperlink clicked.
      */
     QUERY_HYPERLINK(1),
-
     /**
      * The menu that appears when right clicking in a server window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_NORMAL(1),
-
     /**
      * The menu that appears when right clicking in a nickname in a server window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_NICK(1),
-
     /**
      * The menu that appears when right clicking in a channel in a server window.
      *
      * Expected arguments: the nickname of the user who the query is with.
      */
     SERVER_CHANNEL(1),
-
     /**
      * The menu that appears when right clicking in a hyperlink in a server window.
      *
      * Expected arguments: the hyperlink clicked.
      */
     SERVER_HYPERLINK(1);
-
     /** The arity (number of expected arguments) of the type. */
     private final int arity;
 

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

@@ -35,10 +35,8 @@ public abstract class Command {
 
     /** The format name used for command output. */
     protected static final String FORMAT_OUTPUT = "commandOutput";
-
     /** The format name used for command errors. */
     protected static final String FORMAT_ERROR = "commandError";
-
     /** The controller this command is associated with. */
     private final CommandController controller;
 
@@ -52,13 +50,14 @@ public abstract class Command {
 
     /**
      * Sends a line, if appropriate, to the specified target.
-     * @param target The command window to send the line to
+     *
+     * @param target   The command window to send the line to
      * @param isSilent Whether this command is being silenced or not
-     * @param type The type of message to send
-     * @param args The arguments of the message
+     * @param type     The type of message to send
+     * @param args     The arguments of the message
      */
     protected final void sendLine(final FrameContainer target,
-            final boolean isSilent, final String type, final Object ... args) {
+            final boolean isSilent, final String type, final Object... args) {
         if (!isSilent && target != null) {
             target.addLine(type, args);
         }
@@ -67,10 +66,10 @@ public abstract class Command {
     /**
      * Sends a usage line, if appropriate, to the specified target.
      *
-     * @param target The command window to send the line to
+     * @param target   The command window to send the line to
      * @param isSilent Whether this command is being silenced or not
-     * @param name The name of the command that's raising the error
-     * @param args The arguments that the command accepts or expects
+     * @param name     The name of the command that's raising the error
+     * @param args     The arguments that the command accepts or expects
      */
     protected final void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
@@ -80,12 +79,12 @@ public abstract class Command {
     }
 
     /**
-     * Formats the specified data into a table suitable for output in the
-     * textpane. It is expected that each String[] in data has the same number
-     * of elements as the headers array.
+     * Formats the specified data into a table suitable for output in the textpane. It is expected
+     * that each String[] in data has the same number of elements as the headers array.
      *
      * @param headers The headers of the table.
-     * @param data The contents of the table.
+     * @param data    The contents of the table.
+     *
      * @return A string containing an ASCII table
      */
     protected static String doTable(final String[] headers, final String[][] data) {
@@ -118,12 +117,11 @@ public abstract class Command {
     }
 
     /**
-     * Adds the specified data to the stringbuilder, padding with spaces to
-     * the specified size.
+     * Adds the specified data to the stringbuilder, padding with spaces to the specified size.
      *
      * @param builder The stringbuilder to append data to
-     * @param data The data to be added
-     * @param size The minimum size that should be used
+     * @param data    The data to be added
+     * @param size    The minimum size that should be used
      */
     private static void doPadding(final StringBuilder builder, final String data,
             final int size) {
@@ -137,9 +135,10 @@ public abstract class Command {
     /**
      * Executes this command.
      *
-     * @param origin The container which received the command
-     * @param args Arguments passed to this command
+     * @param origin  The container which received the command
+     * @param args    Arguments passed to this command
      * @param context The context the command was executed in
+     *
      * @since 0.6.4
      */
     public abstract void execute(FrameContainer origin,

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

@@ -85,6 +85,7 @@ public class CommandModule {
      * Provides the /me command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -96,6 +97,7 @@ public class CommandModule {
      * Provides the /ban command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -107,6 +109,7 @@ public class CommandModule {
      * Provides the /cycle command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -118,6 +121,7 @@ public class CommandModule {
      * Provides the /invite command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -129,6 +133,7 @@ public class CommandModule {
      * Provides the /kick command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -140,6 +145,7 @@ public class CommandModule {
      * Provides the /mode command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -151,6 +157,7 @@ public class CommandModule {
      * Provides the /names command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -162,6 +169,7 @@ public class CommandModule {
      * Provides the /part command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -173,6 +181,7 @@ public class CommandModule {
      * Provides the /setnickcolour command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -184,6 +193,7 @@ public class CommandModule {
      * Provides the /topic command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -195,6 +205,7 @@ public class CommandModule {
      * Provides the /allchannels command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -206,6 +217,7 @@ public class CommandModule {
      * Provides the /away command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -217,6 +229,7 @@ public class CommandModule {
      * Provides the /back command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -228,6 +241,7 @@ public class CommandModule {
      * Provides the /server command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -239,6 +253,7 @@ public class CommandModule {
      * Provides the /ctcp command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -250,6 +265,7 @@ public class CommandModule {
      * Provides the /disconnect command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -261,6 +277,7 @@ public class CommandModule {
      * Provides the /ignore command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -272,6 +289,7 @@ public class CommandModule {
      * Provides the /join command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -283,6 +301,7 @@ public class CommandModule {
      * Provides the /msg command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -294,6 +313,7 @@ public class CommandModule {
      * Provides the /nick command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -305,6 +325,7 @@ public class CommandModule {
      * Provides the /notice command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -316,6 +337,7 @@ public class CommandModule {
      * Provides the /query command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -327,6 +349,7 @@ public class CommandModule {
      * Provides the /raw command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -338,6 +361,7 @@ public class CommandModule {
      * Provides the /reconnect command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -349,6 +373,7 @@ public class CommandModule {
      * Provides the /umode command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -360,12 +385,13 @@ public class CommandModule {
      * Provides a set of raw commands.
      *
      * @param controller The controller to use for command info.
+     *
      * @return A set of the commands' details.
      */
     @Provides(type = Provides.Type.SET_VALUES)
     public Set<CommandDetails> getRawCommands(final CommandController controller) {
         final Set<CommandDetails> results = new HashSet<>();
-        for (String name : new String[] { "lusers", "map", "motd", "oper", "whois", "who" }) {
+        for (String name : new String[]{"lusers", "map", "motd", "oper", "whois", "who"}) {
             final RawServerCommand rawCommand = new RawServerCommand(controller, name);
             results.add(new SimpleCommandDetails(rawCommand, rawCommand));
         }
@@ -376,6 +402,7 @@ public class CommandModule {
      * Provides the /alias command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -387,6 +414,7 @@ public class CommandModule {
      * Provides the /allservers command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -398,6 +426,7 @@ public class CommandModule {
      * Provides the /clear command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -409,6 +438,7 @@ public class CommandModule {
      * Provides the /echo command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -420,6 +450,7 @@ public class CommandModule {
      * Provides the /exit command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -431,6 +462,7 @@ public class CommandModule {
      * Provides the /Help command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -442,6 +474,7 @@ public class CommandModule {
      * Provides the /ifplugin command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -453,6 +486,7 @@ public class CommandModule {
      * Provides the /newserver command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -464,6 +498,7 @@ public class CommandModule {
      * Provides the /notify command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -475,6 +510,7 @@ public class CommandModule {
      * Provides the /loadplugin command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -486,6 +522,7 @@ public class CommandModule {
      * Provides the /unloadplugin command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -497,6 +534,7 @@ public class CommandModule {
      * Provides the /openwindow command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -508,6 +546,7 @@ public class CommandModule {
      * Provides the /reloadactions command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -519,6 +558,7 @@ public class CommandModule {
      * Provides the /reloadidentities command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -530,6 +570,7 @@ public class CommandModule {
      * Provides the /reloadplugin command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -541,6 +582,7 @@ public class CommandModule {
      * Provides the /saveconfig command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -552,6 +594,7 @@ public class CommandModule {
      * Provides the /set command.
      *
      * @param command The instantiated command.
+     *
      * @return The command's details.
      */
     @Provides(type = Provides.Type.SET)
@@ -578,10 +621,8 @@ public class CommandModule {
         public CommandInfo getInfo() {
             return info;
         }
-
         /** The command. */
         private final Command command;
-
         /** The command's info. */
         private final CommandInfo info;
 

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.FrameContainer;
@@ -26,19 +27,19 @@ import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 
 /**
- * An external command is a channel command that can be executed from outside
- * of the channel.
+ * An external command is a channel command that can be executed from outside of the channel.
  */
 public interface ExternalCommand {
 
     /**
      * Executes the command externally.
      *
-     * @param origin The window in which the command was typed
-     * @param server The server instance that this command is being executed on
-     * @param channel The name of the channel the command is being executed for
+     * @param origin   The window in which the command was typed
+     * @param server   The server instance that this command is being executed on
+     * @param channel  The name of the channel the command is being executed for
      * @param isSilent Whether this command is silenced or not
-     * @param args Arguments passed to this command
+     * @param args     Arguments passed to this command
+     *
      * @since 0.6.3m1
      */
     void execute(FrameContainer origin, Server server, String channel,

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

@@ -28,18 +28,19 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 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.
+ * Intelligent commands implement a method that provides a list of possible options for them, for
+ * use (for example) by table completers.
  */
 public interface IntelligentCommand {
 
     /**
-     * Returns a list of suggestions for the specified argument, given the
-     * specified context.
+     * Returns a list of suggestions for the specified argument, given the specified context.
      *
-     * @param arg The argument that is being completed
+     * @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);
@@ -70,15 +71,13 @@ public interface IntelligentCommand {
         public String getPartial() {
             return partial;
         }
-
         /** The window the command is being entered in. */
         private final WritableFrameContainer window;
-
         /** The previously supplied arguments, if any. */
         private final List<String> previousArgs;
-
         /** The partially typed word, if any. */
         private final String partial;
 
     }
+
 }

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

@@ -32,7 +32,6 @@ public final class PreviousCommand {
 
     /** The full command that was executed. */
     private final String line;
-
     /** The timestamp of its execution. */
     private final long time = new Date().getTime();
 

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.WritableFrameContainer;
@@ -26,17 +27,19 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.util.validators.ValidationResponse;
 
 /**
- * Validating commands are capable of validating their arguments to determine
- * whether the input would be valid or not.
+ * Validating commands are capable of validating their arguments to determine whether the input
+ * would be valid or not.
  */
 public interface ValidatingCommand {
 
     /**
      * Validates the specified arguments.
      *
-     * @param origin The window the command is being executed in
+     * @param origin    The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
+     *
      * @return A validation response indicating the validity of the arguments
+     *
      * @since 0.6.3m1
      */
     ValidationResponse validateArguments(WritableFrameContainer origin,

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

@@ -26,18 +26,18 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 
 /**
- * Wrapping commands are commands whose arguments may be wrapped into multiple
- * lines when sending.
+ * Wrapping commands are commands whose arguments may be wrapped into multiple lines when sending.
  */
 public interface WrappableCommand {
 
     /**
-     * Determines the number of lines that the specified arguments will be
-     * wrapped as.
+     * Determines the number of lines that the specified arguments will be wrapped as.
      *
-     * @param origin The window the command is being executed in
+     * @param origin    The window the command is being executed in
      * @param arguments The arguments that the user has entered (so far)
+     *
      * @return The number of lines that the arguments will result in
+     *
      * @since 0.6.3m1
      */
     int getLineCount(WritableFrameContainer origin, CommandArguments arguments);

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

@@ -93,4 +93,5 @@ public class Ban extends Command implements IntelligentCommand {
 
         return res;
     }
+
 }

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

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

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

@@ -39,7 +39,7 @@ import javax.inject.Inject;
 /**
  * The part command parts the current channel with a specified part message.
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public class Part extends Command {
 
     /** A command info object for this command. */

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

@@ -52,14 +52,13 @@ public class SetNickColour extends Command implements IntelligentCommand {
             "setnickcolour [--nicklist|--text] <nick> [colour] - "
             + "set the specified person's display colour",
             CommandType.TYPE_CHANNEL);
-
     /** Manager to use to convert colours. */
     private final ColourManager colourManager;
 
     /**
      * Creates a new instance of the {@link SetNickColour} command.
      *
-     * @param controller The command controller that owns this command.
+     * @param controller    The command controller that owns this command.
      * @param colourManager The colour manager to use to convert colours.
      */
     @Inject
@@ -89,7 +88,8 @@ public class SetNickColour extends Command implements IntelligentCommand {
         }
 
         if (args.getArguments().length <= offset) {
-            showUsage(origin, args.isSilent(), "setnickcolour", "[--nicklist|--text] <nick> [colour]");
+            showUsage(origin, args.isSilent(), "setnickcolour",
+                    "[--nicklist|--text] <nick> [colour]");
             return;
         }
 
@@ -112,7 +112,8 @@ public class SetNickColour extends Command implements IntelligentCommand {
             channel.refreshClients();
         } else {
             // We're setting the colour
-            final Colour newColour = colourManager.getColourFromString(args.getArguments()[offset], null);
+            final Colour newColour = colourManager.getColourFromString(args.getArguments()[offset],
+                    null);
             if (newColour == null) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "Invalid colour specified.");
                 return;

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

@@ -42,7 +42,7 @@ import javax.inject.Inject;
 /**
  * The show topic command shows the user the current topic.
  */
-@CommandOptions(allowOffline=false)
+@CommandOptions(allowOffline = false)
 public class ShowTopic extends Command implements ExternalCommand {
 
     /** A command info object for this command. */
@@ -71,7 +71,8 @@ public class ShowTopic extends Command implements ExternalCommand {
             if (cChannel.getTopic().isEmpty()) {
                 sendLine(origin, args.isSilent(), "channelNoTopic", cChannel);
             } else {
-                final String[] parts = channel.getConnection().parseHostmask(cChannel.getTopicSetter());
+                final String[] parts = channel.getConnection().parseHostmask(cChannel.
+                        getTopicSetter());
 
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered",
                         "", parts[0], parts[1], parts[2], cChannel.getTopic(),
@@ -89,7 +90,8 @@ public class ShowTopic extends Command implements ExternalCommand {
         if (args.getArguments().length == 0) {
             server.getParser().sendRawMessage("TOPIC " + channel);
         } else {
-            server.getParser().sendRawMessage("TOPIC " + channel + " :" + args.getArgumentsAsString());
+            server.getParser().sendRawMessage("TOPIC " + channel + " :" + args.
+                    getArgumentsAsString());
         }
     }
 

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

@@ -90,4 +90,5 @@ public class Me extends Command implements ValidatingCommand {
             return new ValidationResponse();
         }
     }
+
 }

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

@@ -39,10 +39,9 @@ public class ChannelCommandContext extends ChatCommandContext {
     /**
      * Creates a new channel command context.
      *
-     * @param source The source of the command
-     * @param commandInfo The command info object which associated the command
-     * with the input
-     * @param channel The channel associated with the command
+     * @param source      The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param channel     The channel associated with the command
      */
     public ChannelCommandContext(final FrameContainer source,
             final CommandInfo commandInfo, final Channel channel) {

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

@@ -40,9 +40,9 @@ public class ChatCommandContext extends ServerCommandContext {
     /**
      * Creates a new chat command context.
      *
-     * @param source The source of the command
+     * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
-     * @param chat The chat container associated with the command
+     * @param chat        The chat container associated with the command
      */
     public ChatCommandContext(final FrameContainer source,
             final CommandInfo commandInfo, final MessageTarget chat) {
@@ -58,4 +58,5 @@ public class ChatCommandContext extends ServerCommandContext {
     public MessageTarget getChat() {
         return chat;
     }
+
 }

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

@@ -34,14 +34,13 @@ public class CommandContext {
 
     /** The command info object which associated the command with the input. */
     protected final CommandInfo commandInfo;
-
     /** The source of this command. */
     protected final FrameContainer source;
 
     /**
      * Creates a new command context.
      *
-     * @param source The source of the command
+     * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
      */
     public CommandContext(final FrameContainer source, final CommandInfo commandInfo) {
@@ -50,8 +49,8 @@ public class CommandContext {
     }
 
     /**
-     * Retrieves the command information object which caused the command to
-     * be selected in response to the user's input.
+     * Retrieves the command information object which caused the command to be selected in response
+     * to the user's input.
      *
      * @return The relevant command info object
      */

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

@@ -39,10 +39,9 @@ public class QueryCommandContext extends ChatCommandContext {
     /**
      * Creates a new query command context.
      *
-     * @param source The source of the command
-     * @param commandInfo The command info object which associated the command
-     * with the input
-     * @param query The query associated with the command
+     * @param source      The source of the command
+     * @param commandInfo The command info object which associated the command with the input
+     * @param query       The query associated with the command
      */
     public QueryCommandContext(final FrameContainer source,
             final CommandInfo commandInfo, final Query query) {

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

@@ -39,9 +39,9 @@ public class ServerCommandContext extends CommandContext {
     /**
      * Creates a new server command context.
      *
-     * @param source The source of the command
+     * @param source      The source of the command
      * @param commandInfo The command info object which associated the command with the input
-     * @param server The server associated with the command
+     * @param server      The server associated with the command
      */
     public ServerCommandContext(final FrameContainer source, final CommandInfo commandInfo,
             final Server server) {

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

@@ -29,11 +29,10 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * Describes a flag that may be used in a command. Each flag may be enabled
- * or disabled initially, can specify a number of immediate arguments (which
- * must follow the flag directly), a number of delayed arguments (which
- * are specified after any other flags), and a list of other flags that
- * the use of this one causes to be enabled or disabled.
+ * Describes a flag that may be used in a command. Each flag may be enabled or disabled initially,
+ * can specify a number of immediate arguments (which must follow the flag directly), a number of
+ * delayed arguments (which are specified after any other flags), and a list of other flags that the
+ * use of this one causes to be enabled or disabled.
  *
  * @since 0.6.5
  * @see CommandFlagHandler
@@ -65,7 +64,7 @@ public class CommandFlag {
     /**
      * Creates a new flag with the specified name and no arguments.
      *
-     * @param name The name of this flag
+     * @param name    The name of this flag
      * @param enabled Whether or not this flag is initially enabled
      */
     public CommandFlag(final String name, final boolean enabled) {
@@ -73,14 +72,13 @@ public class CommandFlag {
     }
 
     /**
-     * Creates a new flag with the specified name and the specified number
-     * of arguments. Flags may only use immediate OR delayed arguments, not
-     * both.
+     * Creates a new flag with the specified name and the specified number of arguments. Flags may
+     * only use immediate OR delayed arguments, not both.
      *
-     * @param name The name of this flag
-     * @param enabled Whether or not this flag is initially enabled
+     * @param name          The name of this flag
+     * @param enabled       Whether or not this flag is initially enabled
      * @param immediateArgs The number of immediate arguments
-     * @param delayedArgs The number of delayed arguments
+     * @param delayedArgs   The number of delayed arguments
      */
     public CommandFlag(final String name, final boolean enabled,
             final int immediateArgs, final int delayedArgs) {
@@ -95,22 +93,20 @@ public class CommandFlag {
     }
 
     /**
-     * Indicates that the specified flags will be enabled if this flag
-     * is used.
+     * Indicates that the specified flags will be enabled if this flag is used.
      *
      * @param enabled The flags which will be enabled
      */
-    public void addEnabled(final CommandFlag ... enabled) {
+    public void addEnabled(final CommandFlag... enabled) {
         this.enables.addAll(Arrays.asList(enabled));
     }
 
     /**
-     * Indicates that the specified flags will be disabled if this flag
-     * is used.
+     * Indicates that the specified flags will be disabled if this flag is used.
      *
      * @param disabled The flags which will be disabled
      */
-    public void addDisabled(final CommandFlag ... disabled) {
+    public void addDisabled(final CommandFlag... disabled) {
         this.disables.addAll(Arrays.asList(disabled));
     }
 

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

@@ -32,8 +32,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Utility class for commands which allow the user to specify shell-like
- * flags (<code>--foo</code>).
+ * Utility class for commands which allow the user to specify shell-like flags (
+ * <code>--foo</code>).
  *
  * @since 0.6.5
  */
@@ -49,27 +49,27 @@ public class CommandFlagHandler {
     private final Map<String, CommandFlag> disabledBy = new HashMap<>();
 
     /**
-     * Creates a new command flag handler which will handle all of the specified
-     * flags.
+     * Creates a new command flag handler which will handle all of the specified flags.
      *
      * @param flags The flags that will be handled
      */
-    public CommandFlagHandler(final CommandFlag ... flags) {
+    public CommandFlagHandler(final CommandFlag... flags) {
         for (CommandFlag flag : flags) {
             this.flags.put(flag.getName(), flag);
         }
     }
 
     /**
-     * Processes the specified arguments and parses out command flags. If
-     * the specified arguments aren't valid given the flags belonging to
-     * this command flag handler, an error message is sent to the origin and
+     * Processes the specified arguments and parses out command flags. If the specified arguments
+     * aren't valid given the flags belonging to this command flag handler, an error message is sent
+     * to the origin and
      * <code>null</code> is returned from this method.
      *
-     * @param origin The container where the command was entered
+     * @param origin    The container where the command was entered
      * @param arguments The arguments passed to the command
-     * @return A corresponding {@link CommandFlagResult} object, or null
-     * if some problem was encountered.
+     *
+     * @return A corresponding {@link CommandFlagResult} object, or null if some problem was
+     *         encountered.
      */
     public CommandFlagResult process(final FrameContainer origin,
             final CommandArguments arguments) {
@@ -79,14 +79,14 @@ public class CommandFlagHandler {
     }
 
     /**
-     * Parses the specified arguments and returns the offsets of the arguments
-     * for each found command flag.
+     * Parses the specified arguments and returns the offsets of the arguments for each found
+     * command flag.
      *
-     * @param origin The container where the command was entered
+     * @param origin    The container where the command was entered
      * @param arguments The arguments passed to the command
-     * @return A map of discovered command flags to the offset of the flag's
-     * first argument within the <code>arguments</code> object. If an error
-     * occurs, null is returned.
+     *
+     * @return A map of discovered command flags to the offset of the flag's first argument within
+     *         the <code>arguments</code> object. If an error occurs, null is returned.
      */
     protected Map<CommandFlag, Integer> parse(final FrameContainer origin,
             final CommandArguments arguments) {
@@ -160,14 +160,15 @@ public class CommandFlagHandler {
     /**
      * Reads the arguments for the specified flag.
      *
-     * @param flag The flag that is being read
+     * @param flag      The flag that is being read
      * @param arguments The raw arguments for the command
-     * @param offset The index that the first argument will be at
-     * @param argCount The number of arguments that need to be read
-     * @param origin The source of the command (for error messages)
-     * @param results The map to place results into
-     * @return The index of the last argument that was handled, or -1 if
-     * there were insufficient arguments for the flag
+     * @param offset    The index that the first argument will be at
+     * @param argCount  The number of arguments that need to be read
+     * @param origin    The source of the command (for error messages)
+     * @param results   The map to place results into
+     *
+     * @return The index of the last argument that was handled, or -1 if there were insufficient
+     *         arguments for the flag
      */
     protected int readArguments(final CommandFlag flag,
             final CommandArguments arguments, final int offset, final int argCount,
@@ -188,8 +189,8 @@ public class CommandFlagHandler {
     }
 
     /**
-     * Processes the enabled and disabled lists for the specified flag, and
-     * adds them to the relevant properties.
+     * Processes the enabled and disabled lists for the specified flag, and adds them to the
+     * relevant properties.
      *
      * @param flag The flag whose enables/disables lists should be processed
      */
@@ -212,13 +213,13 @@ public class CommandFlagHandler {
     }
 
     /**
-     * Constructs a user-friendly string describing the flag(s) which must
-     * be used in order to enable the specified flag. This is useful for
-     * error messages when the user tries to use a disabled flag.
+     * Constructs a user-friendly string describing the flag(s) which must be used in order to
+     * enable the specified flag. This is useful for error messages when the user tries to use a
+     * disabled flag.
      *
      * @param flag The flag to find enablers for
-     * @return A user-friendly string describing flags which enable the
-     * specified flag.
+     *
+     * @return A user-friendly string describing flags which enable the specified flag.
      */
     protected String getEnablers(final CommandFlag flag) {
         final List<CommandFlag> enablers = new LinkedList<>();
@@ -246,15 +247,16 @@ public class CommandFlagHandler {
     /**
      * Convenience method to send a line to the specified frame container.
      *
-     * @param origin The container to send the line to
-     * @param isSilent Whether the command is silenced or not
+     * @param origin      The container to send the line to
+     * @param isSilent    Whether the command is silenced or not
      * @param messageType The type of the line to be sent
-     * @param args The arguments for the specified messageType
+     * @param args        The arguments for the specified messageType
      */
     protected static void sendLine(final FrameContainer origin, final boolean isSilent,
-            final String messageType, final Object ... args) {
+            final String messageType, final Object... args) {
         if (origin != null && !isSilent) {
             origin.addLine(messageType, args);
         }
     }
+
 }

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

@@ -27,14 +27,12 @@ import com.dmdirc.commandparser.CommandArguments;
 import java.util.Map;
 
 /**
- * Convenient wrapper around the results of a {@link CommandFlagHandler}'s
- * parsing routines.
+ * Convenient wrapper around the results of a {@link CommandFlagHandler}'s parsing routines.
  */
 public class CommandFlagResult {
 
     /** The original arguments for the command. */
     private final CommandArguments arguments;
-
     /** The offsets of the first argument for each flag. */
     private final Map<CommandFlag, Integer> offsets;
 
@@ -42,7 +40,7 @@ public class CommandFlagResult {
      * Creates a new CommandFlagResult with the specified results.
      *
      * @param arguments The original arguments for the command
-     * @param offsets The offsets for each flag's arguments
+     * @param offsets   The offsets for each flag's arguments
      */
     public CommandFlagResult(final CommandArguments arguments,
             final Map<CommandFlag, Integer> offsets) {
@@ -51,10 +49,10 @@ public class CommandFlagResult {
     }
 
     /**
-     * Determines if the specified command flag has been used when the command
-     * was executed.
+     * Determines if the specified command flag has been used when the command was executed.
      *
      * @param flag The flag to be checked
+     *
      * @return True iff the flag was specified legally, false otherwise
      */
     public boolean hasFlag(final CommandFlag flag) {
@@ -65,7 +63,9 @@ public class CommandFlagResult {
      * Retrieves all of the arguments passed for the specified flag as a string.
      *
      * @param flag The flag to retrieve arguments for
+     *
      * @return The arguments passed with the specified flag
+     *
      * @see #getArguments(com.dmdirc.commandparser.commands.flags.CommandFlag)
      */
     public String getArgumentsAsString(final CommandFlag flag) {
@@ -87,13 +87,14 @@ public class CommandFlagResult {
     }
 
     /**
-     * Retrieves a subset of the arguments not associated with any flags,
-     * starting at the specified offset.
+     * Retrieves a subset of the arguments not associated with any flags, starting at the specified
+     * offset.
      *
      * @see CommandArguments#getArgumentsAsString(int)
      * @param offset The offset of the argument to start at
-     * @return All arguments that aren't associated with a flag, as a string,
-     * starting with the argument at the specified offset
+     *
+     * @return All arguments that aren't associated with a flag, as a string, starting with the
+     *         argument at the specified offset
      */
     public String getArgumentsAsString(final int offset) {
         return arguments.getArgumentsAsString(offsets.get(null) + offset);
@@ -103,7 +104,9 @@ public class CommandFlagResult {
      * Retrieves the arguments passed with the specified flag as an array.
      *
      * @param flag The flag to be checked
+     *
      * @return The arguments passed with the specified flag
+     *
      * @see #getArgumentsAsString(com.dmdirc.commandparser.commands.flags.CommandFlag)
      */
     public String[] getArguments(final CommandFlag flag) {

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

@@ -50,19 +50,17 @@ public class AliasCommand extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("alias",
             "alias [--remove] <name> [command] - creates or removes the specified alias",
             CommandType.TYPE_GLOBAL);
-
     /** Factory to use when creating aliases. */
     private final ActionFactory actionFactory;
-
     /** Wrapper to use to modify aliases. */
     private final AliasWrapper aliasWrapper;
 
     /**
      * Creates a new instance of {@link AliasCommand}.
      *
-     * @param controller The controller that owns this command.
+     * @param controller    The controller that owns this command.
      * @param actionFactory The factory to use when creating new aliases.
-     * @param aliasWrapper The wrapper to use to modify aliases.
+     * @param aliasWrapper  The wrapper to use to modify aliases.
      */
     @Inject
     public AliasCommand(
@@ -84,8 +82,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
         }
 
         if (args.getArguments()[0].equalsIgnoreCase("--remove")) {
-            final String name
-                    = args.getArguments()[1].charAt(0)
+            final String name = args.getArguments()[1].charAt(0)
                     == getController().getCommandChar()
                     ? args.getArguments()[1].substring(1) : args.getArguments()[1];
 
@@ -124,6 +121,7 @@ public class AliasCommand extends Command implements IntelligentCommand {
      * Removes the alias with the specified name.
      *
      * @param name The name of the alias to remove
+     *
      * @return True if the alias was deleted, false otherwise
      */
     private boolean doRemove(final String name) {

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

@@ -47,14 +47,13 @@ public class AllServers extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("allservers",
             "allservers <command> - executes the command as though it had"
             + " been entered on all servers", CommandType.TYPE_GLOBAL);
-
     /** Server manager to use to iterate servers. */
     private final ServerManager serverManager;
 
     /**
      * Creates a new instance of the {@link AllServers} command.
      *
-     * @param controller The controller that owns this command.
+     * @param controller    The controller that owns this command.
      * @param serverManager The server manager to use to iterate servers.
      */
     @Inject

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

@@ -55,7 +55,6 @@ public class Echo extends Command implements IntelligentCommand {
             "echo [--ts <timestamp>] [--target <window>] <line> "
             + "- echos the specified line to the window",
             CommandType.TYPE_GLOBAL);
-
     /** The flag used to specify a timestamp for the echo command. */
     private final CommandFlag timeStampFlag = new CommandFlag("ts", true, 1, 0);
     /** The flag used to specify a target for the echo command. */
@@ -68,7 +67,7 @@ public class Echo extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of Echo.
      *
-     * @param controller Command controller
+     * @param controller    Command controller
      * @param windowManager Window management
      */
     @Inject

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

@@ -35,9 +35,8 @@ import com.dmdirc.interfaces.LifecycleController;
 import javax.inject.Inject;
 
 /**
- * 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.
+ * 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.
  */
 public class Exit extends Command {
 
@@ -45,14 +44,13 @@ public class Exit extends Command {
     public static final CommandInfo INFO = new BaseCommandInfo("exit",
             "exit [reason] - exits the client",
             CommandType.TYPE_GLOBAL);
-
     /** The controller to use to quit the app. */
     private final LifecycleController controller;
 
     /**
      * Creates a new instance of the {@link Exit} command.
      *
-     * @param controller Command controller
+     * @param controller          Command controller
      * @param lifecycleController The controller to use to quit the app.
      */
     @Inject

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

@@ -44,9 +44,9 @@ import java.util.Map;
 import javax.inject.Inject;
 
 /**
- * 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.
+ * 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.
  */
 public class Help extends Command implements IntelligentCommand {
 
@@ -79,7 +79,7 @@ public class Help extends Command implements IntelligentCommand {
     /**
      * Shows a list of all commands valid for the current window.
      *
-     * @param origin The window the command was executed in
+     * @param origin   The window the command was executed in
      * @param isSilent Whether this command has been silenced or not
      */
     private void showAllCommands(final FrameContainer origin, final boolean isSilent) {
@@ -115,9 +115,9 @@ public class Help extends Command implements IntelligentCommand {
     /**
      * Shows information about the specified command.
      *
-     * @param origin The window the command was executed in
+     * @param origin   The window the command was executed in
      * @param isSilent Whether this command has been silenced or not
-     * @param name The name of the command to display info for
+     * @param name     The name of the command to display info for
      */
     private void showCommand(final FrameContainer origin, final boolean isSilent,
             final String name) {

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

@@ -42,8 +42,8 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 /**
- * The if plugin command allows the user to execute commands based on whether
- * or not a plugin is loaded.
+ * The if plugin command allows the user to execute commands based on whether or not a plugin is
+ * loaded.
  */
 public class Ifplugin extends Command implements IntelligentCommand {
 
@@ -52,18 +52,16 @@ public class Ifplugin extends Command implements IntelligentCommand {
             "ifplugin <[!]plugin> <command> - executes a command if the "
             + "specified plugin is/isn't loaded",
             CommandType.TYPE_GLOBAL);
-
     /** The plugin manager to use to query plugins. */
     private final PluginManager pluginManager;
-
     /** Provider of global command parsers. */
     private final Provider<GlobalCommandParser> globalCommandParserProvider;
 
     /**
      * Creates a new instance of the {@link Ifplugin} command.
      *
-     * @param controller The controller to use for command information.
-     * @param pluginManager The plugin manager to use to query plugins.
+     * @param controller                  The controller to use for command information.
+     * @param pluginManager               The plugin manager to use to query plugins.
      * @param globalCommandParserProvider Provider to use to retrieve a global command parser.
      */
     @Inject

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

@@ -47,14 +47,13 @@ public class LoadPlugin extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("loadplugin",
             "loadplugin <plugin> - loads the specified class as a plugin",
             CommandType.TYPE_GLOBAL);
-
     /** The plugin manager to use to load plugins. */
     private final PluginManager pluginManager;
 
     /**
      * Creates a new instance of the {@link LoadPlugin} command.
      *
-     * @param controller The controller to use for command information.
+     * @param controller    The controller to use for command information.
      * @param pluginManager The plugin manager to load plugins with.
      */
     @Inject

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

@@ -58,28 +58,23 @@ public class NewServer extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("newserver",
             "newserver <host[:[+]port]> [password] - connect to a new server",
             CommandType.TYPE_GLOBAL);
-
     /** The factory to use to construct servers. */
     private final ServerFactory serverFactory;
-
     /** Plugin manager to query for available services. */
     private final PluginManager pluginManager;
-
     /** Identity controller to use to find profiles. */
     private final IdentityController identityController;
-
     /** The parser to use for user input. */
     private final URIParser uriParser;
 
     /**
-     * Creates a new newserver command which will use the specified factory
-     * to construct servers.
+     * Creates a new newserver command which will use the specified factory to construct servers.
      *
-     * @param controller The controller to use for command information.
-     * @param serverFactory The factory to use to construct servers.
-     * @param pluginManager The plugin manager to use to query available services.
+     * @param controller         The controller to use for command information.
+     * @param serverFactory      The factory to use to construct servers.
+     * @param pluginManager      The plugin manager to use to query available services.
      * @param identityController Identity controller to use to find profiles.
-     * @param uriParser The parser to use for user input.
+     * @param uriParser          The parser to use for user input.
      */
     @Inject
     public NewServer(
@@ -120,11 +115,13 @@ public class NewServer extends Command implements IntelligentCommand {
     }
 
     /**
-     * Get a URI from the given string.
-     * This method allows for +port in the uri (eg irc://server.host:+6668/)
+     * Get a URI from the given string. This method allows for +port in the uri (eg
+     * irc://server.host:+6668/)
      *
      * @param address Address to parse
+     *
      * @return URI from address.
+     *
      * @throws URISyntaxException If the string is not parseable.
      * @deprecated Use a {@link URIParser}.
      */
@@ -144,14 +141,16 @@ public class NewServer extends Command implements IntelligentCommand {
                 int newPort = -1;
                 try {
                     newPort = Integer.parseInt(m.group(2));
-                } catch (final NumberFormatException nfe) { }
+                } catch (final NumberFormatException nfe) {
+                }
 
                 // Add 's' to scheme if not already there.
                 String scheme = uri.getScheme();
                 if (scheme.charAt(scheme.length() - 1) != 's') {
                     scheme += "s";
                 }
-                return new URI(scheme, uri.getUserInfo(), uri.getHost(), newPort, uri.getPath(), uri.getQuery(), uri.getFragment());
+                return new URI(scheme, uri.getUserInfo(), uri.getHost(), newPort, uri.getPath(),
+                        uri.getQuery(), uri.getFragment());
             }
         }
 
@@ -168,10 +167,11 @@ public class NewServer extends Command implements IntelligentCommand {
 
         if (arg == 0) {
             for (Service parserType : pluginManager.getServicesByType("parser")) {
-                res.add(parserType.getName()+"://");
+                res.add(parserType.getName() + "://");
             }
         }
         res.excludeAll();
         return res;
     }
+
 }