Autoformat all the plugins.

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

src/com/dmdirc/addons/activewindow/ActiveCommand.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.addons.activewindow;
 
 import com.dmdirc.FrameContainer;
@@ -47,7 +48,6 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("active",
             "active <command> - executes the command as though it had been "
             + "executed in the active window", CommandType.TYPE_GLOBAL);
-
     /** Parent MainFrame. */
     private final MainFrame mainFrame;
 
@@ -55,7 +55,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
      * Creates a new active command.
      *
      * @param controller The controller to use for command information.
-     * @param mainFrame Parent MainFrame
+     * @param mainFrame  Parent MainFrame
      */
     @Inject
     public ActiveCommand(final CommandController controller, final MainFrame mainFrame) {
@@ -82,4 +82,5 @@ public class ActiveCommand extends Command implements IntelligentCommand {
             final IntelligentCommandContext context) {
         return TabCompleter.getIntelligentResults(arg, context, 0);
     }
+
 }

src/com/dmdirc/addons/activewindow/ActiveWindowManager.java

@@ -33,7 +33,6 @@ public class ActiveWindowManager {
 
     /** The message sink to register and unregister. */
     private final ActiveWindowMessageSink sink;
-
     /** The manager to add and remove the sink from. */
     private final MessageSinkManager sinkManager;
 
@@ -41,7 +40,7 @@ public class ActiveWindowManager {
      * Creates a new instance of {@link ActiveWindowManager}.
      *
      * @param sinkManager The manager to add and remove sinks from.
-     * @param sink The sink to be added and removed.
+     * @param sink        The sink to be added and removed.
      */
     @Inject
     public ActiveWindowManager(

src/com/dmdirc/addons/activewindow/ActiveWindowMessageSink.java

@@ -40,7 +40,6 @@ public class ActiveWindowMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */
     private static final Pattern PATTERN = Pattern.compile("active");
-
     /** The main frame to use to get the currently active frame. */
     private final MainFrame mainFrame;
 

src/com/dmdirc/addons/activewindow/ActiveWindowModule.java

@@ -29,7 +29,6 @@ import dagger.Module;
 /**
  * DI module for the active window plugin.
  */
-@Module(injects={ActiveWindowManager.class, ActiveCommand.class}, addsTo = SwingModule.class)
+@Module(injects = {ActiveWindowManager.class, ActiveCommand.class}, addsTo = SwingModule.class)
 public class ActiveWindowModule {
-
 }

src/com/dmdirc/addons/audio/AudioPlayer.java

@@ -44,7 +44,6 @@ public final class AudioPlayer implements Runnable {
         WAV, INVALID;
 
     }
-
     /** The file object of the file to play */
     final File myFile;
 
@@ -83,6 +82,7 @@ public final class AudioPlayer implements Runnable {
      * Check if this File is a supported file type
      *
      * @param file the File to check
+     *
      * @return true if playable, else false.
      */
     public static boolean isValid(final File file) {
@@ -94,6 +94,7 @@ public final class AudioPlayer implements Runnable {
      * Get the AudioType of a given file
      *
      * @param file the File to check
+     *
      * @return AudioType for this file.
      */
     public static AudioType getAudioType(final File file) {
@@ -108,9 +109,8 @@ public final class AudioPlayer implements Runnable {
     }
 
     /**
-     * Play the file as a wav file, using the Applet class.
-     * (This code seems to work better than the non-applet version, but can't play
-     * streams)
+     * Play the file as a wav file, using the Applet class. (This code seems to work better than the
+     * non-applet version, but can't play streams)
      */
     private void playWav() {
         try {

src/com/dmdirc/addons/audio/AudioPluginModule.java

@@ -31,5 +31,4 @@ import dagger.Module;
  */
 @Module(injects = {AudioCommand.class, BeepCommand.class}, addsTo = ClientModule.class)
 public class AudioPluginModule {
-
 }

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -36,15 +36,15 @@ import java.text.ParseException;
 import javax.inject.Inject;
 
 /**
- * A command which allows users to evaluate various mathematical expressions,
- * and perform basic calculations.
+ * A command which allows users to evaluate various mathematical expressions, and perform basic
+ * calculations.
  */
 public class CalcCommand extends Command {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("calc",
             "calc [--showexpr] <expr> - evaluate mathematical expression",
-            CommandType.TYPE_GLOBAL) ;
+            CommandType.TYPE_GLOBAL);
 
     /**
      * Creates a new instance of this command.

src/com/dmdirc/addons/calc/CalcModule.java

@@ -29,7 +29,6 @@ import dagger.Module;
 /**
  * DI Module for the calc plugin.
  */
-@Module(injects={CalcCommand.class}, addsTo = ClientModule.class)
+@Module(injects = {CalcCommand.class}, addsTo = ClientModule.class)
 public class CalcModule {
-
 }

src/com/dmdirc/addons/calc/CalcPlugin.java

@@ -39,4 +39,5 @@ public class CalcPlugin extends BaseCommandPlugin {
         setObjectGraph(graph.plus(new CalcModule()));
         registerCommand(CalcCommand.class, CalcCommand.INFO);
     }
+
 }

src/com/dmdirc/addons/calc/Evaluator.java

@@ -23,8 +23,7 @@
 package com.dmdirc.addons.calc;
 
 /**
- * A simple evaluator which just requests that the {@link TreeToken} evaluates
- * itself.
+ * A simple evaluator which just requests that the {@link TreeToken} evaluates itself.
  */
 public class Evaluator {
 

src/com/dmdirc/addons/calc/Lexer.java

@@ -28,8 +28,8 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * The lexer takes a String input and produces an ordered list of {@link Token}s
- * corresponding to the input.
+ * The lexer takes a String input and produces an ordered list of {@link Token}s corresponding to
+ * the input.
  */
 public class Lexer {
 
@@ -49,6 +49,7 @@ public class Lexer {
      * Tokenises the input string into an ordered list of tokens.
      *
      * @return A list of tokens corresponding to the input string
+     *
      * @throws ParseException If an expected token is not found
      */
     public List<Token> tokenise() throws ParseException {

src/com/dmdirc/addons/calc/Parser.java

@@ -30,14 +30,13 @@ import java.util.Comparator;
 import java.util.List;
 
 /**
- * The parser takes the output from a {@link Lexer} and applies precdence rules
- * to build the tokens into a tree.
+ * The parser takes the output from a {@link Lexer} and applies precdence rules to build the tokens
+ * into a tree.
  */
 public class Parser {
 
     /** A list of token types sorted by their precendece. */
     protected static final List<TokenType> TOKENS_BY_PRECEDENCE;
-
     /** The lexer whose output will be parsed. */
     protected final Lexer lexer;
 
@@ -53,13 +52,14 @@ public class Parser {
     }
 
     /**
-     * Parses the output of this parser's lexer, and returns a {@link TreeToken}
-     * representing the parsed formula.
+     * Parses the output of this parser's lexer, and returns a {@link TreeToken} representing the
+     * parsed formula.
      *
      * @return A token tree corresponding to the lexer's token output
-     * @throws ParseException If the lexer encounters a parse error, or if an
-     * error occurs while parsing the lexer's output (such as a non-sensical
-     * formula such as one involving a mis-matched bracket).
+     *
+     * @throws ParseException If the lexer encounters a parse error, or if an error occurs while
+     *                        parsing the lexer's output (such as a non-sensical formula such as one
+     *                        involving a mis-matched bracket).
      */
     public TreeToken parse() throws ParseException {
         final List<TreeToken> tokens = new ArrayList<>();
@@ -75,7 +75,9 @@ public class Parser {
      * Parses the specified tokens into a tree.
      *
      * @param tokens The tokens to be parsed
+     *
      * @return A single tree containing all of the specified tokens
+     *
      * @throws ParseException If the tokens contain mismatched brackets
      */
     protected TreeToken parse(final List<TreeToken> tokens)
@@ -113,8 +115,8 @@ public class Parser {
      *
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
-     * @throws ParseException If the operator is a bracket and that bracket is
-     * mismatched
+     *
+     * @throws ParseException If the operator is a bracket and that bracket is mismatched
      */
     protected void parseNullaryOperator(final List<TreeToken> tokens,
             final int offset)
@@ -134,8 +136,8 @@ public class Parser {
      *
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
-     * @throws ParseException If the operator is a bracket and that bracket is
-     * mismatched
+     *
+     * @throws ParseException If the operator is a bracket and that bracket is mismatched
      */
     protected void parseBracket(final List<TreeToken> tokens, final int offset)
             throws ParseException {
@@ -189,8 +191,8 @@ public class Parser {
     }
 
     /**
-     * Parses an operator that does not actually correspond to a piece of the
-     * input (such as the START and END operators).
+     * Parses an operator that does not actually correspond to a piece of the input (such as the
+     * START and END operators).
      *
      * @param tokens The supply of tokens from which the operator will be parsed
      * @param offset The offset at which the operator occurs
@@ -211,11 +213,12 @@ public class Parser {
     }
 
     /**
-     * Retrieves the offset of the first token within the input list that has
-     * a type corresponding to the specified {@link TokenType}.
+     * Retrieves the offset of the first token within the input list that has a type corresponding
+     * to the specified {@link TokenType}.
      *
      * @param tokens The tokens to be searched
-     * @param type The desired token type
+     * @param type   The desired token type
+     *
      * @return The index of the first token with that type, or -1 if none found
      */
     protected static int findTokenType(final List<TreeToken> tokens,

src/com/dmdirc/addons/calc/Token.java

@@ -23,14 +23,12 @@
 package com.dmdirc.addons.calc;
 
 /**
- * Describes a distinct piece of a mathematical formula, as tokenised by a
- * {@link Lexer}.
+ * Describes a distinct piece of a mathematical formula, as tokenised by a {@link Lexer}.
  */
 public class Token {
 
     /** The type of this token. */
     private final TokenType type;
-
     /** The content of this token, if any. */
     private final String content;
 

src/com/dmdirc/addons/calc/TokenType.java

@@ -28,8 +28,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Describes the different types of possible token, their arities, precedence,
- * and the types of token that may follow them.
+ * Describes the different types of possible token, their arities, precedence, and the types of
+ * token that may follow them.
  */
 public enum TokenType {
 
@@ -37,35 +37,32 @@ public enum TokenType {
     START(TokenTypeArity.HIDDEN, "^", 0, "NUMBER_*", "BRACKET_OPEN", "MOD_*"),
     /** The end of an input string. */
     END(TokenTypeArity.HIDDEN, "$", 0),
-
     /** An opening bracket. */
     BRACKET_OPEN(TokenTypeArity.NULLARY, "\\(", 0, "NUMBER_*", "MOD_*",
-                "BRACKET_OPEN"),
+    "BRACKET_OPEN"),
     /** A closing bracket. */
     BRACKET_CLOSE(TokenTypeArity.NULLARY, "\\)", 50, "OP_*", "BRACKET_*",
-                "END"),
-
+    "END"),
     /** A floating point number. */
     NUMBER_FLOAT(TokenTypeArity.NULLARY, "[0-9]+\\.[0-9]+", 1, "OP_*",
-                "BRACKET_*", "END") {
+    "BRACKET_*", "END") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
             return Float.valueOf(token.getToken().getContent());
         }
     },
-
     /** An integer. */
     NUMBER_INT(TokenTypeArity.NULLARY, "[0-9]+", 1, "OP_*",
-                "BRACKET_*", "END") {
+    "BRACKET_*", "END") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
             return Float.valueOf(token.getToken().getContent());
         }
     },
-
-    /** A modifier signalling the following number is positive. */
+    /** A modifier signalling the
+     * following number is positive. */
     MOD_POSITIVE(TokenTypeArity.UNARY, "\\+", 100, "NUMBER_*") {
         /** {@inheritDoc} */
         @Override
@@ -73,8 +70,8 @@ public enum TokenType {
             return token.getChildren().get(0).evaluate();
         }
     },
-
-    /** A modifier signalling the following number is negative. */
+    /** A modifier signalling the
+     * following number is negative. */
     MOD_NEGATIVE(TokenTypeArity.UNARY, "-", 100, "NUMBER_*") {
         /** {@inheritDoc} */
         @Override
@@ -82,7 +79,6 @@ public enum TokenType {
             return -1 * token.getChildren().get(0).evaluate().floatValue();
         }
     },
-
     /** The addition operator. */
     OP_PLUS(TokenTypeArity.BINARY, "\\+", 7, "NUMBER_*", "BRACKET_OPEN") {
         /** {@inheritDoc} */
@@ -92,7 +88,6 @@ public enum TokenType {
                     + token.getChildren().get(1).evaluate().floatValue();
         }
     },
-
     /** The subtraction operator. */
     OP_MINUS(TokenTypeArity.BINARY, "-", 6, "NUMBER_*", "BRACKET_OPEN") {
         /** {@inheritDoc} */
@@ -102,10 +97,9 @@ public enum TokenType {
                     - token.getChildren().get(1).evaluate().floatValue();
         }
     },
-
     /** The multiplication operator. */
     OP_MULT(TokenTypeArity.BINARY, "(?=\\()|\\*", 9, "NUMBER_*",
-            "BRACKET_OPEN") {
+    "BRACKET_OPEN") {
         /** {@inheritDoc} */
         @Override
         public Number evaluate(final TreeToken token) {
@@ -113,7 +107,6 @@ public enum TokenType {
                     * token.getChildren().get(1).evaluate().floatValue();
         }
     },
-
     /** The division operator. */
     OP_DIVIDE(TokenTypeArity.BINARY, "/", 10, "NUMBER_*", "BRACKET_OPEN") {
         /** {@inheritDoc} */
@@ -123,7 +116,6 @@ public enum TokenType {
                     / token.getChildren().get(1).evaluate().floatValue();
         }
     },
-
     /** The modulo operator. */
     OP_MOD(TokenTypeArity.BINARY, "%", 8, "NUMBER_*", "BRACKET_OPEN") {
         /** {@inheritDoc} */
@@ -133,7 +125,6 @@ public enum TokenType {
                     % token.getChildren().get(1).evaluate().floatValue();
         }
     },
-
     /** The power operator. */
     OP_POWER(TokenTypeArity.BINARY, "\\^", 11, "NUMBER_*", "BRACKET_OPEN") {
         /** {@inheritDoc} */
@@ -144,7 +135,6 @@ public enum TokenType {
                     token.getChildren().get(1).evaluate().doubleValue()));
         }
     };
-
     /** The string representation of tokens that may follow this one. */
     private final String[] strfollows;
     /** The precedence of this token. */
@@ -159,13 +149,13 @@ public enum TokenType {
     /**
      * Creates a new token type with the specified arguments.
      *
-     * @param arity The arity of this token
-     * @param regex The regular expression used to match this token
+     * @param arity      The arity of this token
+     * @param regex      The regular expression used to match this token
      * @param precedence The precendence of this token
-     * @param follows The names of the tokens which may follow this one
+     * @param follows    The names of the tokens which may follow this one
      */
     TokenType(final TokenTypeArity arity, final String regex,
-            final int precedence, final String ... follows) {
+            final int precedence, final String... follows) {
         this.arity = arity;
         this.strfollows = follows;
         this.precedence = precedence;
@@ -198,13 +188,14 @@ public enum TokenType {
     }
 
     /**
-     * Attempts to match this token type against the specified input string
-     * (starting at the specified offset).
+     * Attempts to match this token type against the specified input string (starting at the
+     * specified offset).
      *
-     * @param input The string to be matched
+     * @param input  The string to be matched
      * @param offset The offset within the string to start at
-     * @return -1 if no match was made, otherwise the number of characters that
-     * were matched as part of this token type.
+     *
+     * @return -1 if no match was made, otherwise the number of characters that were matched as part
+     *         of this token type.
      */
     public int match(final String input, final int offset) {
         final Matcher matcher = regex.matcher(input);
@@ -219,6 +210,7 @@ public enum TokenType {
      * Evaluates the specified token of this token type into a number.
      *
      * @param token The token to be evaluated
+     *
      * @return A numerical representation of the specified token
      */
     public Number evaluate(final TreeToken token) {
@@ -226,10 +218,11 @@ public enum TokenType {
     }
 
     /**
-     * Retrieves a list of types which match the specified name. The name
-     * may end with an asterisk (*), which is treated as a wild card.
+     * Retrieves a list of types which match the specified name. The name may end with an asterisk
+     * (*), which is treated as a wild card.
      *
      * @param name The name to be searched for
+     *
      * @return A list of matching tokens
      */
     protected static List<TokenType> searchValueOf(final String name) {
@@ -244,4 +237,5 @@ public enum TokenType {
 
         return res;
     }
+
 }

src/com/dmdirc/addons/calc/TokenTypeArity.java

@@ -28,8 +28,8 @@ package com.dmdirc.addons.calc;
 public enum TokenTypeArity {
 
     /**
-     * A special type which does not have any operands and does not correspond
-     * to any input (e.g. the special START and END tokens).
+     * A special type which does not have any operands and does not correspond to any input (e.g.
+     * the special START and END tokens).
      */
     HIDDEN,
     /** A type which takes no operands. */

src/com/dmdirc/addons/calc/TreeToken.java

@@ -32,10 +32,8 @@ public class TreeToken {
 
     /** The children of this node. */
     private final List<TreeToken> children = new ArrayList<>();
-
     /** The token at the root of the tree. */
     private final Token token;
-
     /** Whether or not this tree has been processed. */
     private boolean processed = false;
 

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommand.java

@@ -37,15 +37,14 @@ import java.util.Map;
 import javax.inject.Inject;
 
 /**
- * The ConditionalExecute command allows the user to conditionally execute a
- * command based on external and pre-determined conditions.
+ * The ConditionalExecute command allows the user to conditionally execute a command based on
+ * external and pre-determined conditions.
  */
 public class ConditionalExecuteCommand extends Command {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("conditionalexecute",
             "conditionalexecute <args> - Conditionally execute a command", CommandType.TYPE_GLOBAL);
-
     /** Store details about current namespaces. */
     private final Map<String, ConditionalExecuteNamespace> namespaces = new HashMap<>();
 
@@ -61,7 +60,8 @@ public class ConditionalExecuteCommand extends Command {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final CommandArguments args, final CommandContext context) {
+    public void execute(final FrameContainer origin, final CommandArguments args,
+            final CommandContext context) {
         final String cmdname = args.getWordsAsString(0, 0);
 
         ConditionalExecuteNamespace namespace = null;
@@ -77,47 +77,72 @@ public class ConditionalExecuteCommand extends Command {
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Usage:");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, cmdname + " <args>");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, cmdname + " --namespace <name> <namespace commands>");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, cmdname + " --namespace <name> [--inverse] </commandToRun <command args>>");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, cmdname
+                        + " --namespace <name> <namespace commands>");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, cmdname
+                        + " --namespace <name> [--inverse] </commandToRun <command args>>");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Commands can only be specified if no other non-namespace args are given.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "Commands can only be specified if no other non-namespace args are given.");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "When trying to run a command, the namespace will be checked to see if the command can be run.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "The checks performed are as follows:");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   1) Does the namespace exist? if not, run the command and create the namespace.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   2) Is the namespace inhibited? - Do not run the command.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   3) Is the namespace in forced mode? - Run the command.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   4) If --inverse is specified, are we under the limit time? Run the command");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   5) If --inverse is not specified, are we over the limit time? Run the command");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "When trying to run a command, the namespace will be checked to see if the command can be run.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "The checks performed are as follows:");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "   1) Does the namespace exist? if not, run the command and create the namespace.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "   2) Is the namespace inhibited? - Do not run the command.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "   3) Is the namespace in forced mode? - Run the command.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "   4) If --inverse is specified, are we under the limit time? Run the command");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "   5) If --inverse is not specified, are we over the limit time? Run the command");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "   6) Do not run the command.");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "General Arguments.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --list                   - List all current namespaces and their status");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --help                   - Print this help.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --reset                  - Remove all namespaces.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --list                   - List all current namespaces and their status");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --help                   - Print this help.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --reset                  - Remove all namespaces.");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Useful things:");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --namespace <name>       - Namespace to modify. If the namespace does not exist, it will be created. Namespaces are not remembered across sessions.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --namespace <name>       - Namespace to modify. If the namespace does not exist, it will be created. Namespaces are not remembered across sessions.");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Arguments related to a namespace:");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --settime <time>         - Set the limit time on this namespace. Time can be either a time in seconds, 'now' for now, or 'nowifless' to set to now only if it is currently less.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --delay <seconds>        - Increase the 'limit' time on this namespace by <seconds> seconds");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --inhibit                - Prevent any attempts at running commands in this namespace from executing");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --force                  - Any future attempts at running commands in this namespace will always execute");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --allow                  - Disable '--force' or '--inhibit' and resume normal operation.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --remove                 - Remove this namespace.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --status                 - Show the status of this namespace.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --settime <time>         - Set the limit time on this namespace. Time can be either a time in seconds, 'now' for now, or 'nowifless' to set to now only if it is currently less.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --delay <seconds>        - Increase the 'limit' time on this namespace by <seconds> seconds");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --inhibit                - Prevent any attempts at running commands in this namespace from executing");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --force                  - Any future attempts at running commands in this namespace will always execute");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --allow                  - Disable '--force' or '--inhibit' and resume normal operation.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --remove                 - Remove this namespace.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --status                 - Show the status of this namespace.");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "");
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Arguments when running a command:");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "  --inverse              - Inverse the match against the 'limit' time.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                        "  --inverse              - Inverse the match against the 'limit' time.");
                 return;
             } else if (arg.equalsIgnoreCase("--list")) {
                 if (namespaces.isEmpty()) {
-                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "There are currently no known namespaces.");
+                    sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
+                            "There are currently no known namespaces.");
                 } else {
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Current namespaces: ");
-                    for (final Map.Entry<String, ConditionalExecuteNamespace> e : namespaces.entrySet()) {
-                        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "    " + e.getValue().toString());
+                    for (final Map.Entry<String, ConditionalExecuteNamespace> e : namespaces.
+                            entrySet()) {
+                        sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "    " + e.getValue().
+                                toString());
                     }
                 }
                 return;
@@ -128,11 +153,13 @@ public class ConditionalExecuteCommand extends Command {
             } else if (namespace == null) {
                 if (arg.equalsIgnoreCase("--namespace")) {
                     if (nextArg.isEmpty()) {
-                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: You must specify a namespace.");
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                                "Error: You must specify a namespace.");
                         return;
                     } else {
                         if (!namespaces.containsKey(nextArg.toLowerCase())) {
-                            namespaces.put(nextArg.toLowerCase(), new ConditionalExecuteNamespace(nextArg.toLowerCase()));
+                            namespaces.put(nextArg.toLowerCase(), new ConditionalExecuteNamespace(
+                                    nextArg.toLowerCase()));
                         }
                         namespace = namespaces.get(nextArg.toLowerCase());
 
@@ -140,7 +167,8 @@ public class ConditionalExecuteCommand extends Command {
                         i++;
                     }
                 } else {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: You must specify a namespace first.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                            "Error: You must specify a namespace first.");
                     return;
                 }
             } else if (arg.equalsIgnoreCase("--inhibit")) {
@@ -154,13 +182,14 @@ public class ConditionalExecuteCommand extends Command {
                 manipulated = true;
             } else if (arg.equalsIgnoreCase("--settime")) {
                 if (nextArg.isEmpty()) {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: You must provide a time to use.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                            "Error: You must provide a time to use.");
                     return;
                 } else if (nextArg.equalsIgnoreCase("now")) {
                     namespace.setLimit(System.currentTimeMillis());
                     i++;
                     manipulated = true;
-               } else if (nextArg.equalsIgnoreCase("nowifless")) {
+                } else if (nextArg.equalsIgnoreCase("nowifless")) {
                     if (namespace.getLimitTime() < System.currentTimeMillis()) {
                         namespace.setLimit(System.currentTimeMillis());
                     }
@@ -172,13 +201,15 @@ public class ConditionalExecuteCommand extends Command {
                         i++;
                         manipulated = true;
                     } catch (final NumberFormatException nfe) {
-                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: Invalid time: " + nextArg);
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: Invalid time: "
+                                + nextArg);
                         return;
                     }
                 }
             } else if (arg.equalsIgnoreCase("--delay")) {
                 if (nextArg.isEmpty()) {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: You must provide a delay to use.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                            "Error: You must provide a delay to use.");
                     return;
                 } else {
                     try {
@@ -186,13 +217,15 @@ public class ConditionalExecuteCommand extends Command {
                         i++;
                         manipulated = true;
                     } catch (final NumberFormatException nfe) {
-                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: Invalid delay: " + nextArg);
+                        sendLine(origin, args.isSilent(), FORMAT_ERROR, "Error: Invalid delay: "
+                                + nextArg);
                         return;
                     }
                 }
             } else if (arg.equalsIgnoreCase("--remove")) {
                 namespaces.remove(namespace.getName());
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed namespace '" + namespace.getName() + "'");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Removed namespace '" + namespace.
+                        getName() + "'");
                 return;
             } else if (arg.equalsIgnoreCase("--status")) {
                 // Show the current status, incase some manipulations occured prior to this.
@@ -201,11 +234,13 @@ public class ConditionalExecuteCommand extends Command {
             } else if (arg.equalsIgnoreCase("--inverse")) {
                 inverse = true;
             } else if (manipulated) {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "You can't run commands and manipulate the namespace at the same time, ignored.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                        "You can't run commands and manipulate the namespace at the same time, ignored.");
             } else {
                 // Command to run!
                 if (namespace.canRun(inverse) && origin instanceof WritableFrameContainer) {
-                    ((WritableFrameContainer) origin).getCommandParser().parseCommand(origin, args.getArgumentsAsString(i++));
+                    ((WritableFrameContainer) origin).getCommandParser().parseCommand(origin, args.
+                            getArgumentsAsString(i++));
                 }
                 return;
             }
@@ -220,10 +255,14 @@ public class ConditionalExecuteCommand extends Command {
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "Usage:");
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "");
             sendLine(origin, args.isSilent(), FORMAT_ERROR, cmdname + " <args>");
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, cmdname + " --namespace <name> <namespace commands>");
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, cmdname + " --namespace <name> [--inverse] </commandToRun <command args>>");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, cmdname
+                    + " --namespace <name> <namespace commands>");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, cmdname
+                    + " --namespace <name> [--inverse] </commandToRun <command args>>");
             sendLine(origin, args.isSilent(), FORMAT_ERROR, "");
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "For more information, see " + cmdname + " --help");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "For more information, see " + cmdname
+                    + " --help");
         }
     }
