More tidying.

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

src/com/dmdirc/commandline/CommandLineOptionsModule.java

@@ -23,8 +23,10 @@
 package com.dmdirc.commandline;
 
 import java.io.File;
+
 import javax.inject.Qualifier;
 import javax.inject.Singleton;
+
 import dagger.Module;
 import dagger.Provides;
 
@@ -87,7 +89,7 @@ public class CommandLineOptionsModule {
     @Provides
     @Singleton
     @Directory(DirectoryType.PLUGINS)
-    public String getPluginsDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+    public String getPluginsDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
         return baseDirectory + "plugins" + File.separator;
     }
 
@@ -100,7 +102,7 @@ public class CommandLineOptionsModule {
     @Provides
     @Singleton
     @Directory(DirectoryType.ACTIONS)
-    public String getActionsDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+    public String getActionsDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
         return baseDirectory + "actions" + File.separator;
     }
 
@@ -113,7 +115,7 @@ public class CommandLineOptionsModule {
     @Provides
     @Singleton
     @Directory(DirectoryType.IDENTITIES)
-    public String getIdentitiesDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+    public String getIdentitiesDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
         return baseDirectory + "identities" + File.separator;
     }
 
@@ -126,7 +128,7 @@ public class CommandLineOptionsModule {
     @Provides
     @Singleton
     @Directory(DirectoryType.THEMES)
-    public String getThemesDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+    public String getThemesDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
         return baseDirectory + "themes" + File.separator;
     }
 
@@ -142,7 +144,7 @@ public class CommandLineOptionsModule {
     @Provides
     @Singleton
     @Directory(DirectoryType.TEMPORARY)
-    public String getTempDirectory(final @Directory(DirectoryType.BASE) String baseDirectory) {
+    public String getTempDirectory(@Directory(DirectoryType.BASE) final String baseDirectory) {
         return baseDirectory;
     }
 

src/com/dmdirc/commandline/CommandLineParser.java

@@ -52,7 +52,7 @@ public class CommandLineParser {
      * following order: short option, long option, description, whether or not
      * the option takes an argument.
      */
-    private final Object[][] ARGUMENTS = new Object[][]{
+    private static final Object[][] ARGUMENTS = new Object[][]{
         {'c', "connect", "Connect to the specified server", Boolean.TRUE},
         {'d', "directory", "Use the specified configuration directory", Boolean.TRUE},
         {'e', "existing", "Try to use an existing instance of DMDirc (use with -c)", Boolean.FALSE},
@@ -221,39 +221,39 @@ public class CommandLineParser {
      */
     private void processArgument(final char arg, final String param) {
         switch (arg) {
-        case 'c':
-            doConnect(param);
-            break;
-        case 'd':
-            doDirectory(param);
-            break;
-        case 'e':
-            doExisting();
-            break;
-        case 'k':
-            doExistingCheck();
-            break;
-        case 'h':
-            doHelp();
-            break;
-        case 'l':
-            launcherVersion = param;
-            break;
-        case 'p':
-            doDirectory(DMDircResourceManager.getCurrentWorkingDirectory());
-            break;
-        case 'r':
-            disablereporting = true;
-            break;
-        case 'v':
-            doVersion();
-            break;
-        default:
-            // This really shouldn't ever happen, but we'll handle it nicely
-            // anyway.
-
-            doUnknownArg("Unknown argument: " + arg);
-            break;
+            case 'c':
+                doConnect(param);
+                break;
+            case 'd':
+                doDirectory(param);
+                break;
+            case 'e':
+                doExisting();
+                break;
+            case 'k':
+                doExistingCheck();
+                break;
+            case 'h':
+                doHelp();
+                break;
+            case 'l':
+                launcherVersion = param;
+                break;
+            case 'p':
+                doDirectory(DMDircResourceManager.getCurrentWorkingDirectory());
+                break;
+            case 'r':
+                disablereporting = true;
+                break;
+            case 'v':
+                doVersion();
+                break;
+            default:
+                // This really shouldn't ever happen, but we'll handle it nicely
+                // anyway.
+
+                doUnknownArg("Unknown argument: " + arg);
+                break;
         }
     }
 

src/com/dmdirc/commandparser/CommandManager.java

@@ -46,22 +46,20 @@ import java.util.Map;
 public class CommandManager implements CommandController {
 
     /** A list of commands that have been instantiated. */
-    private final Map<CommandInfo, Command> commands
-            = new HashMap<>();
+    private final Map<CommandInfo, Command> commands = new HashMap<>();
 
     /** A list of command parsers that have been instantiated. */
-    private final MapList<CommandType, CommandParser> parsers
-            = new MapList<>();
+    private final MapList<CommandType, CommandParser> parsers = new MapList<>();
 
     /** The manager to use to iterate servers. */
     private final ServerManager serverManager;
 
     /** The command char we're using. */
-    @ConfigBinding(domain="general", key="commandchar")
+    @ConfigBinding(domain = "general", key = "commandchar")
     private char commandChar;
 
     /** The silence char we're using. */
-    @ConfigBinding(domain="general", key="silencechar")
+    @ConfigBinding(domain = "general", key = "silencechar")
     private char silenceChar;
 
     /**
@@ -73,10 +71,12 @@ public class CommandManager implements CommandController {
         this.serverManager = serverManager;
     }
 
+    @Override
     public char getCommandChar() {
         return commandChar;
     }
 
+    @Override
     public char getSilenceChar() {
         return silenceChar;
     }

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

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.LifecycleController;
 
 import javax.inject.Inject;
 

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

@@ -230,7 +230,7 @@ public abstract class CommandParser implements Serializable {
      * @param command The command name and arguments that were used
      */
     private void addHistory(final String command) {
-        synchronized(history) {
+        synchronized (history) {
             final PreviousCommand pc = new PreviousCommand(command);
             history.remove(pc);
             history.add(pc);
@@ -247,7 +247,7 @@ public abstract class CommandParser implements Serializable {
     public long getCommandTime(final String command) {
         long res = 0;
 
-        synchronized(history) {
+        synchronized (history) {
             for (PreviousCommand pc : history.getList()) {
                 if (pc.getLine().matches("(?i)" + command)) {
                     res = Math.max(res, pc.getTime());