+
 }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteModule.java

@@ -29,7 +29,6 @@ import dagger.Module;
 /**
  * DI for the conditional execute plugin.
  */
-@Module(injects={ConditionalExecuteCommand.class}, addsTo = ClientModule.class)
+@Module(injects = {ConditionalExecuteCommand.class}, addsTo = ClientModule.class)
 public class ConditionalExecuteModule {
-
 }

src/com/dmdirc/addons/conditional_execute/ConditionalExecuteNamespace.java

@@ -29,15 +29,13 @@ import java.text.SimpleDateFormat;
  * Class representing a ConditionalExecute Namespace.
  */
 public class ConditionalExecuteNamespace {
+
     /** Name of this namespace. */
     private final String name;
-
     /** Are we currently inhibited? */
     private boolean inhibited = false;
-
     /** Are we currently forced? */
     private boolean forced = false;
-
     /** What is the current limit time? */
     private long limitTime = 0L;
 
@@ -53,14 +51,12 @@ public class ConditionalExecuteNamespace {
     /**
      * Can a command in this namespace be run?
      *
-     * This checks as follows:
-     *   - Is the namespace inhibited? - return False
-     *   - Is the namespace in "force" mode?  - return True
-     *   - If inverse is true, are we under the limit time? return True
-     *   - If inverse is false, are we over the limit time? return True
-     *   - return False
+     * This checks as follows: - Is the namespace inhibited? - return False - Is the namespace in
+     * "force" mode? - return True - If inverse is true, are we under the limit time? return True -
+     * If inverse is false, are we over the limit time? return True - return False
      *
      * @param inverse Check if we are *before* the limit time rather than after?
+     *
      * @return True if the command can be run.
      */
     public boolean canRun(final boolean inverse) {
@@ -89,6 +85,7 @@ public class ConditionalExecuteNamespace {
      * Change the limit time on this namespace.
      *
      * @param difference Change (in milliseconds) to make to the limit time.
+     *
      * @return New limit time.
      */
     public long changeLimit(final long difference) {
@@ -100,6 +97,7 @@ public class ConditionalExecuteNamespace {
      * Set the limit time on this namespace.
      *
      * @param time new Limit time (in milliseconds)
+     *
      * @return New limit time.
      */
     public long setLimit(final long time) {
@@ -148,13 +146,13 @@ public class ConditionalExecuteNamespace {
     public String toString() {
         final StringBuilder sb = new StringBuilder(getName());
         if (isForced()) {
-          sb.append(" - Forced");
+            sb.append(" - Forced");
         } else if (isInhibited()) {
-          sb.append(" - Inhibited");
+            sb.append(" - Inhibited");
         } else {
-          sb.append(" - Limit Time: ");
-          final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-          sb.append(dateFormat.format(limitTime));
+            sb.append(" - Limit Time: ");
+            final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            sb.append(dateFormat.format(limitTime));
         }
         if (canRun(false)) {
             sb.append(" [Can Run]");
@@ -164,4 +162,5 @@ public class ConditionalExecuteNamespace {
         }
         return sb.toString();
     }
+
 }

src/com/dmdirc/addons/conditional_execute/ConditionalExecutePlugin.java

@@ -28,8 +28,8 @@ import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import dagger.ObjectGraph;
 
 /**
- * The ConditionalExecute plugin allows the user to run commands only if
- * external conditions have been met.
+ * The ConditionalExecute plugin allows the user to run commands only if external conditions have
+ * been met.
  */
 public final class ConditionalExecutePlugin extends BaseCommandPlugin {
 
@@ -39,4 +39,5 @@ public final class ConditionalExecutePlugin extends BaseCommandPlugin {
         setObjectGraph(graph.plus(new ConditionalExecuteModule()));
         registerCommand(ConditionalExecuteCommand.class, ConditionalExecuteCommand.INFO);
     }
+
 }

src/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -42,7 +42,7 @@ public class ContactListCommand extends Command implements IntelligentCommand {
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("contactlist",
             "contactlist - show a contact list for the current channel",
-            CommandType.TYPE_CHANNEL) ;
+            CommandType.TYPE_CHANNEL);
 
     /**
      * Creates a new instance of this command.

src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -59,7 +59,8 @@ public class ContactListListener implements NicklistListener,
     public void addListeners() {
         channel.addNicklistListener(this);
         channel.addCloseListener(this);
-        ActionManager.getActionManager().registerListener(this, CoreActionType.CHANNEL_USERAWAY, CoreActionType.CHANNEL_USERBACK);
+        ActionManager.getActionManager().registerListener(this, CoreActionType.CHANNEL_USERAWAY,
+                CoreActionType.CHANNEL_USERBACK);
     }
 
     /**
@@ -88,7 +89,8 @@ public class ContactListListener implements NicklistListener,
     /** {@inheritDoc} */
     @Override
     public void clientAdded(final ChannelClientInfo client) {
-        final Query query = channel.getConnection().getQuery(client.getClient().getNickname(), false);
+        final Query query = channel.getConnection().
+                getQuery(client.getClient().getNickname(), false);
 
         query.setIcon("query-" + client.getClient().getAwayState().name().toLowerCase());
     }
@@ -101,7 +103,8 @@ public class ContactListListener implements NicklistListener,
 
     /** {@inheritDoc} */
     @Override
-    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
         if (arguments[0] == channel) {
             clientAdded((ChannelClientInfo) arguments[1]);
         }
@@ -112,4 +115,5 @@ public class ContactListListener implements NicklistListener,
     public void windowClosing(final FrameContainer window) {
         removeListeners();
     }
+
 }

src/com/dmdirc/addons/contactlist/ContactListPlugin.java

@@ -39,4 +39,5 @@ public final class ContactListPlugin extends BaseCommandPlugin {
         super(commandController);
         registerCommand(new ContactListCommand(commandController), ContactListCommand.INFO);
     }
+
 }

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

@@ -49,15 +49,15 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
      *
-     * @param dcc The DCCChat object this window wraps around
-     * @param configManager Config manager
-     * @param commandController The controller to use in the command parser.
-     * @param title The title of this window
-     * @param nick My Current Nickname
-     * @param targetNick Nickname of target
+     * @param dcc                 The DCCChat object this window wraps around
+     * @param configManager       Config manager
+     * @param commandController   The controller to use in the command parser.
+     * @param title               The title of this window
+     * @param nick                My Current Nickname
+     * @param targetNick          Nickname of target
      * @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 ChatContainer(
             final DCCChat dcc,
@@ -75,8 +75,8 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
                 tabCompleterFactory,
                 urlBuilder,
                 Arrays.asList(
-                    WindowComponent.TEXTAREA.getIdentifier(),
-                    WindowComponent.INPUTFIELD.getIdentifier()));
+                WindowComponent.TEXTAREA.getIdentifier(),
+                WindowComponent.INPUTFIELD.getIdentifier()));
         dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;

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

@@ -32,7 +32,7 @@ public interface DCCChatHandler {
     /**
      * Handle a received message.
      *
-     * @param dcc The DCCChat that this message is from
+     * @param dcc     The DCCChat that this message is from
      * @param message The message
      */
     void handleChatMessage(DCCChat dcc, String message);

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

@@ -65,7 +65,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("dcc",
             "dcc <SEND|CHAT> <target> [params] - starts a DCC",
             CommandType.TYPE_SERVER);
-
     /** My Plugin. */
     private final DCCManager myPlugin;
     /** Main frame instance used as the parent for dialogs. */
@@ -82,13 +81,13 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of DCCCommand.
      *
-     * @param controller The controller to use for command information.
-     * @param mainFrame mainFrame instance to use
-     * @param plugin The DCC Plugin that this command belongs to
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param windowManager Window management
+     * @param controller          The controller to use for command information.
+     * @param mainFrame           mainFrame instance to use
+     * @param plugin              The DCC Plugin that this command belongs to
+     * @param messageSinkManager  The sink manager to use to despatch messages.
+     * @param windowManager       Window management
      * @param tabCompleterFactory The factory to use for tab completers.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param urlBuilder          The URL builder to use when finding icons.
      */
     @Inject
     public DCCCommand(
@@ -122,7 +121,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     || parser.getStringConverter().equalsIgnoreCase(target,
                     myNickname)) {
                 new Thread(new Runnable() {
-
                     /** {@inheritDoc} */
                     @Override
                     public void run() {
@@ -137,7 +135,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
                                     JOptionPane.ERROR_MESSAGE);
                         }
                     }
-
                 }, "DCC-Error-Message").start();
                 return;
             }
@@ -159,12 +156,12 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /**
      * Starts a DCC Chat.
      *
-     * @param parser Parser from which command originated
+     * @param parser     Parser from which command originated
      * @param connection Server from which command originated
-     * @param origin Frame container from which command originated
+     * @param origin     Frame container from which command originated
      * @param myNickname My current nickname
-     * @param target Target of the command
-     * @param isSilent Is this a silent command
+     * @param target     Target of the command
+     * @param isSilent   Is this a silent command
      */
     private void startChat(final Parser parser, final Connection connection,
             final FrameContainer origin, final String myNickname,
@@ -193,11 +190,12 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /**
      * Ask for the file to send, then start the send.
      *
-     * @param target Person this dcc is to.
-     * @param origin The InputWindow this command was issued on
+     * @param target     Person this dcc is to.
+     * @param origin     The InputWindow this command was issued on
      * @param connection The server instance that this command is being executed on
-     * @param isSilent Whether this command is silenced or not
-     * @param filename The file to send
+     * @param isSilent   Whether this command is silenced or not
+     * @param filename   The file to send
+     *
      * @since 0.6.3m1
      */
     public void sendFile(final String target, final FrameContainer origin,
@@ -205,14 +203,13 @@ public class DCCCommand extends Command implements IntelligentCommand {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);
         final File selectedFile = UIUtilities.invokeAndWait(new Callable<File>() {
-
             @Override
             public File call() {
                 final JFileChooser jc = givenFile.exists()
                         ? KFileChooser.getFileChooser(origin.getConfigManager(),
-                                myPlugin, givenFile)
+                        myPlugin, givenFile)
                         : KFileChooser.getFileChooser(origin.getConfigManager(),
-                                myPlugin);
+                        myPlugin);
                 final int result = showFileChooser(givenFile, target, jc);
 
                 if (result != JFileChooser.APPROVE_OPTION
@@ -226,7 +223,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
             return;
         }
         new Thread(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -279,7 +275,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     }
                 }
             }
-
         }, "openFileThread").start();
     }
 
@@ -308,15 +303,14 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * Sets up and display a file chooser.
      *
      * @param givenFile File to display
-     * @param target DCC target
-     * @param jc File chooser
+     * @param target    DCC target
+     * @param jc        File chooser
      *
-     * @return   the return state of the file chooser on popdown:
+     * @return the return state of the file chooser on popdown:
      * <ul>
      * <li>JFileChooser.CANCEL_OPTION
      * <li>JFileChooser.APPROVE_OPTION
-     * <li>JFileChooser.ERROR_OPTION if an error occurs or the
-     *                               dialog is dismissed
+     * <li>JFileChooser.ERROR_OPTION if an error occurs or the dialog is dismissed
      * </ul>
      */
     private int showFileChooser(final File givenFile, final String target,
@@ -325,10 +319,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
             jc.setSelectedFile(givenFile);
             return JFileChooser.APPROVE_OPTION;
         } else {
-        jc.setDialogTitle("Send file to " + target + " - DMDirc ");
-        jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        jc.setMultiSelectionEnabled(false);
-        return jc.showOpenDialog(mainFrame);
+            jc.setDialogTitle("Send file to " + target + " - DMDirc ");
+            jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+            jc.setMultiSelectionEnabled(false);
+            return jc.showOpenDialog(mainFrame);
         }
     }
 
@@ -353,4 +347,3 @@ public class DCCCommand extends Command implements IntelligentCommand {
     }
 
 }
-

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

@@ -40,7 +40,7 @@ public class DCCCommandParser extends GlobalCommandParser {
     /**
      * Creates a new instance of the GlobalCommandParser.
      *
-     * @param configManager Config manager
+     * @param configManager     Config manager
      * @param commandController The controller to load commands and command info from.
      */
     public DCCCommandParser(
@@ -56,12 +56,11 @@ public class DCCCommandParser extends GlobalCommandParser {
     }
 
     /**
-     * Called when the input was a line of text that was not a command.
-     * This normally means it is sent to the server/channel/user as-is, with
-     * no further processing.
+     * Called when the input was a line of text that was not a command. This normally means it is
+     * sent to the server/channel/user as-is, with no further processing.
      *
      * @param origin The window in which the command was typed
-     * @param line The line input by the user
+     * @param line   The line input by the user
      */
     @Override
     protected void handleNonCommand(final FrameContainer origin, final String line) {

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

@@ -40,21 +40,20 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
 
     /** The factory to use to create tab completers. */
     private final TabCompleterFactory tabCompleterFactory;
-
     /** The Window we're using. */
     private boolean windowClosing = false;
 
     /**
      * Creates a new instance of DCCFrame.
      *
-     * @param title The title of this window
-     * @param icon The icon to use
-     * @param configManager Config manager
-     * @param parser Command parser to use for this window
-     * @param messageSinkManager The sink manager to use to despatch messages.
+     * @param title               The title of this window
+     * @param icon                The icon to use
+     * @param configManager       Config manager
+     * @param parser              Command parser to use for this window
+     * @param messageSinkManager  The sink manager to use to despatch messages.
      * @param tabCompleterFactory The factory to use to create tab completers.
-     * @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
      */
     public DCCFrameContainer(
             final String title,

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

@@ -101,18 +101,18 @@ public class DCCManager implements ActionListener {
     /**
      * Creates a new instance of this plugin.
      *
-     * @param mainFrame The main frame that will own any new windows.
-     * @param pluginInfo This plugin's plugin info
-     * @param identityController The Identity controller that provides the current config
-     * @param globalConfig The configuration to read settings from.
-     * @param commandController Command controller to register commands
-     * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param windowManager Window Management
-     * @param tabCompleterFactory The factory to use for tab completers.
-     * @param windowFactory The window factory to register the DCC implementations with.
+     * @param mainFrame             The main frame that will own any new windows.
+     * @param pluginInfo            This plugin's plugin info
+     * @param identityController    The Identity controller that provides the current config
+     * @param globalConfig          The configuration to read settings from.
+     * @param commandController     Command controller to register commands
+     * @param messageSinkManager    The sink manager to use to despatch messages.
+     * @param windowManager         Window Management
+     * @param tabCompleterFactory   The factory to use for tab completers.
+     * @param windowFactory         The window factory to register the DCC implementations with.
      * @param componentFrameFactory Factory to use to create new component frames for DCC windows.
-     * @param urlBuilder The URL builder to use when finding icons.
-     * @param baseDirectory The directory to create a downloads directory within.
+     * @param urlBuilder            The URL builder to use when finding icons.
+     * @param baseDirectory         The directory to create a downloads directory within.
      */
     @Inject
     public DCCManager(
@@ -141,19 +141,19 @@ public class DCCManager implements ActionListener {
         windowFactory.registerImplementation(
                 new HashSet<>(Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
                 new SwingWindowFactory.WindowProvider() {
-                    @Override
-                    public TextFrame getWindow(final FrameContainer container) {
-                        return componentFrameFactory.getComponentFrame(container);
-                    }
-                });
+            @Override
+            public TextFrame getWindow(final FrameContainer container) {
+                return componentFrameFactory.getComponentFrame(container);
+            }
+        });
         windowFactory.registerImplementation(
                 new HashSet<>(Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel")),
                 new SwingWindowFactory.WindowProvider() {
-                    @Override
-                    public TextFrame getWindow(final FrameContainer container) {
-                        return componentFrameFactory.getComponentFrame(container);
-                    }
-                });
+            @Override
+            public TextFrame getWindow(final FrameContainer container) {
+                return componentFrameFactory.getComponentFrame(container);
+            }
+        });
 
         final ConfigProvider defaults = identityController.getAddonSettings();
         defaults.setOption(domain, "receive.savelocation",
@@ -165,22 +165,20 @@ public class DCCManager implements ActionListener {
     }
 
     /**
-     * Ask a question, if the answer is the answer required, then recall
-     * handleProcessEvent.
+     * Ask a question, if the answer is the answer required, then recall handleProcessEvent.
      *
-     * @param question Question to ask
-     * @param title Title of question dialog
+     * @param question      Question to ask
+     * @param title         Title of question dialog
      * @param desiredAnswer Answer required
-     * @param type Actiontype to pass back
-     * @param format StringBuffer to pass back
-     * @param arguments arguments to pass back
+     * @param type          Actiontype to pass back
+     * @param format        StringBuffer to pass back
+     * @param arguments     arguments to pass back
      */
     public void askQuestion(final String question, final String title,
             final int desiredAnswer, final ActionType type,
             final StringBuffer format, final Object... arguments) {
         // New thread to ask the question in to stop us locking the UI
         new Thread(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -190,7 +188,6 @@ public class DCCManager implements ActionListener {
                     handleProcessEvent(type, format, true, arguments);
                 }
             }
-
         }, "QuestionThread: " + title).start();
     }
 
@@ -198,16 +195,15 @@ public class DCCManager implements ActionListener {
      * Ask the location to save a file, then start the download.
      *
      * @param nickname Person this dcc is from.
-     * @param send The DCCSend to save for.
-     * @param parser The parser this send was received on
-     * @param reverse Is this a reverse dcc?
-     * @param token Token used in reverse dcc.
+     * @param send     The DCCSend to save for.
+     * @param parser   The parser this send was received on
+     * @param reverse  Is this a reverse dcc?
+     * @param token    Token used in reverse dcc.
      */
     public void saveFile(final String nickname, final DCCTransfer send,
             final Parser parser, final boolean reverse, final String token) {
         // New thread to ask the user where to save in to stop us locking the UI
         new Thread(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -224,7 +220,7 @@ public class DCCManager implements ActionListener {
                     return;
                 }
                 send.setFileName(jc.getSelectedFile().getPath());
-                if (!handleExists(send, jc, nickname, parser,reverse, token)) {
+                if (!handleExists(send, jc, nickname, parser, reverse, token)) {
                     return;
                 }
                 final boolean resume = handleResume(jc);
@@ -268,19 +264,18 @@ public class DCCManager implements ActionListener {
                     }
                 }
             }
-
         }, "saveFileThread: " + send.getShortFileName()).start();
     }
 
     /**
      * Checks if the selected file exists and prompts the user as required.
      *
-     * @param send DCC Transfer
-     * @param jc File chooser
+     * @param send     DCC Transfer
+     * @param jc       File chooser
      * @param nickname Remote nickname
-     * @param parser Parser
-     * @param reverse Reverse DCC?
-     * @param token DCC token
+     * @param parser   Parser
+     * @param reverse  Reverse DCC?
+     * @param token    DCC token
      *
      * @return true if the user wants to continue, false if they wish to abort
      */
@@ -332,21 +327,20 @@ public class DCCManager implements ActionListener {
      * Sets up and display a file chooser.
      *
      * @param send DCCTransfer object sending the file
-     * @param jc File chooser
+     * @param jc   File chooser
      *
-     * @return   the return state of the file chooser on popdown:
+     * @return the return state of the file chooser on popdown:
      * <ul>
      * <li>JFileChooser.CANCEL_OPTION
      * <li>JFileChooser.APPROVE_OPTION
-     * <li>JFileChooser.ERROR_OPTION if an error occurs or the
-     *                               dialog is dismissed
+     * <li>JFileChooser.ERROR_OPTION if an error occurs or the dialog is dismissed
      * </ul>
      */
     private int showFileChooser(final DCCTransfer send, final JFileChooser jc) {
         jc.setDialogTitle("Save " + send.getShortFileName() + " As - DMDirc");
-                jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-                jc.setMultiSelectionEnabled(false);
-                jc.setSelectedFile(new File(send.getFileName()));
+        jc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        jc.setMultiSelectionEnabled(false);
+        jc.setSelectedFile(new File(send.getFileName()));
         return jc.showSaveDialog(mainFrame);
     }
 
@@ -358,11 +352,11 @@ public class DCCManager implements ActionListener {
     }
 
     /**
-     * Make the given DCC start listening.
-     * This will either call dcc.listen() or dcc.listen(startPort, endPort)
-     * depending on config.
+     * Make the given DCC start listening. This will either call dcc.listen() or
+     * dcc.listen(startPort, endPort) depending on config.
      *
      * @param dcc DCC to start listening.
+     *
      * @return True if Socket was opened.
      */
     protected boolean listen(final DCC dcc) {
@@ -387,9 +381,9 @@ public class DCCManager implements ActionListener {
     /**
      * Process an event of the specified type.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
+     * @param dontAsk   Don't ask any questions, assume yes.
      * @param arguments The arguments for the event
      */
     public void handleProcessEvent(final ActionType type,
@@ -421,10 +415,10 @@ public class DCCManager implements ActionListener {
     /**
      * Handles a DCC chat request.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
-     * @param ctcpData CTCP data bits
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
+     * @param dontAsk   Don't ask any questions, assume yes.
+     * @param ctcpData  CTCP data bits
      * @param arguments The arguments for the event
      */
     private void handleChat(final ActionType type, final StringBuffer format,
@@ -464,10 +458,10 @@ public class DCCManager implements ActionListener {
     /**
      * Handles a DCC send request.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
-     * @param dontAsk Don't ask any questions, assume yes.
-     * @param ctcpData CTCP data bits
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
+     * @param dontAsk   Don't ask any questions, assume yes.
+     * @param ctcpData  CTCP data bits
      * @param arguments The arguments for the event
      */
     private void handleSend(final ActionType type, final StringBuffer format,
@@ -578,7 +572,7 @@ public class DCCManager implements ActionListener {
     /**
      * Handles a DCC chat request.
      *
-     * @param ctcpData CTCP data bits
+     * @param ctcpData  CTCP data bits
      * @param arguments The arguments for the event
      */
     private void handleReceive(final String[] ctcpData,
@@ -613,8 +607,8 @@ public class DCCManager implements ActionListener {
         try {
             port = Integer.parseInt(ctcpData[++i]);
             position = Integer.parseInt(ctcpData[++i]);
-            } catch (NumberFormatException nfe) {
-                return;
+        } catch (NumberFormatException nfe) {
+            return;
         }
         final String token = (ctcpData.length - 1 > i) ? " "
                 + ctcpData[++i] : "";
@@ -630,7 +624,7 @@ public class DCCManager implements ActionListener {
                 final Parser parser = ((Connection) arguments[0]).getParser();
                 final String nick = ((ClientInfo) arguments[1]).getNickname();
                 if (ctcpData[0].equalsIgnoreCase("resume")) {
-                    parser.sendCTCP(nick, "DCC", "ACCEPT "+ ((quoted) ? "\""
+                    parser.sendCTCP(nick, "DCC", "ACCEPT " + ((quoted) ? "\""
                             + filename + "\"" : filename) + " " + port + " "
                             + send.setFileStart(position) + token);
                 } else {
@@ -663,8 +657,6 @@ public class DCCManager implements ActionListener {
         }
     }
 
-
-
     /**
      * Retrieves the container for the placeholder.
      *
@@ -736,6 +728,7 @@ public class DCCManager implements ActionListener {
      * Get the IP Address we should send as our listening IP.
      *
      * @param parser Parser the IRC Parser where this dcc is initiated
+     *
      * @return The IP Address we should send as our listening IP.
      */
     public String getListenIP(final Parser parser) {

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

@@ -25,8 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 
 /**
- * This interfaces allows DCC Transfer Windows to receive data from a
- * DCCTransfer.
+ * This interfaces allows DCC Transfer Windows to receive data from a DCCTransfer.
  *
  * @author Shane 'Dataforce' McCormack
  */
@@ -49,7 +48,7 @@ public interface DCCTransferHandler {
     /**
      * Called when data is sent/recieved.
      *
-     * @param dcc The DCCTransfer that this message is from
+     * @param dcc   The DCCTransfer that this message is from
      * @param bytes The number of new bytes that were transfered
      */
     void dataTransfered(final DCCTransfer dcc, final int bytes);

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

@@ -45,9 +45,9 @@ public class PlaceholderContainer extends FrameContainer {
     /**
      * Creates a placeholder DCC frame.
      *
-     * @param plugin The plugin which owns this placeholder
-     * @param config Config manager
-     * @param mainFrame Frame that will own new dialogs.
+     * @param plugin     The plugin which owns this placeholder
+     * @param config     Config manager
+     * @param mainFrame  Frame that will own new dialogs.
      * @param urlBuilder The URL builder to use when finding icons.
      */
     public PlaceholderContainer(
@@ -80,10 +80,9 @@ public class PlaceholderContainer extends FrameContainer {
                     "Closing this window will cause all existing DCCs "
                     + "to terminate, are you sure you want to do this?") {
                 /**
-                 * 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;
 
@@ -122,4 +121,5 @@ public class PlaceholderContainer extends FrameContainer {
             close();
         }
     }
+
 }

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

@@ -49,46 +49,35 @@ public class TransferContainer extends FrameContainer implements
 
     /** The dcc plugin that owns this frame */
     protected final DCCManager plugin;
-
     /** Config manager. */
     private final AggregateConfigProvider config;
-
     /** The Window we're using. */
     private boolean windowClosing = false;
-
     /** The DCCSend object we are a window for */
     private final DCCTransfer dcc;
-
     /** Other Nickname */
     private final String otherNickname;
-
     /** Total data transfered */
     private volatile long transferCount = 0;
-
     /** Time Started */
     private long timeStarted = 0;
-
     /** Plugin that this send belongs to. */
     private final DCCManager myPlugin;
-
     /** IRC Parser that caused this send */
     private Parser parser = null;
-
     /** Connection the send was initiated on. */
     private Connection connection = null;
-
     /** Show open button. */
-    private boolean showOpen = Desktop.isDesktopSupported() &&
-            Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
+    private boolean showOpen = Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(
+            Desktop.Action.OPEN);
 
     /**
-     * Creates a new instance of DCCTransferWindow with a given DCCTransfer
-     * object.
+     * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
      *
-     * @param plugin the DCC Plugin responsible for this window
-     * @param dcc The DCCTransfer object this window wraps around
-     * @param config Config manager
-     * @param title The title of this window
+     * @param plugin     the DCC Plugin responsible for this window
+     * @param dcc        The DCCTransfer object this window wraps around
+     * @param config     Config manager
+     * @param title      The title of this window
      * @param targetNick Nickname of target
      * @param connection The connection that the send was that initiated on
      * @param urlBuilder The URL builder to use when finding icons.
@@ -137,6 +126,7 @@ public class TransferContainer extends FrameContainer implements
      * Retrieves the nickname of the other party involved in this transfer.
      *
      * @return The other party's nickname
+     *
      * @since 0.6.4
      */
     public String getOtherNickname() {
@@ -146,7 +136,7 @@ public class TransferContainer extends FrameContainer implements
     /**
      * Called when data is sent/recieved
      *
-     * @param dcc The DCCSend that this message is from
+     * @param dcc   The DCCSend that this message is from
      * @param bytes The number of new bytes that were transfered
      */
     @Override
@@ -162,7 +152,9 @@ public class TransferContainer extends FrameContainer implements
 
         if (percentageInTitle) {
             final StringBuilder title = new StringBuilder();
-            if (dcc.isListenSocket()) { title.append("*"); }
+            if (dcc.isListenSocket()) {
+                title.append("*");
+            }
             title.append(dcc.getType() == DCCTransfer.TransferType.SEND
                     ? "Sending: " : "Recieving: ");
             title.append(otherNickname);
@@ -224,8 +216,7 @@ public class TransferContainer extends FrameContainer implements
      * Retrieves the timestamp at which this transfer started.
      *
      * @since 0.6.4
-     * @return The timestamp (milliseconds since 01/01/1970) at which this
-     * transfer started.
+     * @return The timestamp (milliseconds since 01/01/1970) at which this transfer started.
      */
     public long getStartTime() {
         return timeStarted;
@@ -252,8 +243,7 @@ public class TransferContainer extends FrameContainer implements
     }
 
     /**
-     * Determines whether the "Open" button should be displayed for this
-     * transfer.
+     * Determines whether the "Open" button should be displayed for this transfer.
      *
      * @since 0.6.4
      * @return True if the open button should be displayed, false otherwise
@@ -318,7 +308,6 @@ public class TransferContainer extends FrameContainer implements
             if (connection.getParser().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
                 final Thread errorThread = new Thread(new Runnable() {
-
                     /** {@inheritDoc} */
                     @Override
                     public void run() {
@@ -326,13 +315,12 @@ public class TransferContainer extends FrameContainer implements
                                 "You can't DCC yourself.", "DCC Error",
                                 JOptionPane.ERROR_MESSAGE);
                     }
-
                 }, "DCC-Error-Message");
                 errorThread.start();
             } else {
                 if (config.getOptionBool(plugin.getDomain(), "send.reverse")) {
-                    parser.sendCTCP(otherNickname, "DCC", "SEND \"" +
-                            new File(dcc.getFileName()).getName() + "\" "
+                    parser.sendCTCP(otherNickname, "DCC", "SEND \"" + new File(dcc.getFileName()).
+                            getName() + "\" "
                             + DCC.ipToLong(myPlugin.getListenIP(parser))
                             + " 0 " + dcc.getFileSize() + " " + dcc.makeToken()
                             + ((dcc.isTurbo()) ? " T" : ""));

src/com/dmdirc/addons/dcc/actions/DCCActions.java

@@ -32,46 +32,45 @@ public enum DCCActions implements ActionType {
 
     /** DCC Chat Request. */
     DCC_CHAT_REQUEST(DCCEvents.DCC_CHAT_REQUEST,
-        "DCC chat requested"),
+    "DCC chat requested"),
     /** DCC Chat Request Sent. */
     DCC_CHAT_REQUEST_SENT(DCCEvents.DCC_CHAT_REQUEST_SENT,
-        "DCC chat request sent"),
+    "DCC chat request sent"),
     /** DCC Message from another person. */
     DCC_CHAT_MESSAGE(DCCEvents.DCC_CHAT_MESSAGE,
-        "DCC chat message recieved"),
+    "DCC chat message recieved"),
     /** DCC Message to another person. */
     DCC_CHAT_SELFMESSAGE(DCCEvents.DCC_CHAT_SELFMESSAGE,
-        "DCC chat message sent"),
+    "DCC chat message sent"),
     /** DCC Chat Socket Closed. */
     DCC_CHAT_SOCKETCLOSED(DCCEvents.DCC_CHAT_SOCKETCLOSED,
-        "DCC chat socket closed"),
+    "DCC chat socket closed"),
     /** DCC Chat Socket Opened. */
     DCC_CHAT_SOCKETOPENED(DCCEvents.DCC_CHAT_SOCKETOPENED,
-        "DCC chat socket opened"),
+    "DCC chat socket opened"),
     /** DCC Send Socket Closed. */
     DCC_SEND_SOCKETCLOSED(DCCEvents.DCC_SEND_SOCKETCLOSED,
-        "DCC send socket closed"),
+    "DCC send socket closed"),
     /** DCC Send Socket Opened. */
     DCC_SEND_SOCKETOPENED(DCCEvents.DCC_SEND_SOCKETOPENED,
-        "DCC send socket opened"),
+    "DCC send socket opened"),
     /** DCC Send Data Transfered. */
     DCC_SEND_DATATRANSFERED(DCCEvents.DCC_SEND_DATATRANSFERED,
-        "DCC send data transferred"),
+    "DCC send data transferred"),
     /** DCC Send Request. */
     DCC_SEND_REQUEST(DCCEvents.DCC_SEND_REQUEST,
-        "DCC send requested"),
+    "DCC send requested"),
     /** DCC Send Request Sent. */
     DCC_SEND_REQUEST_SENT(DCCEvents.DCC_SEND_REQUEST_SENT,
-        "DCC send request sent");
-
+    "DCC send request sent");
     /** 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
      */

src/com/dmdirc/addons/dcc/actions/DCCEvents.java

@@ -39,7 +39,8 @@ public enum DCCEvents implements ActionMetaType {
     /** DCC Chat Request Sent. */
     DCC_CHAT_REQUEST_SENT(new String[]{"connection", "client"}, Connection.class, String.class),
     /** DCC Message from another person. */
-    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, ChatContainer.class, String.class, String.class),
+    DCC_CHAT_MESSAGE(new String[]{"DCCChatWindow", "Nickname", "Message"}, ChatContainer.class,
+    String.class, String.class),
     /** DCC Message to another person. */
     DCC_CHAT_SELFMESSAGE(new String[]{"DCCChatWindow", "Message"}, ChatContainer.class, String.class),
     /** DCC Chat Socket Closed. */
@@ -51,15 +52,16 @@ public enum DCCEvents implements ActionMetaType {
     /** DCC Send Socket Opened. */
     DCC_SEND_SOCKETOPENED(new String[]{"DCCSendWindow"}, TransferContainer.class),
     /** DCC Send Data Transfered */
-    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"}, TransferContainer.class, int.class),
+    DCC_SEND_DATATRANSFERED(new String[]{"DCCSendWindow", "Bytes Transfered"},
+    TransferContainer.class, int.class),
     /** DCC Send Request. */
-    DCC_SEND_REQUEST(new String[]{"connection", "client", "file"}, Connection.class, String.class, String.class),
+    DCC_SEND_REQUEST(new String[]{"connection", "client", "file"}, Connection.class, String.class,
+    String.class),
     /** DCC Send Request Sent. */
-    DCC_SEND_REQUEST_SENT(new String[]{"connection", "client", "file"}, Connection.class, String.class, File.class);
-
+    DCC_SEND_REQUEST_SENT(new String[]{"connection", "client", "file"}, Connection.class,
+    String.class, File.class);
     /** The names of the arguments for this meta type. */
     private String[] argNames;
-
     /** The classes of the arguments for this meta type. */
     private Class[] argTypes;
 

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

@@ -29,8 +29,8 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * This class manages the socket and low-level I/O functionality for all
- * types of DCC. Subclasses process the data received by this class.
+ * This class manages the socket and low-level I/O functionality for all types of DCC. Subclasses
+ * process the data received by this class.
  */
 public abstract class DCC implements Runnable {
 
@@ -47,28 +47,24 @@ public abstract class DCC implements Runnable {
     /** Are we a listen socket? */
     protected boolean listen = false;
     /**
-     * The current socket in use if this is a listen socket.
-     * This reference may be changed if and only if exactly one permit from the
-     * {@link #serverSocketSem} and {@link #serverListeningSem} semaphores is
-     * held by the thread doing the modification.
+     * The current socket in use if this is a listen socket. This reference may be changed if and
+     * only if exactly one permit from the {@link #serverSocketSem} and {@link #serverListeningSem}
+     * semaphores is held by the thread doing the modification.
      */
     private ServerSocket serverSocket;
     /**
-     * Semaphore to control write access to ServerSocket.
-     * If an object acquires a permit from the {@link #serverSocketSem}, then
-     * {@link #serverSocket} is <em>guaranteed</em> not to be externally
-     * modified until that permit is released, <em>unless</em> the object also
-     * acquires a permit from the {@link #serverListeningSem}.
+     * Semaphore to control write access to ServerSocket. If an object acquires a permit from the
+     * {@link #serverSocketSem}, then {@link #serverSocket} is <em>guaranteed</em> not to be
+     * externally modified until that permit is released, <em>unless</em> the object also acquires a
+     * permit from the {@link #serverListeningSem}.
      */
     private final Semaphore serverSocketSem = new Semaphore(1);
     /**
-     * Semaphore used when we're blocking waiting for connections.
-     * If an object acquires a permit from the {@link #serverListeningSem},
-     * then it is <em>guaranteed</em> that the {@link #run()} method is blocking
-     * waiting for incoming connections. In addition, it is <em>guaranteed</em>
-     * that the {@link #run()} method is holding the {@link #serverSocketSem}
-     * permit, and it will continue holding that permit until it can reaquire
-     * the {@link #serverListeningSem} permit.
+     * Semaphore used when we're blocking waiting for connections. If an object acquires a permit
+     * from the {@link #serverListeningSem}, then it is <em>guaranteed</em> that the {@link #run()}
+     * method is blocking waiting for incoming connections. In addition, it is <em>guaranteed</em>
+     * that the {@link #run()} method is holding the {@link #serverSocketSem} permit, and it will
+     * continue holding that permit until it can reaquire the {@link #serverListeningSem} permit.
      */
     private final Semaphore serverListeningSem = new Semaphore(0);
 
@@ -108,11 +104,11 @@ public abstract class DCC implements Runnable {
     }
 
     /**
-     * Start a listen socket rather than a connect socket, use a port from the
-     * given range.
+     * Start a listen socket rather than a connect socket, use a port from the given range.
      *
      * @param startPort Port to try first
-     * @param endPort Last port to try.
+     * @param endPort   Last port to try.
+     *
      * @throws IOException If no sockets were available in the given range
      */
     public void listen(final int startPort, final int endPort) throws IOException {
@@ -245,19 +241,17 @@ public abstract class DCC implements Runnable {
     }
 
     /**
-     * Called periodically to read or write data to this DCC's socket.
-     * Implementations should attempt to send or receive one unit of data
-     * (for example one block of binary data, or one line of ASCII data) each
-     * time this method is called.
+     * Called periodically to read or write data to this DCC's socket. Implementations should
+     * attempt to send or receive one unit of data (for example one block of binary data, or one
+     * line of ASCII data) each time this method is called.
      * <p>
-     * The return value of this method is used to determine whether the DCC
-     * has been completed. If the method returns <code>false</code>, the
-     * DCC is assumed to have finished (i.e., the socket has closed), and the
-     * method will not be called again. A return value of <code>true</code> will
-     * cause the method to be recalled.
+     * The return value of this method is used to determine whether the DCC has been completed. If
+     * the method returns
+     * <code>false</code>, the DCC is assumed to have finished (i.e., the socket has closed), and
+     * the method will not be called again. A return value of
+     * <code>true</code> will cause the method to be recalled.
      *
-     * @return false when socket is closed, true will cause the method to be
-     *         called again.
+     * @return false when socket is closed, true will cause the method to be called again.
      */
     protected abstract boolean handleSocket();
 
@@ -265,7 +259,7 @@ public abstract class DCC implements Runnable {
      * Set the address to connect to for this DCC
      *
      * @param address Address as an int (Network Byte Order, as specified in the DCC CTCP)
-     * @param port Port to connect to
+     * @param port    Port to connect to
      */
     public void setAddress(final long address, final int port) {
         this.address = address;
@@ -303,6 +297,7 @@ public abstract class DCC implements Runnable {
      * Convert the given IP Address to a long
      *
      * @param ip Input IP Address
+     *
      * @return ip as a long
      */
     public static long ipToLong(final String ip) {
@@ -318,6 +313,7 @@ public abstract class DCC implements Runnable {
      * Convert the given long to an IP Address
      *
      * @param in Input long
+     *
      * @return long as an IP
      */
     public static String longToIP(final long in) {

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

@@ -51,49 +51,34 @@ public class DCCTransfer extends DCC {
         SEND, RECEIVE;
 
     }
-
     /** The File transfer type for this file. */
     private TransferType transferType = TransferType.RECEIVE;
-
     /** The handlers for this DCCSend. */
     private final ListenerList handlers = new ListenerList();
-
     /** Used to send data out the socket. */
     private DataOutputStream out;
-
     /** Used to read data from the socket. */
     private DataInputStream in;
-
     /** File we are using. */
     private File transferFile;
-
     /** Used to write data to the file. */
     private DataOutputStream fileOut;
-
     /** Used to read data from the file. */
     private DataInputStream fileIn;
-
     /** Where are we starting from? */
     private int startpos;
-
     /** How big is this file? */
     private long size = -1;
-
     /** How much of this file have we read so far? */
     private long readSize;
-
     /** What is the name of the file? */
     private String filename = "";
-
     /** What is the token for this send? */
     private String token = "";
-
     /** Block Size. */
     private final int blockSize;
-
     /** Is this a turbo dcc? */
     private boolean turbo = false;
-
     private boolean active = false;
 
     /** Creates a new instance of DCCTransfer with a default block size. */
@@ -200,8 +185,7 @@ public class DCCTransfer extends DCC {
     }
 
     /**
-     * Set turbo mode on/off.
-     * Turbo mode doesn't wait for ack packets. Only relevent when sending.
+     * Set turbo mode on/off. Turbo mode doesn't wait for ack packets. Only relevent when sending.
      *
      * @param turbo True for turbo dcc, else false
      */
@@ -210,8 +194,7 @@ public class DCCTransfer extends DCC {
     }
 
     /**
-     * Is turbo mode on/off.
-     * Turbo mode doesn't wait for ack packets. Only relevent when sending.
+     * Is turbo mode on/off. Turbo mode doesn't wait for ack packets. Only relevent when sending.
      *
      * @return True for turbo dcc, else false
      */
@@ -238,8 +221,7 @@ public class DCCTransfer extends DCC {
     }
 
     /**
-     * Make a Token for this send.
-     * This token will be unique compared to all the other known sends
+     * Make a Token for this send. This token will be unique compared to all the other known sends
      *
      * @return The Token for this send.
      */
@@ -256,8 +238,9 @@ public class DCCTransfer extends DCC {
      * Find a send based on a given token.
      *
      * @param token Token to look for. (case sensitive)
-     * @return The first DCCTransfer that matches the given token.
-     *         null if none match, or token is "" or null.
+     *
+     * @return The first DCCTransfer that matches the given token. null if none match, or token is
+     *         "" or null.
      */
     public static DCCTransfer findByToken(final String token) {
         if (token == null || token.isEmpty()) {
@@ -293,8 +276,8 @@ public class DCCTransfer extends DCC {
      * Set the starting position of the file
      *
      * @param startpos Starting position
-     * @return -1 if fileIn is null or if dcc receive, else the result of
-     * fileIn.skipBytes()
+     *
+     * @return -1 if fileIn is null or if dcc receive, else the result of fileIn.skipBytes()
      */
     public int setFileStart(final int startpos) {
         this.startpos = startpos;
@@ -400,8 +383,8 @@ public class DCCTransfer extends DCC {
     /**
      * Handle the socket as a RECEIVE.
      *
-     * @return false when socket is closed (or should be closed), true will
-     * cause the method to be called again.
+     * @return false when socket is closed (or should be closed), true will cause the method to be
+     *         called again.
      */
     protected boolean handleReceive() {
         try {
@@ -445,8 +428,8 @@ public class DCCTransfer extends DCC {
     /**
      * Handle the socket as a SEND.
      *
-     * @return false when socket is closed (or should be closed), true will
-     * cause the method to be called again.
+     * @return false when socket is closed (or should be closed), true will cause the method to be
+     *         called again.
      */
     protected boolean handleSend() {
         try {

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

@@ -35,16 +35,12 @@ public class KDialogProcess {
 
     /** Is kdialog in /bin? */
     private static final boolean IS_BIN = new File("/bin/kdialog").exists();
-
     /** Does KDialog exist? */
     private static final boolean HAS_KDIALOG = IS_BIN || new File("/usr/bin/kdialog").exists();
-
     /** Stream for the stdout stream for this process. */
     private final StreamReader stdOutputStream;
-
     /** Stream for the stderr stream for this process. */
     private final StreamReader stdErrorStream;
-
     /** The actual process for this process. */
     private final Process process;
 
@@ -52,6 +48,7 @@ public class KDialogProcess {
      * Execute kdialog with the Parameters in params.
      *
      * @param params Parameters to pass to kdialog
+     *
      * @throws IOException if an I/O error occurs
      */
     public KDialogProcess(final String[] params) throws IOException {
@@ -104,8 +101,8 @@ public class KDialogProcess {
     /**
      * Wait for the process to finish.
      *
-     * @throws InterruptedException if the current thread is interrupted by
-     * another thread while it is waiting
+     * @throws InterruptedException if the current thread is interrupted by another thread while it
+     *                              is waiting
      */
     public void waitFor() throws InterruptedException {
         process.waitFor();

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

@@ -35,34 +35,26 @@ import java.util.List;
 import javax.swing.JFileChooser;
 
 /**
- * JFileChooser that uses KDialog to show the actual chooser.
- * This is quite hacky, and not guarenteed to behave identically to JFileChooser,
- * altho it tries to be as close as possible.
- * Almost a drop in replacement for JFileChooser, replace:
- *    new JFileChooser();
- * with:
- *    KFileChooser.getFileChooser();
+ * JFileChooser that uses KDialog to show the actual chooser. This is quite hacky, and not
+ * guarenteed to behave identically to JFileChooser, altho it tries to be as close as possible.
+ * Almost a drop in replacement for JFileChooser, replace: new JFileChooser(); with:
+ * KFileChooser.getFileChooser();
  *
- * There are obviously some differences:
- * - File filters must be set using setKDEFileFilter() not using FileFilter objects.
- * - FileSystemView's are ignored
- * - showOpenDialog and showSaveDialog shell kdialog, so only options available
- *   in kdialog work.
- * - getFileChooser() will return a JFileChooser object unless the DCC plugin's
- *   config option "general.useKFileChooser" is set to "true" (defaults to false)
- *   and kdialog is in either /usr/bin or /bin
- * - Selection mode FILES_AND_DIRECTORIES can not be used
+ * There are obviously some differences: - File filters must be set using setKDEFileFilter() not
+ * using FileFilter objects. - FileSystemView's are ignored - showOpenDialog and showSaveDialog
+ * shell kdialog, so only options available in kdialog work. - getFileChooser() will return a
+ * JFileChooser object unless the DCC plugin's config option "general.useKFileChooser" is set to
+ * "true" (defaults to false) and kdialog is in either /usr/bin or /bin - Selection mode
+ * FILES_AND_DIRECTORIES can not be used
  */
 public class KFileChooser extends JFileChooser {
 
     /**
-     * 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
+     * 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 = 200806141;
-
     /** The plugin that this file chooser is for. */
     private final DCCManager plugin;
     /** Used to read settings from. */
@@ -83,10 +75,11 @@ public class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given File as the path.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin           The plugin that owns this KFileChooser
      * @param currentDirectory Directory to use as the base directory
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin,
+            final File currentDirectory) {
         super(currentDirectory);
 
         this.plugin = plugin;
@@ -96,10 +89,11 @@ public class KFileChooser extends JFileChooser {
     /**
      * Constructs a FileChooser using the given path.
      *
-     * @param plugin The plugin that owns this KFileChooser
+     * @param plugin               The plugin that owns this KFileChooser
      * @param currentDirectoryPath Directory to use as the base directory
      */
-    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCManager plugin,
+            final String currentDirectoryPath) {
         super(currentDirectoryPath);
 
         this.plugin = plugin;
@@ -111,11 +105,13 @@ public class KFileChooser extends JFileChooser {
      *
      * @param config Config manager
      * @param plugin The DCC Plugin that is requesting a chooser
-     * @return return true if getFileChooser() will return a KFileChooser not a
-     *         JFileChooser
+     *
+     * @return return true if getFileChooser() will return a KFileChooser not a JFileChooser
      */
-    public static boolean useKFileChooser(final AggregateConfigProvider config, final DCCManager plugin) {
-        return KDialogProcess.hasKDialog() && config.getOptionBool(plugin.getDomain(), "general.useKFileChooser");
+    public static boolean useKFileChooser(final AggregateConfigProvider config,
+            final DCCManager plugin) {
+        return KDialogProcess.hasKDialog() && config.getOptionBool(plugin.getDomain(),
+                "general.useKFileChooser");
     }
 
     /**
@@ -123,34 +119,43 @@ public class KFileChooser extends JFileChooser {
      *
      * @param config Config provider used to retrieve settings
      * @param plugin The DCC Plugin that is requesting a chooser
+     *
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin) {
-        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin) : new JFileChooser();
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config,
+            final DCCManager plugin) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin)
+                : new JFileChooser();
     }
 
     /**
      * Constructs a FileChooser using the given File as the path.
      *
-     * @param config Config provider used to retrieve settings
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param config           Config provider used to retrieve settings
+     * @param plugin           The DCC Plugin that is requesting a chooser
      * @param currentDirectory Directory to use as the base directory
+     *
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final File currentDirectory) {
-        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory) : new JFileChooser(currentDirectory);
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config,
+            final DCCManager plugin, final File currentDirectory) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory)
+                : new JFileChooser(currentDirectory);
     }
 
     /**
      * Constructs a FileChooser using the given path.
      *
-     * @param config Config provider used to retrieve settings
-     * @param plugin The DCC Plugin that is requesting a chooser
+     * @param config               Config provider used to retrieve settings
+     * @param plugin               The DCC Plugin that is requesting a chooser
      * @param currentDirectoryPath Directory to use as the base directory
+     *
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCManager plugin, final String currentDirectoryPath) {
-        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config,
+            final DCCManager plugin, final String currentDirectoryPath) {
+        return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin,
+                currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
     }
 
     /** {@inheritDoc} */
@@ -177,9 +182,11 @@ public class KFileChooser extends JFileChooser {
             params.add("--getopenfilename");
         }
 
-        if (getSelectedFile() != null && getFileSelectionMode() != DIRECTORIES_ONLY && !getSelectedFile().getPath().isEmpty()) {
+        if (getSelectedFile() != null && getFileSelectionMode() != DIRECTORIES_ONLY
+                && !getSelectedFile().getPath().isEmpty()) {
             if (getSelectedFile().getPath().charAt(0) != '/') {
-                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().getPath());
+                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().
+                        getPath());
             } else {
                 params.add(getSelectedFile().getPath());
             }
@@ -228,7 +235,8 @@ public class KFileChooser extends JFileChooser {
         params.add("--getsavefilename");
         if (getSelectedFile() != null && !getSelectedFile().getPath().isEmpty()) {
             if (getSelectedFile().getPath().charAt(0) != '/') {
-                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().getPath());
+                params.add(getCurrentDirectory().getPath() + File.separator + getSelectedFile().
+                        getPath());
             } else {
                 params.add(getSelectedFile().getPath());
             }

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

@@ -40,8 +40,7 @@ public class PlaceholderPanel extends JPanel implements SwingFrameComponent {
     private static final long serialVersionUID = 1L;
 
     /**
-     * Creates a new placeholder window for the specified UI controller and
-     * owner.
+     * Creates a new placeholder window for the specified UI controller and owner.
      */
     public PlaceholderPanel() {
         super(new MigLayout("fill, alignx center, aligny center"));
@@ -49,4 +48,5 @@ public class PlaceholderPanel extends JPanel implements SwingFrameComponent {
                 "This is a placeholder window to group DCCs together."
                 + "\n\nClosing this window will close all the active DCCs"));
     }
+
 }

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

@@ -152,12 +152,12 @@ public class TransferPanel extends JPanel implements ActionListener,
                 try {
                     Desktop.getDesktop().open(file.getParentFile());
                 } catch (IllegalArgumentException ex1) {
-                    Logger.userError(ErrorLevel.LOW, "Unable to open folder: " +
-                            file.getParentFile(), ex1);
+                    Logger.userError(ErrorLevel.LOW, "Unable to open folder: " + file.
+                            getParentFile(), ex1);
                     openButton.setEnabled(false);
                 } catch (IOException ex1) {
-                    Logger.userError(ErrorLevel.LOW, "No associated handler " +
-                            "to open file or directory.", ex1);
+                    Logger.userError(ErrorLevel.LOW, "No associated handler "
+                            + "to open file or directory.", ex1);
                     openButton.setEnabled(false);
                 }
             }
@@ -176,7 +176,6 @@ public class TransferPanel extends JPanel implements ActionListener,
     @Override
     public void socketClosed(final DCCTransfer dcc) {
         UIUtilities.invokeLater(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -205,13 +204,11 @@ public class TransferPanel extends JPanel implements ActionListener,
     @Override
     public void socketOpened(final DCCTransfer dcc) {
         UIUtilities.invokeLater(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
                 status.setText("Status: Socket Opened");
             }
-
         });
     }
 
@@ -219,7 +216,6 @@ public class TransferPanel extends JPanel implements ActionListener,
     @Override
     public void dataTransfered(final DCCTransfer dcc, final int bytes) {
         UIUtilities.invokeLater(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -258,6 +254,7 @@ public class TransferPanel extends JPanel implements ActionListener,
      * Get the duration in seconds as a string.
      *
      * @param secondsInput to get duration for
+     *
      * @return Duration as a string
      */
     private String duration(final long secondsInput) {

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

@@ -51,6 +51,7 @@ public final class DcopPlugin extends BaseCommandPlugin {
      * Retrieves the result from executing the specified command.
      *
      * @param command The command to be executed
+     *
      * @return The output of the specified command
      */
     @Exported
@@ -82,4 +83,5 @@ public final class DcopPlugin extends BaseCommandPlugin {
 
         return result;
     }
+
 }

src/com/dmdirc/addons/debug/Debug.java

@@ -53,17 +53,15 @@ public class Debug extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("debug",
             "debug <command> [args] - facilitates debugging of DMDirc",
             CommandType.TYPE_GLOBAL);
-
     /** The command controller to use to lookup command information. */
     private final CommandController controller;
-
     /** List of registered debug commands. */
     private final Map<String, DebugCommand> commands;
 
     /**
      * Creates a new debug command.
      *
-     * @param controller The command controller to use to lookup command information.
+     * @param controller  The command controller to use to lookup command information.
      * @param subcommands The subcommands to be loaded.
      */
     @Inject
@@ -106,23 +104,23 @@ public class Debug extends Command implements IntelligentCommand {
     /**
      * 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
      */
     public void proxySendLine(final FrameContainer target,
-            final boolean isSilent, final String type, final Object ... args) {
+            final boolean isSilent, final String type, final Object... args) {
         sendLine(target, isSilent, type, args);
     }
 
     /**
      * 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
      */
     public void proxyShowUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
@@ -130,12 +128,12 @@ public class Debug extends Command implements IntelligentCommand {
     }
 
     /**
-     * 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
      */
     public String proxyDoTable(final String[] headers, final String[][] data) {

src/com/dmdirc/addons/debug/DebugCommand.java

@@ -36,10 +36,8 @@ public abstract class DebugCommand {
 
     /** The format name used for command output. */
     public static final String FORMAT_OUTPUT = "commandOutput";
-
     /** The format name used for command errors. */
     public static final String FORMAT_ERROR = "commandError";
-
     /** Parent debug command. */
     private final Provider<Debug> commandProvider;
 
@@ -62,14 +60,14 @@ public abstract class DebugCommand {
     /**
      * 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>
@@ -82,8 +80,8 @@ public abstract class DebugCommand {
     /**
      * 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
      */
     public abstract void execute(final FrameContainer origin,
@@ -92,23 +90,23 @@ public abstract class DebugCommand {
     /**
      * 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
      */
     public void sendLine(final FrameContainer target,
-            final boolean isSilent, final String type, final Object ... args) {
+            final boolean isSilent, final String type, final Object... args) {
         commandProvider.get().proxySendLine(target, isSilent, type, args);
     }
 
     /**
      * 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
      */
     public void showUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
@@ -116,15 +114,16 @@ public abstract class DebugCommand {
     }
 
     /**
-     * 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
      */
     public String doTable(final String[] headers, final String[][] data) {
         return commandProvider.get().proxyDoTable(headers, data);
     }
+
 }

src/com/dmdirc/addons/debug/DebugModule.java

@@ -53,60 +53,98 @@ import dagger.Provides;
 public class DebugModule {
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Benchmark command) { return command; }
+    public DebugCommand getCommand(final Benchmark command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ColourSpam command) { return command; }
+    public DebugCommand getCommand(final ColourSpam command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ConfigInfo command) { return command; }
+    public DebugCommand getCommand(final ConfigInfo command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final FakeError command) { return command; }
+    public DebugCommand getCommand(final FakeError command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final FakeUpdates command) { return command; }
+    public DebugCommand getCommand(final FakeUpdates command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final FirstRun command) { return command; }
+    public DebugCommand getCommand(final FirstRun command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ForceUpdate command) { return command; }
+    public DebugCommand getCommand(final ForceUpdate command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final GlobalConfigInfo command) { return command; }
+    public DebugCommand getCommand(final GlobalConfigInfo command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Identities command) { return command; }
+    public DebugCommand getCommand(final Identities command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final MemInfo command) { return command; }
+    public DebugCommand getCommand(final MemInfo command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Notify command) { return command; }
+    public DebugCommand getCommand(final Notify command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final RunGC command) { return command; }
+    public DebugCommand getCommand(final RunGC command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ServerInfo command) { return command; }
+    public DebugCommand getCommand(final ServerInfo command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ServerState command) { return command; }
+    public DebugCommand getCommand(final ServerState command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Services command) { return command; }
+    public DebugCommand getCommand(final Services command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final ShowRaw command) { return command; }
+    public DebugCommand getCommand(final ShowRaw command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final StatusbarMessage command) { return command; }
+    public DebugCommand getCommand(final StatusbarMessage command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Threads command) { return command; }
+    public DebugCommand getCommand(final Threads command) {
+        return command;
+    }
 
     @Provides(type = Provides.Type.SET)
-    public DebugCommand getCommand(final Time command) { return command; }
+    public DebugCommand getCommand(final Time command) {
+        return command;
+    }
 
 }

src/com/dmdirc/addons/debug/commands/Benchmark.java

@@ -32,8 +32,8 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 /**
- * Textpane speed benchmark, outputs a large volume of text and times the amount
- * of time it takes the textpane to draw this.
+ * Textpane speed benchmark, outputs a large volume of text and times the amount of time it takes
+ * the textpane to draw this.
  */
 public class Benchmark extends DebugCommand {
 
@@ -83,4 +83,5 @@ public class Benchmark extends DebugCommand {
                     + " nanoseconds.");
         }
     }
+
 }

src/com/dmdirc/addons/debug/commands/FakeError.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.addons.debug.commands;
 
 import com.dmdirc.FrameContainer;

src/com/dmdirc/addons/debug/commands/FakeUpdates.java

@@ -60,7 +60,7 @@ public class FakeUpdates extends DebugCommand {
      * Creates a new instance of the command.
      *
      * @param commandProvider The provider to use to access the main debug command.
-     * @param updateManager The update manager to add fake updates to.
+     * @param updateManager   The update manager to add fake updates to.
      */
     @Inject
     public FakeUpdates(
@@ -112,6 +112,7 @@ public class FakeUpdates extends DebugCommand {
 
             return res;
         }
+
     }
 
     /**
@@ -142,8 +143,10 @@ public class FakeUpdates extends DebugCommand {
             super(FakeUpdateCheckResult.class);
         }
 
-        protected void fireRetrievalProgressChanged(final UpdateComponent component, final double progress) {
-            listeners.getCallable(UpdateRetrievalListener.class).retrievalProgressChanged(component, progress);
+        protected void fireRetrievalProgressChanged(final UpdateComponent component,
+                final double progress) {
+            listeners.getCallable(UpdateRetrievalListener.class).retrievalProgressChanged(component,
+                    progress);
         }
 
         protected void fireRetrievalFailed(final UpdateComponent component) {
@@ -204,7 +207,7 @@ public class FakeUpdates extends DebugCommand {
          * Creates a new fake retrieval result.
          *
          * @param checkResult The check result that was retrieved
-         * @param success Whether the result is successful or not
+         * @param success     Whether the result is successful or not
          */
         public FakeRetrievalResult(final UpdateCheckResult checkResult,
                 final boolean success) {
@@ -236,8 +239,10 @@ public class FakeUpdates extends DebugCommand {
             listeners.getCallable(UpdateInstallationListener.class).installFailed(component);
         }
 
-        protected void fireInstallProgressChanged(final UpdateComponent component, final double progress) {
-            listeners.getCallable(UpdateInstallationListener.class).installProgressChanged(component, progress);
+        protected void fireInstallProgressChanged(final UpdateComponent component,
+                final double progress) {
+            listeners.getCallable(UpdateInstallationListener.class).
+                    installProgressChanged(component, progress);
         }
 
         @Override

src/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -46,7 +46,7 @@ public class FirstRun extends DebugCommand {
      * Creates a new instance of the command.
      *
      * @param commandProvider The provider to use to access the main debug command.
-     * @param pluginManager The plugin manager to use to hackily poke the Swing UI.
+     * @param pluginManager   The plugin manager to use to hackily poke the Swing UI.
      */
     @Inject
     public FirstRun(final Provider<Debug> commandProvider, final PluginManager pluginManager) {

src/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -52,10 +52,10 @@ public class ForceUpdate extends DebugCommand {
     /**
      * Creates a new instance of the command.
      *
-     * @param commandProvider The provider to use to access the main debug command.
-     * @param globalConfig The global config to use to check if updates are enabled.
+     * @param commandProvider    The provider to use to access the main debug command.
+     * @param globalConfig       The global config to use to check if updates are enabled.
      * @param identityController The controller to use to read/write settings for the updater.
-     * @param updateManager The update manager to use when forcing an update.
+     * @param updateManager      The update manager to use when forcing an update.
      */
     @Inject
     public ForceUpdate(

src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java

@@ -46,7 +46,7 @@ public class GlobalConfigInfo extends DebugCommand {
      * Creates a new instance of the command.
      *
      * @param commandProvider The provider to use to access the main debug command.
-     * @param globalConfig The global config to retrieve sources for.
+     * @param globalConfig    The global config to retrieve sources for.
      */
     @Inject
     public GlobalConfigInfo(

src/com/dmdirc/addons/debug/commands/Identities.java

@@ -47,7 +47,7 @@ public class Identities extends DebugCommand {
      * Creates a new instance of the command.
      *
      * @param commandProvider The provider to use to access the main debug command.
-     * @param controller The controller to read identities from.
+     * @param controller      The controller to read identities from.
      */
     @Inject
     public Identities(final Provider<Debug> commandProvider, final IdentityController controller) {
@@ -86,8 +86,8 @@ public class Identities extends DebugCommand {
         int i = 0;
         for (ConfigProvider source : identities) {
             data[i++] = new String[]{source.getName(),
-            source.getTarget().getTypeName(), source.getTarget().getData(),
-            String.valueOf(source.getTarget().getOrder())};
+                source.getTarget().getTypeName(), source.getTarget().getData(),
+                String.valueOf(source.getTarget().getOrder())};
         }
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

src/com/dmdirc/addons/debug/commands/Services.java

@@ -48,7 +48,7 @@ public class Services extends DebugCommand implements IntelligentCommand {
      * Creates a new instance of the command.
      *
      * @param commandProvider The provider to use to access the main debug command.
-     * @param serviceManager The service manager to get services from.
+     * @param serviceManager  The service manager to get services from.
      */
     @Inject
     public Services(final Provider<Debug> commandProvider, final ServiceManager serviceManager) {

src/com/dmdirc/addons/debug/commands/StatusbarMessage.java

@@ -42,16 +42,15 @@ public class StatusbarMessage extends DebugCommand {
 
     /** The status bar manager to show messages in. */
     private final StatusBarManager statusBarManager;
-
     /** The global configuration. */
     private final AggregateConfigProvider globalConfig;
 
     /**
      * Creates a new instance of the command.
      *
-     * @param commandProvider The provider to use to access the main debug command.
+     * @param commandProvider  The provider to use to access the main debug command.
      * @param statusBarManager The status bar manager to show messages in.
-     * @param globalConfig The global configuration to use.
+     * @param globalConfig     The global configuration to use.
      */
     @Inject
     public StatusbarMessage(
@@ -83,4 +82,5 @@ public class StatusbarMessage extends DebugCommand {
         statusBarManager.setMessage(new StatusMessage(null,
                 "Test: " + args.getArgumentsAsString(), null, 5, globalConfig));
     }
+
 }

src/com/dmdirc/addons/debug/commands/Time.java

@@ -74,7 +74,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
      *
      * @param origin The origin of the command
      * @param window The window to be passed on to the timed command, if any
-     * @param args The arguments that were passed to the command
+     * @param args   The arguments that were passed to the command
      */
     private void doTime(final FrameContainer origin,
             final CommandArguments args) {
@@ -84,8 +84,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
         }
 
         if (origin instanceof WritableFrameContainer) {
-            final WritableFrameContainer container
-                    = (WritableFrameContainer) origin;
+            final WritableFrameContainer container = (WritableFrameContainer) origin;
             final long start = System.currentTimeMillis();
             container.getCommandParser().parseCommand(origin,
                     args.getArgumentsAsString(0));

src/com/dmdirc/addons/exec/ExecCommand.java

@@ -70,10 +70,10 @@ public class ExecCommand extends Command {
             // (if necessary). Without this /exec "command arg1 arg2 would error.
             if (commandArray.length == 0) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                       "Could not execute: Invalid file name provided");
+                        "Could not execute: Invalid file name provided");
             } else if (!new File(commandArray[0]).exists()) {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
-                       "Could not execute: " + commandArray[0] + " does not exist.");
+                        "Could not execute: " + commandArray[0] + " does not exist.");
             } else {
                 final Process p = Runtime.getRuntime().exec(commandArray);
                 final List<String> execOutput = args.isSilent()
@@ -81,9 +81,9 @@ public class ExecCommand extends Command {
                 final List<String> errorOutput = args.isSilent()
                         ? null : new LinkedList<String>();
                 final StreamReader inputReader = new StreamReader(
-                            p.getInputStream(), execOutput);
+                        p.getInputStream(), execOutput);
                 final StreamReader errorReader = new StreamReader(
-                            p.getErrorStream(), errorOutput);
+                        p.getErrorStream(), errorOutput);
 
                 inputReader.run();
                 errorReader.run();
@@ -101,4 +101,5 @@ public class ExecCommand extends Command {
                     + ex.getMessage(), ex);
         }
     }
+
 }

src/com/dmdirc/addons/exec/ExecPlugin.java

@@ -39,4 +39,5 @@ public class ExecPlugin extends BaseCommandPlugin {
         super(commandController);
         registerCommand(new ExecCommand(commandController), ExecCommand.INFO);
     }
+
 }

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

@@ -31,8 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
 /**
- * The FDNotify Command shows a nice popup on using the FreeDesktop
- * VisualNotifications.
+ * The FDNotify Command shows a nice popup on using the FreeDesktop VisualNotifications.
  */
 public final class FDNotifyCommand extends Command {
 
@@ -47,16 +46,18 @@ public final class FDNotifyCommand extends Command {
      * Creates a new instance of FDNotifyCommand.
      *
      * @param controller The controller to use for command information.
-     * @param myPlugin the plugin creating this command.
+     * @param myPlugin   the plugin creating this command.
      */
-    public FDNotifyCommand(final CommandController controller, final FreeDesktopNotificationsPlugin myPlugin) {
+    public FDNotifyCommand(final CommandController controller,
+            final FreeDesktopNotificationsPlugin myPlugin) {
         super(controller);
         this.myPlugin = myPlugin;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final FrameContainer origin, final CommandArguments args, final CommandContext context) {
+    public void execute(final FrameContainer origin, final CommandArguments args,
+            final CommandContext context) {
         new Thread() {
             /** {@inheritDoc} */
             @Override
@@ -65,4 +66,5 @@ public final class FDNotifyCommand extends Command {
             }
         }.start();
     }
+
 }

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

@@ -49,7 +49,8 @@ import org.apache.commons.lang.StringEscapeUtils;
 /**
  * This plugin adds freedesktop Style Notifications to dmdirc.
  */
-public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements ConfigChangeListener {
+public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
+        ConfigChangeListener {
 
     /** notification timeout. */
     private int timeout;
@@ -73,9 +74,9 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
     /**
      * Creates a new instance of this plugin.
      *
-     * @param pluginInfo This plugin's plugin info
+     * @param pluginInfo         This plugin's plugin info
      * @param identityController Identity Manager instance
-     * @param commandController Command controller to register commands
+     * @param commandController  Command controller to register commands
      */
     public FreeDesktopNotificationsPlugin(final PluginInfo pluginInfo,
             final IdentityController identityController,
@@ -91,8 +92,9 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
     /**
      * Used to show a notification using this plugin.
      *
-     * @param title Title of dialog if applicable
+     * @param title   Title of dialog if applicable
      * @param message Message to show
+     *
      * @return True if the notification was shown.
      */
     @Exported
@@ -141,6 +143,7 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
      * Prepare the string for sending to dbus.
      *
      * @param input Input string
+     *
      * @return Input string after being processed according to config settings.
      */
     public String prepareString(final String input) {
@@ -173,7 +176,8 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
             filesHelper.extractResoucesEndingWith(".py");
             filesHelper.extractResoucesEndingWith(".png");
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for Free desktop notifications: " + ex.getMessage(), ex);
+            Logger.userError(ErrorLevel.MEDIUM,
+                    "Unable to extract files for Free desktop notifications: " + ex.getMessage(), ex);
         }
         super.onLoad();
     }
@@ -238,4 +242,5 @@ public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements
     public void configChanged(final String domain, final String key) {
         setCachedSettings();
     }
+
 }

src/com/dmdirc/addons/identd/IdentClient.java

@@ -42,25 +42,21 @@ public class IdentClient implements Runnable {
 
     /** The IdentdServer that owns this Client. */
     private final IdentdServer myServer;
-
     /** The Socket that we are in charge of. */
     private final Socket mySocket;
-
     /** The Thread in use for this client. */
     private volatile Thread myThread;
-
     /** The plugin that owns us. */
     private final IdentdPlugin myPlugin;
-
     /** Server manager. */
     private final ServerManager serverManager;
 
     /**
      * Create the IdentClient.
      *
-     * @param server The server that owns this
-     * @param socket The socket we are handing
-     * @param plugin Parent plugin
+     * @param server        The server that owns this
+     * @param socket        The socket we are handing
+     * @param plugin        Parent plugin
      * @param serverManager Server manager to retrieve servers from
      */
     public IdentClient(final IdentdServer server, final Socket socket,
@@ -107,11 +103,12 @@ public class IdentClient implements Runnable {
     }
 
     /**
-     * Get the ident response for a given line.
-     * Complies with rfc1413 (http://www.faqs.org/rfcs/rfc1413.html)
+     * Get the ident response for a given line. Complies with rfc1413
+     * (http://www.faqs.org/rfcs/rfc1413.html)
      *
-     * @param input Line to generate response for
+     * @param input  Line to generate response for
      * @param config The config manager to use for settings
+     *
      * @return the ident response for the given line
      */
     protected String getIdentResponse(final String input, final AggregateConfigProvider config) {
@@ -126,7 +123,8 @@ public class IdentClient implements Runnable {
             myPort = Integer.parseInt(bits[0].trim());
             theirPort = Integer.parseInt(bits[1].trim());
         } catch (NumberFormatException e) {
-            return String.format("%s , %s : ERROR : X-INVALID-INPUT", escapeString(bits[0]), escapeString(bits[1]));
+            return String.format("%s , %s : ERROR : X-INVALID-INPUT", escapeString(bits[0]),
+                    escapeString(bits[1]));
         }
 
         if (myPort > 65535 || myPort < 1 || theirPort > 65535 || theirPort < 1) {
@@ -134,7 +132,8 @@ public class IdentClient implements Runnable {
         }
 
         final Connection connection = getConnectionByPort(myPort);
-        if (!config.getOptionBool(myPlugin.getDomain(), "advanced.alwaysOn") && (connection == null || config.getOptionBool(myPlugin.getDomain(), "advanced.isNoUser"))) {
+        if (!config.getOptionBool(myPlugin.getDomain(), "advanced.alwaysOn") && (connection == null
+                || config.getOptionBool(myPlugin.getDomain(), "advanced.isNoUser"))) {
             return String.format("%d , %d : ERROR : NO-USER", myPort, theirPort);
         }
 
@@ -147,7 +146,8 @@ public class IdentClient implements Runnable {
         final String username;
 
         final String customSystem = config.getOption(myPlugin.getDomain(), "advanced.customSystem");
-        if (config.getOptionBool(myPlugin.getDomain(), "advanced.useCustomSystem") && customSystem != null && customSystem.length() > 0 && customSystem.length() < 513) {
+        if (config.getOptionBool(myPlugin.getDomain(), "advanced.useCustomSystem") && customSystem
+                != null && customSystem.length() > 0 && customSystem.length() < 513) {
             os = customSystem;
         } else {
             // Tad excessive maybe, but complete!
@@ -173,23 +173,28 @@ public class IdentClient implements Runnable {
         }
 
         final String customName = config.getOption(myPlugin.getDomain(), "general.customName");
-        if (config.getOptionBool(myPlugin.getDomain(), "general.useCustomName") && customName != null && customName.length() > 0 && customName.length() < 513) {
+        if (config.getOptionBool(myPlugin.getDomain(), "general.useCustomName") && customName
+                != null && customName.length() > 0 && customName.length() < 513) {
             username = customName;
-        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(), "general.useNickname")) {
+        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(),
+                "general.useNickname")) {
             username = connection.getParser().getLocalClient().getNickname();
-        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(), "general.useUsername")) {
+        } else if (connection != null && config.getOptionBool(myPlugin.getDomain(),
+                "general.useUsername")) {
             username = connection.getParser().getLocalClient().getUsername();
         } else {
             username = System.getProperty("user.name");
         }
 
-        return String.format("%d , %d : USERID : %s : %s", myPort, theirPort, escapeString(os), escapeString(username));
+        return String.format("%d , %d : USERID : %s : %s", myPort, theirPort, escapeString(os),
+                escapeString(username));
     }
 
     /**
      * Escape special chars.
      *
      * @param str String to escape
+     *
      * @return Escaped string.
      */
     public static String escapeString(final String str) {
@@ -200,6 +205,7 @@ public class IdentClient implements Runnable {
      * Unescape special chars.
      *
      * @param str String to escape
+     *
      * @return Escaped string.
      */
     public static String unescapeString(final String str) {
@@ -224,6 +230,7 @@ public class IdentClient implements Runnable {
      * Retrieves the server that is bound to the specified local port.
      *
      * @param port Port to check for
+     *
      * @return The server instance listening on the given port
      */
     protected Connection getConnectionByPort(final int port) {
@@ -236,4 +243,3 @@ public class IdentClient implements Runnable {
     }
 
 }
-

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -63,10 +63,10 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     /**
      * Creates a new instance of this plugin.
      *
-     * @param pluginInfo This plugin's plugin info
-     * @param actionController The action controller to register listeners with
+     * @param pluginInfo         This plugin's plugin info
+     * @param actionController   The action controller to register listeners with
      * @param identityController Identity manager to get settings from
-     * @param serverManager Server manager to retrieve servers from
+     * @param serverManager      Server manager to retrieve servers from
      */
     public IdentdPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
@@ -114,8 +114,8 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     /**
      * Process an event of the specified type.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
      * @param arguments The arguments for the event
      */
     @Override
@@ -146,31 +146,31 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
                 pluginInfo, "Identd",
-                "General Identd Plugin config ('Lower' options take priority " +
-                "over those above them)");
+                "General Identd Plugin config ('Lower' options take priority "
+                + "over those above them)");
         final PreferencesCategory advanced = new PluginPreferencesCategory(
                 pluginInfo, "Advanced",
-                "Advanced Identd Plugin config - Only edit these if you need " +
-                "to/know what you are doing. Editing these could prevent " +
-                "access to some servers. ('Lower' options take priority over " +
-                "those above them)");
+                "Advanced Identd Plugin config - Only edit these if you need "
+                + "to/know what you are doing. Editing these could prevent "
+                + "access to some servers. ('Lower' options take priority over "
+                + "those above them)");
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useUsername", "Use connection " +
-                "username rather than system username", "If this is enabled," +
-                " the username for the connection will be used rather than " +
-                "'" + System.getProperty("user.name") + "'",
+                getDomain(), "general.useUsername", "Use connection "
+                + "username rather than system username", "If this is enabled,"
+                + " the username for the connection will be used rather than " + "'" + System.
+                getProperty("user.name") + "'",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useNickname", "Use connection " +
-                "nickname rather than system username", "If this is enabled, " +
-                "the nickname for the connection will be used rather than " +
-                "'" + System.getProperty("user.name") + "'",
+                getDomain(), "general.useNickname", "Use connection "
+                + "nickname rather than system username", "If this is enabled, "
+                + "the nickname for the connection will be used rather than " + "'" + System.
+                getProperty("user.name") + "'",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "general.useCustomName", "Use custom name" +
-                " all the time", "If this is enabled, the name specified below" +
-                " will be used all the time", manager.getConfigManager(),
+                getDomain(), "general.useCustomName", "Use custom name" + " all the time",
+                "If this is enabled, the name specified below" + " will be used all the time",
+                manager.getConfigManager(),
                 manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "general.customName", "Custom Name to use",
@@ -178,36 +178,36 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
                 manager.getConfigManager(), manager.getIdentity()));
 
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.alwaysOn", "Always have ident " +
-                "port open", "By default the identd only runs when there are " +
-                "active connection attempts. This overrides that.",
+                getDomain(), "advanced.alwaysOn", "Always have ident " + "port open",
+                "By default the identd only runs when there are "
+                + "active connection attempts. This overrides that.",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 new PortValidator(), getDomain(), "advanced.port",
-                "What port should the identd listen on", "Default port is 113," +
-                " this is probably useless if changed unless you port forward" +
-                " ident to a different port", manager.getConfigManager(),
+                "What port should the identd listen on", "Default port is 113,"
+                + " this is probably useless if changed unless you port forward"
+                + " ident to a different port", manager.getConfigManager(),
                 manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "advanced.useCustomSystem", "Use custom OS",
-                "By default the plugin uses 'UNIX' or 'WIN32' as the system " +
-                "type, this can be overriden by enabling this.",
+                "By default the plugin uses 'UNIX' or 'WIN32' as the system "
+                + "type, this can be overriden by enabling this.",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.TEXT,
                 getDomain(), "advanced.customSystem", "Custom OS to use",
                 "The custom system to use when 'Use Custom System' is enabled",
                 manager.getConfigManager(), manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.isHiddenUser", "Respond to ident" +
-                " requests with HIDDEN-USER error", "By default the plugin will" +
-                " give a USERID response, this can force an 'ERROR :" +
-                " HIDDEN-USER' response instead.", manager.getConfigManager(),
+                getDomain(), "advanced.isHiddenUser", "Respond to ident"
+                + " requests with HIDDEN-USER error", "By default the plugin will"
+                + " give a USERID response, this can force an 'ERROR :"
+                + " HIDDEN-USER' response instead.", manager.getConfigManager(),
                 manager.getIdentity()));
         advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "advanced.isNoUser", "Respond to ident" +
-                " requests with NO-USER error", "By default the plugin will" +
-                " give a USERID response, this can force an 'ERROR : NO-USER'" +
-                " response instead. (Overrides HIDDEN-USER)",
+                getDomain(), "advanced.isNoUser", "Respond to ident"
+                + " requests with NO-USER error", "By default the plugin will"
+                + " give a USERID response, this can force an 'ERROR : NO-USER'"
+                + " response instead. (Overrides HIDDEN-USER)",
                 manager.getConfigManager(), manager.getIdentity()));
 
         manager.getCategory("Plugins").addSubCategory(general);

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -39,26 +39,21 @@ public final class IdentdServer implements Runnable {
 
     /** The Thread in use for this server */
     private volatile Thread myThread = null;
-
     /** The current socket in use for this server */
     private ServerSocket serverSocket;
-
     /** Arraylist of all the clients we have */
     private final List<IdentClient> clientList = new ArrayList<>();
-
     /** The plugin that owns us. */
     private final IdentdPlugin myPlugin;
-
     /** Server manager. */
     private final ServerManager serverManager;
-
     /** Have we failed to start this server previously? */
     private boolean failed = false;
 
     /**
      * Create the IdentdServer.
      *
-     * @param plugin Parent ident plugin
+     * @param plugin        Parent ident plugin
      * @param serverManager Server manager to iterate over servers
      */
     public IdentdServer(final IdentdPlugin plugin, final ServerManager serverManager) {
@@ -76,7 +71,8 @@ public final class IdentdServer implements Runnable {
         while (myThread == thisThread) {
             try {
                 final Socket clientSocket = serverSocket.accept();
-                final IdentClient client = new IdentClient(this, clientSocket, myPlugin, serverManager);
+                final IdentClient client = new IdentClient(this, clientSocket, myPlugin,
+                        serverManager);
                 client.start();
                 addClient(client);
             } catch (IOException e) {
@@ -135,7 +131,9 @@ public final class IdentdServer implements Runnable {
                 myThread = new Thread(this);
                 myThread.start();
             } catch (IOException e) {
-                Logger.userError(ErrorLevel.HIGH, "Unable to start identd server: " + e.getMessage());
+                Logger.
+                        userError(ErrorLevel.HIGH, "Unable to start identd server: " + e.
+                        getMessage());
                 if (e.getMessage().equals("Permission denied")) {
                     failed = true;
                 }
@@ -168,4 +166,3 @@ public final class IdentdServer implements Runnable {
     }
 
 }
-

src/com/dmdirc/addons/lagdisplay/LagDisplayPanel.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.addons.lagdisplay;
 
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupPanel;
@@ -29,16 +30,16 @@ import javax.inject.Singleton;
 import javax.swing.JLabel;
 
 /**
- * Shows the user's lag in the status bar, and reveals details of all servers
- * when the user hovers over it.
+ * Shows the user's lag in the status bar, and reveals details of all servers when the user hovers
+ * over it.
  */
 @Singleton
 public class LagDisplayPanel extends StatusbarPopupPanel<JLabel> {
 
     /**
-     * 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 = 2;
     /** Factory of dialogs. */
@@ -60,4 +61,5 @@ public class LagDisplayPanel extends StatusbarPopupPanel<JLabel> {
     protected StatusbarPopupWindow getWindow() {
         return dialogFactory.getServerInfoDialog(this);
     }
+
 }

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

@@ -127,10 +127,11 @@ public final class LagDisplayPlugin extends BasePlugin implements
     }
 
     /**
-     * Retrieves the history of the specified server. If there is no history,
-     * a new list is added to the history map and returned.
+     * Retrieves the history of the specified server. If there is no history, a new list is added to
+     * the history map and returned.
      *
      * @param connection The connection whose history is being requested
+     *
      * @return The history for the specified server
      */
     protected RollingList<Long> getHistory(final Connection connection) {
@@ -141,8 +142,8 @@ public final class LagDisplayPlugin extends BasePlugin implements
     }
 
     /**
-     * Determines if the {@link ServerInfoDialog} should show a graph of the
-     * ping time for the current server.
+     * Determines if the {@link ServerInfoDialog} should show a graph of the ping time for the
+     * current server.
      *
      * @return True if a graph should be shown, false otherwise
      */
@@ -151,8 +152,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
     }
 
     /**
-     * Determines if the {@link PingHistoryPanel} should show labels on
-     * selected points.
+     * Determines if the {@link PingHistoryPanel} should show labels on selected points.
      *
      * @return True if labels should be shown, false otherwise
      */
@@ -225,7 +225,8 @@ public final class LagDisplayPlugin extends BasePlugin implements
 
             panel.refreshDialog();
         } else if (useAlternate && type.equals(CoreActionType.SERVER_PINGSENT)) {
-            ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().getTime());
+            ((Connection) arguments[0]).getParser().sendRawMessage("LAGCHECK_" + new Date().
+                    getTime());
         } else if (useAlternate && type.equals(CoreActionType.SERVER_NUMERIC)
                 && ((Integer) arguments[1]) == 421
                 && ((String[]) arguments[2])[3].startsWith("LAGCHECK_")) {
@@ -256,6 +257,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
      * Retrieves the ping time for the specified connection.
      *
      * @param connection The connection whose ping time is being requested
+     *
      * @return A String representation of the current lag, or "Unknown"
      */
     public String getTime(final Connection connection) {
@@ -264,7 +266,9 @@ public final class LagDisplayPlugin extends BasePlugin implements
 
     /**
      * Formats the specified time so it's a nice size to display in the label.
+     *
      * @param object An uncast Long representing the time to be formatted
+     *
      * @return Formatted time string
      */
     protected String formatTime(final Object object) {
@@ -288,16 +292,16 @@ public final class LagDisplayPlugin extends BasePlugin implements
                 + "lag which bypasses bouncers or proxies that may reply?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "graph", "Show graph", "Show a graph of ping times " +
-                "for the current server in the information popup?",
+                getDomain(), "graph", "Show graph", "Show a graph of ping times "
+                + "for the current server in the information popup?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                getDomain(), "labels", "Show labels", "Show labels on selected " +
-                "points on the ping graph?",
+                getDomain(), "labels", "Show labels", "Show labels on selected "
+                + "points on the ping graph?",
                 manager.getConfigManager(), manager.getIdentity()));
         cat.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
-                getDomain(), "history", "Graph points", "Number of data points " +
-                "to plot on the graph, if enabled.",
+                getDomain(), "history", "Graph points", "Number of data points "
+                + "to plot on the graph, if enabled.",
                 manager.getConfigManager(), manager.getIdentity()));
         manager.getCategory("Plugins").addSubCategory(cat);
     }
@@ -307,4 +311,5 @@ public final class LagDisplayPlugin extends BasePlugin implements
     public void configChanged(final String domain, final String key) {
         readConfig();
     }
+
 }

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

@@ -42,25 +42,22 @@ import javax.swing.JPanel;
 public class PingHistoryPanel extends JPanel {
 
     /**
-     * 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 plugin that this panel is for. */
     protected final LagDisplayPlugin plugin;
-
     /** The history that we're graphing. */
     protected final RollingList<Long> history;
-
     /** The maximum ping value. */
     protected long maximum = 0L;
 
     /**
      * Creates a new history panel for the specified plugin.
      *
-     * @param plugin The plugin that owns this panel
+     * @param plugin    The plugin that owns this panel
      * @param mainFrame Swing main frame
      */
     public PingHistoryPanel(final LagDisplayPlugin plugin,

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

@@ -44,12 +44,11 @@ import javax.swing.JSeparator;
 public class ServerInfoDialog extends StatusbarPopupWindow {
 
     /**
-     * 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 = 3;
-
     /** The lag display plugin. */
     protected final LagDisplayPlugin plugin;
     /** Swing main frame. */
@@ -60,9 +59,9 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
     /**
      * Creates a new ServerInfoDialog.
      *
-     * @param plugin The {@link LagDisplayPlugin} we're using for info
-     * @param parent The {@link JPanel} to use for positioning
-     * @param mainFrame The frame that will own this dialog.
+     * @param plugin        The {@link LagDisplayPlugin} we're using for info
+     * @param parent        The {@link JPanel} to use for positioning
+     * @param mainFrame     The frame that will own this dialog.
      * @param serverManager The manager to use to iterate servers.
      */
     public ServerInfoDialog(
@@ -100,5 +99,4 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
         }
     }
 
-
 }

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

@@ -38,11 +38,11 @@ public class HistoryWindow extends FrameContainer {
     /**
      * Creates a new HistoryWindow.
      *
-     * @param title The title of the window
-     * @param reader The reader to use to get the history
-     * @param parent The window this history window was opened from
+     * @param title      The title of the window
+     * @param reader     The reader to use to get the history
+     * @param parent     The window this history window was opened from
      * @param urlBuilder The URL builder to use when finding icons.
-     * @param numLines The number of lines to show
+     * @param numLines   The number of lines to show
      */
     public HistoryWindow(
             final String title,

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

@@ -50,7 +50,7 @@ public class LoggingCommand extends Command implements IntelligentCommand {
      * Creates a new instance of this command.
      *
      * @param controller The controller to use for command information.
-     * @param plugin The plugin providing logging services.
+     * @param plugin     The plugin providing logging services.
      */
     public LoggingCommand(final CommandController controller, final LoggingPlugin plugin) {
         super(controller);
@@ -64,17 +64,23 @@ public class LoggingCommand extends Command implements IntelligentCommand {
         if (args.getArguments().length > 0) {
             if (args.getArguments()[0].equalsIgnoreCase("history")) {
                 if (!plugin.showHistory(origin)) {
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to open history for this window.");
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                            "Unable to open history for this window.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("help")) {
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING + " reload           - Reload the logging plugin.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING + " history          - Open the history of this window, if available.");
-                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING + " help             - Show this help.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING
+                        + " reload           - Reload the logging plugin.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING
+                        + " history          - Open the history of this window, if available.");
+                sendLine(origin, args.isSilent(), FORMAT_OUTPUT, LOGGING
+                        + " help             - Show this help.");
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown command '" + args.getArguments()[0] + "'. Use " + LOGGING + " help for a list of commands.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unknown command '" + args.
+                        getArguments()[0] + "'. Use " + LOGGING + " help for a list of commands.");
             }
         } else {
-            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Use " + LOGGING + " help for a list of commands.");
+            sendLine(origin, args.isSilent(), FORMAT_ERROR, "Use " + LOGGING
+                    + " help for a list of commands.");
         }
     }
 
@@ -91,5 +97,5 @@ public class LoggingCommand extends Command implements IntelligentCommand {
         }
         return res;
     }
-}
 
+}

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

@@ -89,17 +89,14 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     private boolean autobackbuffer;
     private boolean backbufferTimestamp;
     private boolean usedate;
-
     /** Cached string settings. */
     private String timestamp;
     private String usedateformat;
     private String logDirectory;
     private String colour;
-
     /** Cached int settings. */
     private int historyLines;
     private int backbufferLines;
-
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** The action controller to use. */
@@ -112,14 +109,11 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     private final IdentityController identityController;
     /** The manager to add history windows to. */
     private final WindowManager windowManager;
-
     /** Timer used to close idle files. */
     protected Timer idleFileTimer;
-
     /** Map of open files. */
-    protected final Map<String, OpenFile> openFiles
-            = Collections.synchronizedMap(new HashMap<String, OpenFile>());
-
+    protected final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
+            new HashMap<String, OpenFile>());
     /** Date format used for "File Opened At" log. */
     final DateFormat openedAtFormat = new SimpleDateFormat("EEEE MMMM dd, yyyy - HH:mm:ss");
     private final URLBuilder urlBuilder;
@@ -127,12 +121,12 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Creates a new instance of this plugin.
      *
-     * @param pluginInfo This plugin's plugin info
-     * @param actionController The action controller to register listeners with
+     * @param pluginInfo         This plugin's plugin info
+     * @param actionController   The action controller to register listeners with
      * @param identityController The Identity Manager that controls the current config
-     * @param commandController Command controller to register commands
-     * @param windowManager The manager to add history windows to.
-     * @param urlBuilder The URL builder to use when finding icons.
+     * @param commandController  Command controller to register commands
+     * @param windowManager      The manager to add history windows to.
+     * @param urlBuilder         The URL builder to use when finding icons.
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
@@ -157,7 +151,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     @Override
     public void domainUpdated() {
         identity.setOption(getDomain(), "general.directory",
-                identityController.getConfigurationDirectory() + "logs" + System.getProperty("file.separator"));
+                identityController.getConfigurationDirectory() + "logs" + System.getProperty(
+                "file.separator"));
     }
 
     /**
@@ -170,7 +165,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         final File dir = new File(logDirectory);
         if (dir.exists()) {
             if (!dir.isDirectory()) {
-                Logger.userError(ErrorLevel.LOW, "Unable to create logging dir (file exists instead)");
+                Logger.userError(ErrorLevel.LOW,
+                        "Unable to create logging dir (file exists instead)");
             }
         } else {
             if (!dir.mkdirs()) {
@@ -205,13 +201,11 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         // Close idle files every hour.
         idleFileTimer = new Timer("LoggingPlugin Timer");
         idleFileTimer.schedule(new TimerTask() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
                 timerTask();
             }
-
         }, 3600000);
         super.onLoad();
     }
@@ -266,7 +260,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         final PreferencesCategory backbuffer = new PluginPreferencesCategory(
                 pluginInfo, "Back Buffer", "Options related to the automatic backbuffer");
         final PreferencesCategory advanced = new PluginPreferencesCategory(
-                pluginInfo, "Advanced", "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
+                pluginInfo, "Advanced",
+                "Advanced configuration for Logging plugin. You shouldn't need to edit this unless you know what you are doing.");
 
         general.addSetting(new PreferencesSetting(PreferencesType.DIRECTORY,
                 getDomain(), "general.directory", "Directory",
@@ -337,14 +332,16 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Log a query-related event.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
      * @param arguments The arguments for the event
      */
-    protected void handleQueryEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
+    protected void handleQueryEvent(final CoreActionType type, final StringBuffer format,
+            final Object... arguments) {
         final Query query = (Query) arguments[0];
         if (query.getConnection() == null) {
-            Logger.appError(ErrorLevel.MEDIUM, "Query object has no server (" + type.toString() + ")", new Exception("Query object has no server (" + type.toString() + ")"));
+            Logger.appError(ErrorLevel.MEDIUM, "Query object has no server (" + type.toString()
+                    + ")", new Exception("Query object has no server (" + type.toString() + ")"));
             return;
         }
 
@@ -385,13 +382,17 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             case QUERY_SELF_MESSAGE:
             case QUERY_ACTION:
             case QUERY_SELF_ACTION:
-                final boolean isME = (type == CoreActionType.QUERY_SELF_MESSAGE || type == CoreActionType.QUERY_SELF_ACTION);
+                final boolean isME = (type == CoreActionType.QUERY_SELF_MESSAGE || type
+                        == CoreActionType.QUERY_SELF_ACTION);
                 final String overrideNick = isME ? getDisplayName(parser.getLocalClient()) : "";
 
-                if (type == CoreActionType.QUERY_MESSAGE || type == CoreActionType.QUERY_SELF_MESSAGE) {
-                    appendLine(filename, "<%s> %s", getDisplayName(client, overrideNick), arguments[2]);
+                if (type == CoreActionType.QUERY_MESSAGE || type
+                        == CoreActionType.QUERY_SELF_MESSAGE) {
+                    appendLine(filename, "<%s> %s", getDisplayName(client, overrideNick),
+                            arguments[2]);
                 } else {
-                    appendLine(filename, "* %s %s", getDisplayName(client, overrideNick), arguments[2]);
+                    appendLine(filename, "* %s %s", getDisplayName(client, overrideNick),
+                            arguments[2]);
                 }
                 break;
         }
@@ -400,19 +401,23 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Log a channel-related event.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
      * @param arguments The arguments for the event
      */
-    protected void handleChannelEvent(final CoreActionType type, final StringBuffer format, final Object... arguments) {
+    protected void handleChannelEvent(final CoreActionType type, final StringBuffer format,
+            final Object... arguments) {
         final Channel chan = ((Channel) arguments[0]);
         final ChannelInfo channel = chan.getChannelInfo();
         final String filename = getLogFile(channel);
 
-        final ChannelClientInfo channelClient = (arguments.length > 1 && arguments[1] instanceof ChannelClientInfo) ? (ChannelClientInfo) arguments[1] : null;
+        final ChannelClientInfo channelClient = (arguments.length > 1
+                && arguments[1] instanceof ChannelClientInfo) ? (ChannelClientInfo) arguments[1]
+                : null;
         final ClientInfo client = channelClient == null ? null : channelClient.getClient();
 
-        final String message = (arguments.length > 2 && arguments[2] instanceof String) ? (String) arguments[2] : null;
+        final String message = (arguments.length > 2 && arguments[2] instanceof String)
+                ? (String) arguments[2] : null;
 
         switch (type) {
             case CHANNEL_OPENED:
@@ -434,7 +439,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             case CHANNEL_SELF_MESSAGE:
             case CHANNEL_ACTION:
             case CHANNEL_SELF_ACTION:
-                if (type == CoreActionType.CHANNEL_MESSAGE || type == CoreActionType.CHANNEL_SELF_MESSAGE) {
+                if (type == CoreActionType.CHANNEL_MESSAGE || type
+                        == CoreActionType.CHANNEL_SELF_MESSAGE) {
                     appendLine(filename, "<%s> %s", getDisplayName(client), message);
                 } else {
                     appendLine(filename, "* %s %s", getDisplayName(client), message);
@@ -446,26 +452,34 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                 final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
 
                 appendLine(filename, "*** Topic is: %s", channel.getTopic());
-                appendLine(filename, "*** Set at: %s on %s by %s", timeFormat.format(1000 * channel.getTopicTime()), dateFormat.format(1000 * channel.getTopicTime()), channel.getTopicSetter());
+                appendLine(filename, "*** Set at: %s on %s by %s", timeFormat.format(1000 * channel.
+                        getTopicTime()), dateFormat.format(1000 * channel.getTopicTime()), channel.
+                        getTopicSetter());
                 break;
             case CHANNEL_TOPICCHANGE:
-                appendLine(filename, "*** %s Changed the topic to: %s", getDisplayName(channelClient), message);
+                appendLine(filename, "*** %s Changed the topic to: %s",
+                        getDisplayName(channelClient), message);
                 break;
             case CHANNEL_JOIN:
-                appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient), client.toString());
+                appendLine(filename, "*** %s (%s) joined the channel", getDisplayName(channelClient),
+                        client.toString());
                 break;
             case CHANNEL_PART:
                 if (message.isEmpty()) {
-                    appendLine(filename, "*** %s (%s) left the channel", getDisplayName(channelClient), client.toString());
+                    appendLine(filename, "*** %s (%s) left the channel", getDisplayName(
+                            channelClient), client.toString());
                 } else {
-                    appendLine(filename, "*** %s (%s) left the channel (%s)", getDisplayName(channelClient), client.toString(), message);
+                    appendLine(filename, "*** %s (%s) left the channel (%s)", getDisplayName(
+                            channelClient), client.toString(), message);
                 }
                 break;
             case CHANNEL_QUIT:
                 if (message.isEmpty()) {
-                    appendLine(filename, "*** %s (%s) Quit IRC", getDisplayName(channelClient), client.toString());
+                    appendLine(filename, "*** %s (%s) Quit IRC", getDisplayName(channelClient),
+                            client.toString());
                 } else {
-                    appendLine(filename, "*** %s (%s) Quit IRC (%s)", getDisplayName(channelClient), client.toString(), message);
+                    appendLine(filename, "*** %s (%s) Quit IRC (%s)", getDisplayName(channelClient),
+                            client.toString(), message);
                 }
                 break;
             case CHANNEL_KICK:
@@ -473,19 +487,23 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                 final ChannelClientInfo kickedClient = (ChannelClientInfo) arguments[2];
 
                 if (kickReason.isEmpty()) {
-                    appendLine(filename, "*** %s was kicked by %s", getDisplayName(kickedClient), getDisplayName(channelClient));
+                    appendLine(filename, "*** %s was kicked by %s", getDisplayName(kickedClient),
+                            getDisplayName(channelClient));
                 } else {
-                    appendLine(filename, "*** %s was kicked by %s (%s)", getDisplayName(kickedClient), getDisplayName(channelClient), kickReason);
+                    appendLine(filename, "*** %s was kicked by %s (%s)",
+                            getDisplayName(kickedClient), getDisplayName(channelClient), kickReason);
                 }
                 break;
             case CHANNEL_NICKCHANGE:
-                appendLine(filename, "*** %s is now %s", getDisplayName(channelClient, message), getDisplayName(channelClient));
+                appendLine(filename, "*** %s is now %s", getDisplayName(channelClient, message),
+                        getDisplayName(channelClient));
                 break;
             case CHANNEL_MODECHANGE:
                 if (channelClient.getClient().getNickname().isEmpty()) {
                     appendLine(filename, "*** Channel modes are: %s", message);
                 } else {
-                    appendLine(filename, "*** %s set modes: %s", getDisplayName(channelClient), message);
+                    appendLine(filename, "*** %s set modes: %s", getDisplayName(channelClient),
+                            message);
                 }
                 break;
         }
@@ -494,12 +512,13 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Process an event of the specified type.
      *
-     * @param type The type of the event to process
-     * @param format Format of messages that are about to be sent. (May be null)
+     * @param type      The type of the event to process
+     * @param format    Format of messages that are about to be sent. (May be null)
      * @param arguments The arguments for the event
      */
     @Override
-    public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
+    public void processEvent(final ActionType type, final StringBuffer format,
+            final Object... arguments) {
         if (type instanceof CoreActionType) {
             final CoreActionType thisType = (CoreActionType) type;
 
@@ -543,7 +562,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Add a backbuffer to a frame.
      *
-     * @param frame The frame to add the backbuffer lines to
+     * @param frame    The frame to add the backbuffer lines to
      * @param filename File to get backbuffer from
      */
     protected void showBackBuffer(final FrameContainer frame, final String filename) {
@@ -565,19 +584,21 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                     frame.addLine(getColouredString(colour, lines.pop()), backbufferTimestamp);
                 }
                 file.close();
-                frame.addLine(getColouredString(colour, "--- End of backbuffer\n"), backbufferTimestamp);
+                frame.addLine(getColouredString(colour, "--- End of backbuffer\n"),
+                        backbufferTimestamp);
             } catch (IOException | SecurityException e) {
-                Logger.userError(ErrorLevel.LOW, "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage());
+                Logger.userError(ErrorLevel.LOW, "Unable to show backbuffer (Filename: " + filename
+                        + "): " + e.getMessage());
             }
         }
     }
 
     /**
-     * Get a coloured String.
-     * If colour is invalid, IRC Colour 14 will be used.
+     * Get a coloured String. If colour is invalid, IRC Colour 14 will be used.
      *
      * @param colour The colour the string should be (IRC Colour or 6-digit hex colour)
-     * @param line the line to colour
+     * @param line   the line to colour
+     *
      * @return The given line with the appropriate irc codes appended/prepended to colour it.
      */
     protected static String getColouredString(final String colour, final String line) {
@@ -611,8 +632,9 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Add a line to a file.
      *
      * @param filename Name of file to write to
-     * @param format Format of line to add. (NewLine will be added Automatically)
-     * @param args Arguments for format
+     * @param format   Format of line to add. (NewLine will be added Automatically)
+     * @param args     Arguments for format
+     *
      * @return true on success, else false.
      */
     protected boolean appendLine(final String filename, final String format, final Object... args) {
@@ -623,7 +645,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Add a line to a file.
      *
      * @param filename Name of file to write to
-     * @param line Line to add. (NewLine will be added Automatically)
+     * @param line     Line to add. (NewLine will be added Automatically)
+     *
      * @return true on success, else false.
      */
     protected boolean appendLine(final String filename, final String line) {
@@ -639,7 +662,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                 final DateFormat dateFormat = new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]");
                 dateString = dateFormat.format(new Date()).trim();
 
-                Logger.userError(ErrorLevel.LOW, "Dateformat String '" + timestamp + "' is invalid. For more information: http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html");
+                Logger.userError(ErrorLevel.LOW, "Dateformat String '" + timestamp
+                        + "' is invalid. For more information: http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html");
             }
             finalLine.append(dateString);
             finalLine.append(' ');
@@ -669,9 +693,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             /*
              * Do Nothing
              *
-             * Makes no sense to keep adding errors to the logger when we can't
-             * write to the file, as chances are it will happen on every incomming
-             * line.
+             * Makes no sense to keep adding errors to the logger when we can't write to the file,
+             * as chances are it will happen on every incomming line.
              */
         }
         return false;
@@ -681,6 +704,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Get the name of the log file for a specific object.
      *
      * @param obj Object to get name for
+     *
      * @return the name of the log file to use for this object.
      */
     protected String getLogFile(final Object obj) {
@@ -722,7 +746,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
                 directory.append(File.separatorChar);
             }
 
-            if (!new File(directory.toString()).exists() && !(new File(directory.toString())).mkdirs()) {
+            if (!new File(directory.toString()).exists() && !(new File(directory.toString())).
+                    mkdirs()) {
                 Logger.userError(ErrorLevel.LOW, "Unable to create date dirs");
             }
         }
@@ -737,15 +762,15 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     }
 
     /**
-     * This function adds the networkName to the log file.
-     * It first tries to create a directory for each network, if that fails
-     * it will prepend the networkName to the filename instead.
+     * This function adds the networkName to the log file. It first tries to create a directory for
+     * each network, if that fails it will prepend the networkName to the filename instead.
      *
-     * @param directory Current directory name
-     * @param file Current file name
+     * @param directory   Current directory name
+     * @param file        Current file name
      * @param networkName Name of network
      */
-    protected void addNetworkDir(final StringBuffer directory, final StringBuffer file, final String networkName) {
+    protected void addNetworkDir(final StringBuffer directory, final StringBuffer file,
+            final String networkName) {
         if (!networkfolders) {
             return;
         }
@@ -755,9 +780,11 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         boolean prependNetwork = false;
 
         // Check dir exists
-        final File dir = new File(directory.toString() + network + System.getProperty("file.separator"));
+        final File dir = new File(directory.toString() + network + System.getProperty(
+                "file.separator"));
         if (dir.exists() && !dir.isDirectory()) {
-            Logger.userError(ErrorLevel.LOW, "Unable to create networkfolders dir (file exists instead)");
+            Logger.userError(ErrorLevel.LOW,
+                    "Unable to create networkfolders dir (file exists instead)");
             // Prepend network name to file instead.
             prependNetwork = true;
         } else if (!dir.exists() && !dir.mkdirs()) {
@@ -778,6 +805,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Sanitise a string to be used as a filename.
      *
      * @param name String to sanitise
+     *
      * @return Sanitised version of name that can be used as a filename.
      */
     protected static String sanitise(final String name) {
@@ -789,6 +817,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Get the md5 hash of a string.
      *
      * @param string String to hash
+     *
      * @return md5 hash of given string
      */
     protected static String md5(final String string) {
@@ -805,6 +834,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Get name to display for client.
      *
      * @param client The client to get the display name for
+     *
      * @return name to display
      */
     protected String getDisplayName(final ClientInfo client) {
@@ -814,8 +844,9 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /**
      * Get name to display for client.
      *
-     * @param client The client to get the display name for
+     * @param client       The client to get the display name for
      * @param overrideNick Nickname to display instead of real nickname
+     *
      * @return name to display
      */
     protected String getDisplayName(final ClientInfo client, final String overrideNick) {
@@ -830,6 +861,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
      *
      * @param channelClient The client to get the display name for
+     *
      * @return name to display
      */
     protected String getDisplayName(final ChannelClientInfo channelClient) {
@@ -840,16 +872,19 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Get name to display for channelClient (Taking into account the channelmodeprefix setting).
      *
      * @param channelClient The client to get the display name for
-     * @param overrideNick Nickname to display instead of real nickname
+     * @param overrideNick  Nickname to display instead of real nickname
+     *
      * @return name to display
      */
     protected String getDisplayName(final ChannelClientInfo channelClient, final String overrideNick) {
         if (channelClient == null) {
             return (overrideNick.isEmpty()) ? "Unknown Client" : overrideNick;
         } else if (overrideNick.isEmpty()) {
-            return channelmodeprefix ? channelClient.toString() : channelClient.getClient().getNickname();
+            return channelmodeprefix ? channelClient.toString() : channelClient.getClient().
+                    getNickname();
         } else {
-            return channelmodeprefix ? channelClient.getImportantModePrefix() + overrideNick : overrideNick;
+            return channelmodeprefix ? channelClient.getImportantModePrefix() + overrideNick
+                    : overrideNick;
         }
     }
 
@@ -857,6 +892,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * Shows the history window for the specified target, if available.
      *
      * @param target The window whose history we're trying to open
+     *
      * @return True if the history is available, false otherwise
      */
     protected boolean showHistory(final FrameContainer target) {
@@ -919,7 +955,6 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
 
         /** Last used time. */
         public long lastUsedTime = System.currentTimeMillis();
-
         /** Open file's writer. */
         public BufferedWriter writer = null;
 

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSource.java

@@ -45,8 +45,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
     /** The sources used by this media source. */
     private List<MediaSource> sources;
     /** A map of discovered mpris sources. */
-    private final Map<String, MediaSource> mprisSources
-            = new HashMap<>();
+    private final Map<String, MediaSource> mprisSources = new HashMap<>();
     /** The path to qdbus. */
     private String qdbus;
 
@@ -93,13 +92,14 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
      * Performs a dbus call.
      *
      * @param service The name of the service
-     * @param iface The name of the interface
-     * @param method The name of the method
-     * @param args Any arguments to the method
+     * @param iface   The name of the interface
+     * @param method  The name of the method
+     * @param args    Any arguments to the method
+     *
      * @return A list of output (one entry per line)
      */
     public List<String> doDBusCall(final String service, final String iface,
-            final String method, final String ... args) {
+            final String method, final String... args) {
         final String[] exeArgs = new String[4 + args.length];
         exeArgs[0] = qdbus;
         exeArgs[1] = service;
@@ -115,6 +115,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
      * Executes the specified command and arguments and returns the results.
      *
      * @param args The command/arguments to be executed
+     *
      * @return The output of the specified command
      */
     protected static List<String> getInfo(final String[] args) {
@@ -150,6 +151,7 @@ public class DBusMediaSource extends BasePlugin implements MediaSourceManager {
      * Parses a dbus dictionary into a {@link Map}.
      *
      * @param lines The lines to be parsed as a dictionary
+     *
      * @return A map corresponding to the specified dictionary
      */
     protected static Map<String, String> parseDictionary(

src/com/dmdirc/addons/mediasource_dbus/MPRISSource.java

@@ -47,7 +47,7 @@ public class MPRISSource implements MediaSource {
     /**
      * Creates a new MPRIS source for the specified service name.
      *
-     * @param source The manager which owns this source
+     * @param source  The manager which owns this source
      * @param service The service name of the MRPIS service
      */
     public MPRISSource(final DBusMediaSource source, final String service) {
@@ -64,10 +64,11 @@ public class MPRISSource implements MediaSource {
     }
 
     /**
-     * Get the first line of the output for a dbus call to the given function
-     * against this service in the /org/mpris/MediaPlayer2 obejct.
+     * Get the first line of the output for a dbus call to the given function against this service
+     * in the /org/mpris/MediaPlayer2 obejct.
      *
      * @param function Function to get data for.
+     *
      * @return First line of output.
      */
     protected String getFirstValue(final String function) {
@@ -107,10 +108,11 @@ public class MPRISSource implements MediaSource {
     }
 
     /**
-     * Utility method to return the value of the specified key if it exists,
-     * or "Unknown" if it doesn't.
+     * Utility method to return the value of the specified key if it exists, or "Unknown" if it
+     * doesn't.
      *
      * @param key The key to be retrieved
+     *
      * @return The value of the specified key or "Unknown".
      */
     protected String getData(final String key) {
@@ -203,6 +205,7 @@ public class MPRISSource implements MediaSource {
      * Get the duration in seconds as a string.
      *
      * @param seconds Input to get duration for
+     *
      * @return Duration as a string
      */
     private String duration(final long secondsInput) {
@@ -233,4 +236,5 @@ public class MPRISSource implements MediaSource {
 
         return result.toString();
     }
+
 }

src/com/dmdirc/addons/mediasource_dcop/DcopMediaSourcePlugin.java

@@ -40,7 +40,6 @@ public class DcopMediaSourcePlugin extends BasePlugin
 
     /** Media sources. */
     private final List<MediaSource> sources;
-
     /** This plugins plugin manager. */
     private final PluginManager pluginManager;
 
@@ -62,6 +61,7 @@ public class DcopMediaSourcePlugin extends BasePlugin
      * Get DCOP Result
      *
      * @param query Query to try
+     *
      * @return The result of the dcop query, line-by-line
      */
     @SuppressWarnings("unchecked")
@@ -79,4 +79,5 @@ public class DcopMediaSourcePlugin extends BasePlugin
     public List<MediaSource> getSources() {
         return Collections.unmodifiableList(sources);
     }
+
 }

src/com/dmdirc/addons/mediasource_dcop/NoatunSource.java

@@ -112,7 +112,7 @@ public class NoatunSource implements MediaSource {
     @Override
     public String getTime() {
         return duration(Integer.parseInt(myPlugin.getDcopResult(
-                "dcop noatun Noatun position").get(0)) /1000);
+                "dcop noatun Noatun position").get(0)) / 1000);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java

@@ -39,7 +39,6 @@ public class TitleMediaSource implements MediaSource {
 
     /** The command to use to get the title. */
     private final String command;
-
     /** The name of the player we're retrieving. */
     private final String name;
 
@@ -47,7 +46,7 @@ public class TitleMediaSource implements MediaSource {
      * Creates a new title media source.
      *
      * @param command The command to be executed
-     * @param name The name of the media source
+     * @param name    The name of the media source
      */
     public TitleMediaSource(final String command, final String name) {
         this.command = command;

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSourcePlugin.java

@@ -30,8 +30,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * A media source plugin which provides two {@link TitleMediaSource}s, one for
- * the Last.fm linux client and one for Spotify (running under Wine).
+ * A media source plugin which provides two {@link TitleMediaSource}s, one for the Last.fm linux
+ * client and one for Spotify (running under Wine).
  */
 public class TitleMediaSourcePlugin extends BasePlugin implements MediaSourceManager {
 
@@ -42,12 +42,12 @@ public class TitleMediaSourcePlugin extends BasePlugin implements MediaSourceMan
     @Override
     public void onLoad() {
         sources = new ArrayList<>(2);
-        sources.add(new TitleMediaSource("grep -E '\\(\"last\\.?fm\" \"Last\\.?fm\"\\)'" +
-                    "| grep -vE '(\"Last.fm " +
-                    "Options\"|\"Diagnostics\"|\"last\\.?fm\"|\"Share\"|\\(has no " +
-                    "name\\)):' | sed -r 's/^[^\"]*?\"(.*)\": \\(\"last\\.?fm.*$/\\1/g'", "Last.fm"));
+        sources.add(new TitleMediaSource("grep -E '\\(\"last\\.?fm\" \"Last\\.?fm\"\\)'"
+                + "| grep -vE '(\"Last.fm "
+                + "Options\"|\"Diagnostics\"|\"last\\.?fm\"|\"Share\"|\\(has no "
+                + "name\\)):' | sed -r 's/^[^\"]*?\"(.*)\": \\(\"last\\.?fm.*$/\\1/g'", "Last.fm"));
         sources.add(new TitleMediaSource("grep '\": (\"spotify.exe' | cut -d '\"' -f 2 | "
-                    + "cut -d '-' -f 2- | sed -r 's/^\\s+|\\s+$//g' | sed -r 's/-/–/g'", "Spotify"));
+                + "cut -d '-' -f 2- | sed -r 's/^\\s+|\\s+$//g' | sed -r 's/-/–/g'", "Spotify"));
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/mediasource_mplayer/MplayerMediaSourcePlugin.java

@@ -33,8 +33,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Provides a media source for mplayer which uses lsof to hackily see what
- * mplayer is currently accessing.
+ * Provides a media source for mplayer which uses lsof to hackily see what mplayer is currently
+ * accessing.
  */
 public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource {
 
@@ -110,10 +110,10 @@ public class MplayerMediaSourcePlugin extends BasePlugin implements MediaSource
 
         try {
             final String[] command = new String[]{"/bin/bash", "-c",
-                    "/usr/bin/lsof -c gmplayer |" +
-                    " grep -Ev '/dev|/lib|/var|/usr|/SYS|DIR|/tmp|pipe|socket|" +
-                    "\\.xession|fontconfig' | tail -n 1 | sed -r 's/ +/ /g' |" +
-                    " cut -d ' ' -f 9- | sed -r 's/^.*\\/(.*?)$/\\1/'"};
+                "/usr/bin/lsof -c gmplayer |"
+                + " grep -Ev '/dev|/lib|/var|/usr|/SYS|DIR|/tmp|pipe|socket|"
+                + "\\.xession|fontconfig' | tail -n 1 | sed -r 's/ +/ /g' |"
+                + " cut -d ' ' -f 9- | sed -r 's/^.*\\/(.*?)$/\\1/'"};
             process = Runtime.getRuntime().exec(command);
 
             reader = new InputStreamReader(process.getInputStream());

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -88,8 +88,7 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
     /** {@inheritDoc} */
     @Override
     public String getArtist() {
-        return information.containsKey("artist") ? information.get("artist") :
-                getFallbackArtist();
+        return information.containsKey("artist") ? information.get("artist") : getFallbackArtist();
     }
 
     /**
@@ -262,10 +261,9 @@ public class VlcMediaSourcePlugin extends BasePlugin implements MediaSource {
     }
 
     /**
-     * Parses the information from the two pages obtained from VLC's web
-     * interface.
+     * Parses the information from the two pages obtained from VLC's web interface.
      *
-     * @param res The first page of VLC info (/old/info.html)
+     * @param res  The first page of VLC info (/old/info.html)
      * @param res2 The second page of VLC info (/old/)
      */
     protected void parseInformation(final List<String> res,

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

@@ -34,17 +34,15 @@ public class DllSource implements MediaSource {
 
     /** Player name */
     private final String playerName;
-
     /** Use getArtistTitle */
     private final boolean useArtistTitle;
-
     /** Parent Plugin. */
     final WindowsMediaSourcePlugin parent;
 
     /**
      * Instantiates the media source.
      *
-     * @param parent The plugin that owns this DllSource
+     * @param parent     The plugin that owns this DllSource
      * @param playerName Name of Player and DLL
      */
     public DllSource(final WindowsMediaSourcePlugin parent, final String playerName) {
@@ -54,12 +52,13 @@ public class DllSource implements MediaSource {
     /**
      * Instantiates the media source.
      *
-     * @param parent The plugin that owns this DllSource
-     * @param playerName Name of Player and DLL
-     * @param useArtistTitle True if getArtistTitle should be parsed rather than
-     *                       using getArtist() and getTitle()
+     * @param parent         The plugin that owns this DllSource
+     * @param playerName     Name of Player and DLL
+     * @param useArtistTitle True if getArtistTitle should be parsed rather than using getArtist()
+     *                       and getTitle()
      */
-    public DllSource(final WindowsMediaSourcePlugin parent, final String playerName, final boolean useArtistTitle) {
+    public DllSource(final WindowsMediaSourcePlugin parent, final String playerName,
+            final boolean useArtistTitle) {
         this.playerName = playerName;
         this.useArtistTitle = useArtistTitle;
         this.parent = parent;
@@ -75,6 +74,7 @@ public class DllSource implements MediaSource {
      * Get the "goodoutput" from GetMediaInfo for the given command
      *
      * @param command Command to run
+     *
      * @return "Good" Output
      */
     private String getOutput(final String command) {
@@ -133,6 +133,7 @@ public class DllSource implements MediaSource {
      * Get the duration in seconds as a string.
      *
      * @param secondsInput to get duration for
+     *
      * @return Duration as a string
      */
     private String duration(final long secondsInput) {

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

@@ -29,7 +29,6 @@ public class MediaInfoOutput {
 
     /** Exit Code from GetMediaInfo.exe */
     private final int exitCode;
-
     /** Output from GetMediaInfo.exe */
     private final String output;
 
@@ -37,7 +36,7 @@ public class MediaInfoOutput {
      * Create a MediaInfoOutput
      *
      * @param exitCode Exit code from GetMediaInfo.exe
-     * @param output Output from GetMediaInfo.exe
+     * @param output   Output from GetMediaInfo.exe
      */
     public MediaInfoOutput(final int exitCode, final String output) {
         this.exitCode = exitCode;

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

@@ -70,6 +70,7 @@ public class WindowsMediaSourcePlugin extends BasePlugin
      *
      * @param player Player to ask about
      * @param method Method to call
+     *
      * @return a MediaInfoOutput with the results
      */
     protected MediaInfoOutput getOutput(final String player, final String method) {
@@ -101,7 +102,9 @@ public class WindowsMediaSourcePlugin extends BasePlugin
             filesHelper.extractResoucesEndingWith(".dll");
             filesHelper.extractResoucesEndingWith(".exe");
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for windows media source: " + ex.getMessage(), ex);
+            Logger.userError(ErrorLevel.MEDIUM, "Unable to extract files for windows media source: "
+                    + ex.getMessage(), ex);
         }
     }
+
 }

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

@@ -38,12 +38,11 @@ import javax.swing.table.DefaultTableCellRenderer;
 public class ColourRenderer extends DefaultTableCellRenderer {
 
     /**
-     * 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 colour manager to use to parse colours. */
     private final ColourManager colourManager;
 
@@ -65,7 +64,8 @@ public class ColourRenderer extends DefaultTableCellRenderer {
             final boolean hasFocus, final int row, final int column) {
         Color colour = null;
         if (value != null && !((String) value).isEmpty()) {
-            colour = UIUtilities.convertColour(colourManager.getColourFromString((String) value, null));
+            colour = UIUtilities.convertColour(colourManager.getColourFromString((String) value,
+                    null));
         }
 
         setHorizontalAlignment(CENTER);

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

@@ -45,9 +45,9 @@ public class NickColourInputDialog extends StandardDialog
         implements ActionListener {
 
     /**
-     * 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;
     /** Whether or not this is a new entry (as opposed to editing an old one). */
@@ -68,15 +68,15 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
-     * @param owner The window that owns this dialog.
+     * @param owner         The window that owns this dialog.
      * @param colourManager The colour manager to use to retrieve colours.
-     * @param iconManager The icon manager to use for the dialog icon.
-     * @param panel The panel that's opening this dialog
-     * @param row The row of the table we're editing
-     * @param nickname The nickname that's currently set
-     * @param network The network that's currently set
-     * @param textcolour The text colour that's currently set
-     * @param nickcolour The nicklist colour that's currently set
+     * @param iconManager   The icon manager to use for the dialog icon.
+     * @param panel         The panel that's opening this dialog
+     * @param row           The row of the table we're editing
+     * @param nickname      The nickname that's currently set
+     * @param network       The network that's currently set
+     * @param textcolour    The text colour that's currently set
+     * @param nickcolour    The nicklist colour that's currently set
      */
     public NickColourInputDialog(
             final MainFrame owner,
@@ -103,10 +103,10 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Creates a new instance of NickColourInputDialog.
      *
-     * @param owner The window that owns this dialog.
+     * @param owner         The window that owns this dialog.
      * @param colourManager The colour manager to use to retrieve colours.
-     * @param iconManager The icon manager to use for the dialog icon.
-     * @param panel The panel that's opening this dialog
+     * @param iconManager   The icon manager to use for the dialog icon.
+     * @param panel         The panel that's opening this dialog
      */
     public NickColourInputDialog(
             final MainFrame owner,
@@ -121,8 +121,8 @@ public class NickColourInputDialog extends StandardDialog
     /**
      * Initialises the components.
      *
-     * @param defaultNickname The default value for the nickname text field
-     * @param defaultNetwork The default value for the network text field
+     * @param defaultNickname   The default value for the nickname text field
+     * @param defaultNetwork    The default value for the network text field
      * @param defaultTextColour The default value for the text colour option
      * @param defaultNickColour The default value for the nick colour option
      */

src/com/dmdirc/addons/nickcolours/NickColourManager.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.addons.nickcolours;
 
 import com.dmdirc.Channel;
@@ -122,7 +123,7 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
      * Colours the specified client according to the user's config.
      *
      * @param network The network to use for the colouring
-     * @param client The client to be coloured
+     * @param client  The client to be coloured
      */
     private void colourClient(final String network,
             final ChannelClientInfo client) {
@@ -169,7 +170,7 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
     /**
      * Puts the specified colour into the given map. The keys are determined by config settings.
      *
-     * @param map The map to use
+     * @param map        The map to use
      * @param textColour Text colour to be inserted
      * @param nickColour Nick colour to be inserted
      */
@@ -188,6 +189,7 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
      * Retrieves a pseudo-random colour for the specified nickname.
      *
      * @param nick The nickname of the client whose colour we're determining
+     *
      * @return Colour of the specified nickname
      */
     private Colour getColour(final String nick) {
@@ -237,6 +239,7 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
      * should be used for it.
      *
      * @param key The config key to look up
+     *
      * @return The colours specified by the given key
      */
     private String[] getParts(final String key) {
@@ -267,7 +270,6 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
         ActionManager.getActionManager().unregisterListener(this);
     }
 
-
     /**
      * Shows the prefs configuration page for this plugin.
      *
@@ -280,15 +282,14 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
         final PreferencesCategory colours = new PluginPreferencesCategory(
                 pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                        new Callable<NickColourPanel>() {
-
-                            /** {@inheritDoc} */
-                            @Override
-                            public NickColourPanel call() {
-                                return new NickColourPanel(mainFrame, iconManager,
-                                        NickColourManager.this, colourManager, userConfig);
-                            }
-                        }));
+                new Callable<NickColourPanel>() {
+            /** {@inheritDoc} */
+            @Override
+            public NickColourPanel call() {
+                return new NickColourPanel(mainFrame, iconManager,
+                        NickColourManager.this, colourManager, userConfig);
+            }
+        }));
 
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 "ui", "shownickcoloursintext", "Show colours in text area",
@@ -315,9 +316,9 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
                 "Always use the same colour for our own nickname?",
                 manager.getConfigManager(), manager.getIdentity()));
         general.addSetting(new PreferencesSetting(PreferencesType.COLOUR, domain,
-                        "owncolour", "Colour to use for own nick",
-                        "Colour used for our own nickname, if above setting is "
-                        + "enabled.", manager.getConfigManager(), manager.getIdentity()));
+                "owncolour", "Colour to use for own nick",
+                "Colour used for our own nickname, if above setting is "
+                + "enabled.", manager.getConfigManager(), manager.getIdentity()));
 
         general.addSubCategory(colours);
         manager.getCategory("Plugins").addSubCategory(general);
@@ -351,4 +352,5 @@ public class NickColourManager implements ActionListener, ConfigChangeListener {
     public String getDomain() {
         return domain;
     }
+
 }

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

@@ -33,7 +33,7 @@ import dagger.Provides;
 /**
  * DI module for the nick colour plugin.
  */
-@Module(injects={NickColourManager.class}, addsTo = SwingModule.class)
+@Module(injects = {NickColourManager.class}, addsTo = SwingModule.class)
 public class NickColourModule {
 
     /** The domain for plugin settings. */
@@ -42,7 +42,8 @@ public class NickColourModule {
     private final PluginInfo pluginInfo;
 
     @Qualifier
-    public static @interface NickColourSettingsDomain {}
+    public static @interface NickColourSettingsDomain {
+    }
 
     public NickColourModule(final PluginInfo pluginInfo, final String domain) {
         this.pluginInfo = pluginInfo;

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

@@ -55,7 +55,6 @@ public class NickColourPanel extends JPanel implements ActionListener,
     private static final long serialVersionUID = 1;
     /** The table headings. */
     private static final String[] HEADERS = {"Network", "Nickname", "Text colour", "Nicklist colour"};
-
     /** The table used for displaying the options. */
     private final JTable table;
     /** The plugin we're associated with. */
@@ -76,11 +75,11 @@ public class NickColourPanel extends JPanel implements ActionListener,
     /**
      * Creates a new instance of NickColourPanel.
      *
-     * @param mainFrame Main frame to parent dialogs on
-     * @param iconManager Icon manager to load icons from
-     * @param plugin The plugin that owns this panel
+     * @param mainFrame     Main frame to parent dialogs on
+     * @param iconManager   Icon manager to load icons from
+     * @param plugin        The plugin that owns this panel
      * @param colourManager The colour manager to use to parse colours.
-     * @param userSettings The provider to write user settings to.
+     * @param userSettings  The provider to write user settings to.
      */
     public NickColourPanel(
             final MainFrame mainFrame, final IconManager iconManager, final NickColourManager plugin,
@@ -94,7 +93,6 @@ public class NickColourPanel extends JPanel implements ActionListener,
         final Object[][] data = plugin.getData();
 
         table = new JTable(new DefaultTableModel(data, HEADERS)) {
-
             /** A version number for this class. */
             private static final long serialVersionUID = 1;
             /** The colour renderer we're using for colour cells. */
@@ -199,8 +197,8 @@ public class NickColourPanel extends JPanel implements ActionListener,
     /**
      * Adds a row to the table.
      *
-     * @param network The network setting
-     * @param nickname The nickname setting
+     * @param network    The network setting
+     * @param nickname   The nickname setting
      * @param textcolour The textpane colour setting
      * @param nickcolour The nick list colour setting
      */
@@ -253,4 +251,5 @@ public class NickColourPanel extends JPanel implements ActionListener,
         editButton.setEnabled(enable);
         deleteButton.setEnabled(enable);
     }
+
 }

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

@@ -28,7 +28,6 @@ import com.dmdirc.plugins.implementations.BasePlugin;
 
 import dagger.ObjectGraph;
 
-
 /**
  * Adds support for nick colours throughout the client.
  */
@@ -38,7 +37,6 @@ public class NickColourPlugin extends BasePlugin {
     private NickColourManager nickColourManager;
 
     public NickColourPlugin() {
-
     }
 
     @Override
@@ -50,7 +48,7 @@ public class NickColourPlugin extends BasePlugin {
     }
 
     @Override
-        public void onLoad() {
+    public void onLoad() {
         super.onLoad();
         nickColourManager.onLoad();
     }

src/com/dmdirc/addons/nma/NotifyMyAndroidClient.java

@@ -39,15 +39,12 @@ import org.slf4j.LoggerFactory;
 public class NotifyMyAndroidClient {
 
     private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(NotifyMyAndroidClient.class);
-
     /** The base URL for the NMA API. */
     private static final String BASE_URL = "https://www.notifymyandroid.com";
     /** The method to call to send a notification. */
     private static final String NOTIFY_PATH = "/publicapi/notify";
-
     /** The API keys to deliver to. */
     private final Collection<String> apiKeys;
-
     /** The application to report ourselves as. */
     private final String application;
 
@@ -57,22 +54,21 @@ public class NotifyMyAndroidClient {
     }
 
     /**
-     * Creates a new instance of {@link NotifyMyAndroidClient} with a single
-     * API key.
+     * Creates a new instance of {@link NotifyMyAndroidClient} with a single API key.
      *
-     * @param apiKey The API key to use when connecting to NMA
+     * @param apiKey      The API key to use when connecting to NMA
      * @param application The application string to report to NMA.
      */
     public NotifyMyAndroidClient(final String apiKey, final String application) {
-        this(Arrays.asList(new String[] { apiKey }), application);
+        this(Arrays.asList(new String[]{apiKey}), application);
     }
 
     /**
-     * Sends a notification to NotifyMyAndroid. At present return status and
-     * text is ignored.
+     * Sends a notification to NotifyMyAndroid. At present return status and text is ignored.
      *
-     * @param event The name of the event to send (max 1,000 chars).
+     * @param event       The name of the event to send (max 1,000 chars).
      * @param description The description of the event (max 10,000 chars).
+     *
      * @throws IOException If the NMA service couldn't be reached
      */
     public void notify(final String event, final String description) throws IOException {

src/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java

@@ -39,15 +39,14 @@ import org.slf4j.LoggerFactory;
  */
 public class NotifyMyAndroidCommand extends Command {
 
-    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(NotifyMyAndroidCommand.class);
-
+    private static final org.slf4j.Logger LOG = LoggerFactory.
+            getLogger(NotifyMyAndroidCommand.class);
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo(
             "notifymyandroid",
             "notifymyandroid <title> -- <body>"
-                + " - Sends notification to NotifyMyAndroid",
+            + " - Sends notification to NotifyMyAndroid",
             CommandType.TYPE_GLOBAL);
-
     /** The configuration domain to retrieve settings from. */
     private String configDomain;
 
@@ -81,7 +80,6 @@ public class NotifyMyAndroidCommand extends Command {
                 origin.getConfigManager().getOption(configDomain, "application"));
 
         new Thread(new Runnable() {
-
             @Override
             public void run() {
                 try {
@@ -89,7 +87,8 @@ public class NotifyMyAndroidCommand extends Command {
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Notification sent");
                 } catch (IOException ex) {
                     LOG.info("Exception when trying to notify NMA", ex);
-                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to send: " + ex.getMessage());
+                    sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to send: " + ex.
+                            getMessage());
                 }
             }
         }, "NMA Thread").start();

src/com/dmdirc/addons/nma/NotifyMyAndroidPlugin.java

@@ -38,14 +38,13 @@ public class NotifyMyAndroidPlugin extends BaseCommandPlugin {
 
     /** The command to register. */
     private final NotifyMyAndroidCommand command;
-
     /** Our info object. */
     private final PluginInfo pluginInfo;
 
     /**
      * Creates a new instance of the {@link NotifyMyAndroidPlugin}.
      *
-     * @param pluginInfo The plugin info object for this plugin.
+     * @param pluginInfo        The plugin info object for this plugin.
      * @param commandController Command controller to register commands
      */
     public NotifyMyAndroidPlugin(final PluginInfo pluginInfo,

src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -37,8 +37,8 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import java.util.List;
 
 /**
- * Notification command, delegating notification to one of the registered
- * notification commands as preferred by the end user.
+ * Notification command, delegating notification to one of the registered notification commands as
+ * preferred by the end user.
  */
 public class NotificationCommand extends Command implements
         IntelligentCommand {
@@ -47,7 +47,7 @@ public class NotificationCommand extends Command implements
     public static final BaseCommandInfo INFO = new BaseCommandInfo(
             "notification",
             "notification [--methods|--method <method>] text - "
-                + "Notifies you of the text",
+            + "Notifies you of the text",
             CommandType.TYPE_GLOBAL);
     /** The plugin that's using this command. */
     private final NotificationsPlugin parent;
@@ -56,7 +56,7 @@ public class NotificationCommand extends Command implements
      * Creates a new instance of this notification command.
      *
      * @param controller The controller to use for command information.
-     * @param parent The plugin that's instantiating this command
+     * @param parent     The plugin that's instantiating this command
      */
     public NotificationCommand(final CommandController controller, final NotificationsPlugin parent) {
         super(controller);
@@ -100,7 +100,7 @@ public class NotificationCommand extends Command implements
     /**
      * Outputs a list of methods for the notifcation command.
      *
-     * @param origin The input window where the command was entered
+     * @param origin   The input window where the command was entered
      * @param isSilent Whether this command is being silenced
      */
     private void doMethodList(final FrameContainer origin,
@@ -142,4 +142,5 @@ public class NotificationCommand extends Command implements
         }
         return res;
     }
+
 }

src/com/dmdirc/addons/notifications/NotificationConfig.java

@@ -44,9 +44,9 @@ import net.miginfocom.swing.MigLayout;
 public class NotificationConfig extends JPanel implements PreferencesInterface {
 
     /**
-     * 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;
     /** Notification method order list. */
@@ -59,7 +59,7 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
     /**
      * Creates a new instance of NotificationConfig panel.
      *
-     * @param plugin The plugin that owns this panel
+     * @param plugin  The plugin that owns this panel
      * @param methods A list of methods to be used in the panel
      */
     public NotificationConfig(final NotificationsPlugin plugin,
@@ -131,4 +131,5 @@ public class NotificationConfig extends JPanel implements PreferencesInterface {
     public void save() {
         plugin.saveSettings(getMethods());
     }
+
 }

src/com/dmdirc/addons/notifications/NotificationsPlugin.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.addons.notifications;
 
 import com.dmdirc.actions.ActionManager;
@@ -39,8 +40,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 /**
- * Notification Manager plugin, aggregates notification sources exposing them
- * via a single command.
+ * Notification Manager plugin, aggregates notification sources exposing them via a single command.
  */
 public class NotificationsPlugin extends BaseCommandPlugin implements ActionListener {
 
@@ -56,8 +56,8 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     /**
      * Creates a new instance of this plugin.
      *
-     * @param pluginInfo This plugin's plugin info
-     * @param commandController Command controller to register commands
+     * @param pluginInfo         This plugin's plugin info
+     * @param commandController  Command controller to register commands
      * @param identityController The controller to read and write settings with.
      */
     public NotificationsPlugin(
@@ -100,7 +100,6 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     public void showConfig(final PreferencesDialogModel manager) {
         final NotificationConfig configPanel = UIUtilities.invokeAndWait(
                 new Callable<NotificationConfig>() {
-
             /** {@inheritDoc} */
             @Override
             public NotificationConfig call() {
@@ -118,7 +117,8 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     /** Loads the plugins settings. */
     private void loadSettings() {
         if (identityController.getGlobalConfiguration().hasOptionString(getDomain(), "methodOrder")) {
-            order = identityController.getGlobalConfiguration().getOptionList(getDomain(), "methodOrder");
+            order = identityController.getGlobalConfiguration().getOptionList(getDomain(),
+                    "methodOrder");
         } else {
             order = new ArrayList<>();
         }
@@ -136,8 +136,8 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     }
 
     /**
-     * Checks to see if a plugin implements the notification method interface
-     * and if it does, adds the method to our list.
+     * Checks to see if a plugin implements the notification method interface and if it does, adds
+     * the method to our list.
      *
      * @param target The plugin to be tested
      */
@@ -149,8 +149,8 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     }
 
     /**
-     * Checks to see if the specified notification method needs to be added to
-     * our order list, and adds it if neccessary.
+     * Checks to see if the specified notification method needs to be added to our order list, and
+     * adds it if neccessary.
      *
      * @param source The notification method to be tested
      */
@@ -161,8 +161,8 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
     }
 
     /**
-     * Checks to see if a plugin implements the notification method interface
-     * and if it does, removes the method from our list.
+     * Checks to see if a plugin implements the notification method interface and if it does,
+     * removes the method from our list.
      *
      * @param target The plugin to be tested
      */
@@ -174,6 +174,7 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
      * Retrieves a method based on its name.
      *
      * @param name The name to search for
+     *
      * @return The method with the specified name or null if none were found.
      */
     public PluginInfo getMethod(final String name) {
@@ -215,7 +216,7 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
         for (String method : order) {
             if (methods.contains(method)) {
                 return pluginInfo.getMetaData().getManager().getPluginInfoByName(
-                    method);
+                        method);
             }
         }
         return null;
@@ -231,4 +232,5 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
         identityController.getUserSettings()
                 .setOption(getDomain(), "methodOrder", order);
     }
+
 }

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

@@ -58,9 +58,9 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
         KeyListener {
 
     /**
-     * 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;
     /** Media source order list. */
@@ -84,8 +84,8 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
      * Creates a new instance of ConfigPanel.
      *
      * @param identityController The controller to read/write settings with.
-     * @param plugin The plugin that owns this panel
-     * @param sources A list of sources to be used in the panel
+     * @param plugin             The plugin that owns this panel
+     * @param sources            A list of sources to be used in the panel
      */
     public ConfigPanel(
             final IdentityController identityController,
@@ -147,8 +147,8 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
         previewPanel = panel;
 
         add(new NowPlayingSubsitutionPanel(Arrays.asList(new String[]{"app",
-                    "title", "artist", "album", "bitrate", "format", "length",
-                    "time", "state"})), "growx");
+            "title", "artist", "album", "bitrate", "format", "length",
+            "time", "state"})), "growx");
         schedulePreviewUpdate();
     }
 
@@ -166,7 +166,6 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
 
         final String text = plugin.doSubstitution(
                 UIUtilities.invokeAndWait(new Callable<String>() {
-
             /** {@inheritDoc} */
             @Override
             public String call() {
@@ -174,7 +173,6 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
             }
         }), source);
         SwingUtilities.invokeLater(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -251,7 +249,6 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
 
         updateTimer = new Timer("Nowplaying config timer");
         updateTimer.schedule(new TimerTask() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -323,6 +320,7 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
         public String getBitrate() {
             return "128";
         }
+
     }
 
 }

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

@@ -23,16 +23,18 @@
 package com.dmdirc.addons.nowplaying;
 
 /**
- * The media source describes one source of "now playing" information
- * (i.e., one method of getting information from one media player).
+ * The media source describes one source of "now playing" information (i.e., one method of getting
+ * information from one media player).
  *
  * @author chris
  */
 public interface MediaSource {
+
     /**
      * Get the state of this media source
      *
      * @return State for this media source.
+     *
      * @since 0.6.3m1
      */
     MediaSourceState getState();

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

@@ -34,18 +34,17 @@ import java.util.List;
 public class MediaSourceComparator implements Comparator<MediaSource>, 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 order that the sources should be checked. */
     private final List<String> order;
 
     /**
-     * Creates a new instance of MediaSourceComparator.
-     * NB: The order list may be altered during comparisons.
+     * Creates a new instance of MediaSourceComparator. NB: The order list may be altered during
+     * comparisons.
      *
      * @param order An ordered list of media source names
      */
@@ -60,8 +59,8 @@ public class MediaSourceComparator implements Comparator<MediaSource>, Serializa
     }
 
     /**
-     * Retrieves the position of the source within the order list.
-     * If the source is not present it is appended to the list.
+     * Retrieves the position of the source within the order list. If the source is not present it
+     * is appended to the list.
      *
      * @param source The media source to be tested
      */

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

@@ -25,8 +25,8 @@ package com.dmdirc.addons.nowplaying;
 import java.util.List;
 
 /**
- * The media source manager is a standard interface for an object that controls
- * one or more media sources.
+ * The media source manager is a standard interface for an object that controls one or more media
+ * sources.
  *
  * @author chris
  */

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

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

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

@@ -40,15 +40,14 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * The now playing command retrieves the currently playing song from a
- * variety of media players.
+ * The now playing command retrieves the currently playing song from a variety of media players.
  */
 public class NowPlayingCommand extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo("nowplaying",
-            "nowplaying [--sources|--source <source>] [format] - " +
-                "tells the channel the song you're currently playing",
+            "nowplaying [--sources|--source <source>] [format] - "
+            + "tells the channel the song you're currently playing",
             CommandType.TYPE_CHAT);
     /** The plugin that's using this command. */
     private final NowPlayingPlugin parent;
@@ -58,8 +57,8 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
     /**
      * Creates a new instance of this command.
      *
-     * @param controller The controller to use for command information.
-     * @param parent The plugin that owns this command.
+     * @param controller         The controller to use for command information.
+     * @param parent             The plugin that owns this command.
      * @param identityController The controller to use to read/write settings.
      */
     public NowPlayingCommand(
@@ -105,7 +104,8 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
                         getInformation(parent.getBestSource(), args.
                         getArgumentsAsString(0)));
             } else {
-                sendLine(origin, args.isSilent(), FORMAT_ERROR, "No running media sources available.");
+                sendLine(origin, args.isSilent(), FORMAT_ERROR,
+                        "No running media sources available.");
             }
         }
     }
@@ -113,9 +113,9 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
     /**
      * Outputs a list of sources for the nowplaying command.
      *
-     * @param origin The input window where the command was entered
+     * @param origin   The input window where the command was entered
      * @param isSilent Whether this command is being silenced
-     * @param format Format to be passed to getInformation
+     * @param format   Format to be passed to getInformation
      */
     private void doSourceList(final FrameContainer origin, final boolean isSilent,
             final String format) {
@@ -153,6 +153,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
      * @param format Format to use
      *
      * @return Formatted information string
+     *
      * @since 0.6.3
      */
     private String getInformation(final MediaSource source, final String format) {
@@ -169,7 +170,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
 
-        final List<String> subsList = Arrays.asList(new String[] {
+        final List<String> subsList = Arrays.asList(new String[]{
             "$artist", "$title", "$album", "$app", "$bitrate", "$format",
             "$length", "$state", "$time"
         });
@@ -196,11 +197,12 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             res.addAll(subsList);
             return res;
         } else {
-            final AdditionalTabTargets res =  TabCompleter
+            final AdditionalTabTargets res = TabCompleter
                     .getIntelligentResults(arg, context, context
                     .getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
             res.addAll(subsList);
             return res;
         }
     }
+
 }

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

@@ -42,10 +42,9 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 /**
- * Plugin that allows users to advertise what they're currently playing or
- * listening to.
+ * Plugin that allows users to advertise what they're currently playing or listening to.
  */
-public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListener  {
+public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListener {
 
     /** The sources that we know of. */
     private final List<MediaSource> sources = new ArrayList<>();
@@ -63,9 +62,9 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     /**
      * Creates a new instance of this plugin.
      *
-     * @param pluginInfo This plugin's plugin info
-     * @param actionController The action controller to register listeners with
-     * @param commandController Command controller to register commands
+     * @param pluginInfo         This plugin's plugin info
+     * @param actionController   The action controller to register listeners with
+     * @param commandController  Command controller to register commands
      * @param identityController The identity controller to use.
      */
     public NowPlayingPlugin(final PluginInfo pluginInfo,
@@ -78,7 +77,8 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
         this.actionController = actionController;
         this.identityController = identityController;
 
-        registerCommand(new NowPlayingCommand(commandController, this, identityController), NowPlayingCommand.INFO);
+        registerCommand(new NowPlayingCommand(commandController, this, identityController),
+                NowPlayingCommand.INFO);
     }
 
     /** {@inheritDoc} */
@@ -115,7 +115,6 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     public void showConfig(final PreferencesDialogModel manager) {
         final ConfigPanel configPanel = UIUtilities.invokeAndWait(
                 new Callable<ConfigPanel>() {
-
             @Override
             public ConfigPanel call() {
                 return new ConfigPanel(identityController, NowPlayingPlugin.this, order);
@@ -141,7 +140,8 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     /** Loads the plugins settings. */
     private void loadSettings() {
         if (identityController.getGlobalConfiguration().hasOptionString(getDomain(), "sourceOrder")) {
-            order = identityController.getGlobalConfiguration().getOptionList(getDomain(), "sourceOrder");
+            order = identityController.getGlobalConfiguration().getOptionList(getDomain(),
+                    "sourceOrder");
         } else {
             order = new ArrayList<>();
         }
@@ -159,8 +159,8 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     }
 
     /**
-     * Checks to see if a plugin implements one of the Media Source interfaces
-     * and if it does, adds the source(s) to our list.
+     * Checks to see if a plugin implements one of the Media Source interfaces and if it does, adds
+     * the source(s) to our list.
      *
      * @param target The plugin to be tested
      */
@@ -183,8 +183,8 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     }
 
     /**
-     * Checks to see if the specified media source needs to be added to our
-     * order list, and adds it if neccessary.
+     * Checks to see if the specified media source needs to be added to our order list, and adds it
+     * if neccessary.
      *
      * @param source The media source to be tested
      */
@@ -195,8 +195,8 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     }
 
     /**
-     * Checks to see if a plugin implements one of the Media Source interfaces
-     * and if it does, removes the source(s) from our list.
+     * Checks to see if a plugin implements one of the Media Source interfaces and if it does,
+     * removes the source(s) from our list.
      *
      * @param target The plugin to be tested
      */
@@ -227,11 +227,10 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     }
 
     /**
-     * Retrieves the "best" source to use for displaying media information.
-     * The best source is defined as the earliest in the list that is running
-     * and not paused, or, if no such source exists, the earliest in the list
-     * that is running and paused. If neither condition is satisified returns
-     * null.
+     * Retrieves the "best" source to use for displaying media information. The best source is
+     * defined as the earliest in the list that is running and not paused, or, if no such source
+     * exists, the earliest in the list that is running and paused. If neither condition is
+     * satisified returns null.
      *
      * @return The best source to use for media info
      */
@@ -255,11 +254,12 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
     }
 
     /**
-     * Substitutes the keywords in the specified format with the values with
-     * values from the specified source.
+     * Substitutes the keywords in the specified format with the values with values from the
+     * specified source.
      *
      * @param format The format to be substituted
      * @param source The source whose values should be used
+     *
      * @return The substituted string
      */
     public String doSubstitution(final String format, final MediaSource source) {
@@ -274,24 +274,25 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
         final String state = source.getState().getNiceName();
 
         return format.replace("$artist", sanitise(artist))
-                     .replace("$title", sanitise(title))
-                     .replace("$album", sanitise(album))
-                     .replace("$app", sanitise(app))
-                     .replace("$bitrate", sanitise(bitrate))
-                     .replace("$format", sanitise(filetype))
-                     .replace("$length", sanitise(length))
-                     .replace("$state", sanitise(state))
-                     .replace("$time", sanitise(time));
+                .replace("$title", sanitise(title))
+                .replace("$album", sanitise(album))
+                .replace("$app", sanitise(app))
+                .replace("$bitrate", sanitise(bitrate))
+                .replace("$format", sanitise(filetype))
+                .replace("$length", sanitise(length))
+                .replace("$state", sanitise(state))
+                .replace("$time", sanitise(time));
     }
 
     /**
-     * Sanitises the specified String so that it may be used as the replacement
-     * in a call to String.replaceAll. Namely, at present, this method returns
-     * an empty String if it is passed a null value; otherwise the input is
-     * returned as-is.
+     * Sanitises the specified String so that it may be used as the replacement in a call to
+     * String.replaceAll. Namely, at present, this method returns an empty String if it is passed a
+     * null value; otherwise the input is returned as-is.
      *
      * @param input The string to be sanitised
+     *
      * @return A sanitised version of the String
+     *
      * @since 0.6.3
      */
     protected static String sanitise(final String input) {
@@ -302,6 +303,7 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
      * Retrieves a source based on its name.
      *
      * @param name The name to search for
+     *
      * @return The source with the specified name or null if none were found.
      */
     public MediaSource getSource(final String name) {
@@ -328,4 +330,5 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
 
         return res;
     }
+
 }

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

@@ -37,9 +37,9 @@ import javax.swing.SwingUtilities;
 public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>> {
 
     /**
-     * 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;
 
@@ -47,7 +47,8 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
      * Instantiates a new now playing subsitutiuons panel.
      */
     public NowPlayingSubsitutionPanel() {
-        super("Substitutions may be used as part of the output format", SubstitutionsPanel.Alignment.HORIZONTAL, null);
+        super("Substitutions may be used as part of the output format",
+                SubstitutionsPanel.Alignment.HORIZONTAL, null);
     }
 
     /**
@@ -56,14 +57,14 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
      * @param subs list of substitutions.
      */
     public NowPlayingSubsitutionPanel(final List<String> subs) {
-        super("Substitutions may be used as part of the output format", SubstitutionsPanel.Alignment.HORIZONTAL, subs);
+        super("Substitutions may be used as part of the output format",
+                SubstitutionsPanel.Alignment.HORIZONTAL, subs);
     }
 
     /** {@inheritDoc} */
     @Override
     public void setType(final List<String> type) {
         SwingUtilities.invokeLater(new Runnable() {
-
             /** {@inheritDoc} */
             @Override
             public void run() {
@@ -80,4 +81,5 @@ public class NowPlayingSubsitutionPanel extends SubstitutionsPanel<List<String>>
             }
         });
     }
+
 }