Minor changes to facilitate testing.

Remove some 'final' modifiers for CommandParser methods.

Modify the Logger class so it only calls into the ErrorManager if
it actually needs it. The ErrorManager constructor requires an
IdentityManager which causes any test that executes a Logger.assert
line to require most of the client is constructed, regardless of
what the test is actually doing.

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

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

@@ -75,9 +75,8 @@ public abstract class CommandParser implements Serializable {
     /** Creates a new instance of CommandParser. */
     protected CommandParser(final ConfigManager configManager,
             final CommandManager commandManager) {
-        commands = new HashMap<String, CommandInfoPair>();
-        history = new RollingList<PreviousCommand>(configManager
-                .getOptionInt("general", "commandhistory"));
+        commands = new HashMap<>();
+        history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));
         this.commandManager = commandManager;
         loadCommands();
     }
@@ -121,7 +120,7 @@ public abstract class CommandParser implements Serializable {
      * @return A map of commands known to this parser
      */
     public Map<String, CommandInfoPair> getCommands() {
-        return new HashMap<String, CommandInfoPair>(commands);
+        return new HashMap<>(commands);
     }
 
     /**
@@ -257,8 +256,7 @@ public abstract class CommandParser implements Serializable {
      * @param line The line to be parsed
      * @since 0.6.4
      */
-    public final void parseCommand(final FrameContainer origin,
-            final String line) {
+    public void parseCommand(final FrameContainer origin, final String line) {
         parseCommand(origin, line, true);
     }
 
@@ -268,7 +266,7 @@ public abstract class CommandParser implements Serializable {
      * @param origin The window in which the command was typed
      * @param line The line to be parsed
      */
-    public final void parseCommandCtrl(final FrameContainer origin, final String line) {
+    public void parseCommandCtrl(final FrameContainer origin, final String line) {
         handleNonCommand(origin, line);
     }
 

src/com/dmdirc/logger/Logger.java

@@ -27,9 +27,6 @@ package com.dmdirc.logger;
  */
 public final class Logger {
 
-    /** The MANAGER to use to report errors. */
-    protected static final ErrorManager MANAGER = ErrorManager.getErrorManager();
-
     /** Prevent instantiation of a new instance of Logger. */
     private Logger() {
         //Ignore
@@ -42,7 +39,7 @@ public final class Logger {
      * @param message Brief error description
      */
     public static void userError(final ErrorLevel level, final String message) {
-        MANAGER.addError(level, message);
+        getErrorManager().addError(level, message);
     }
 
     /**
@@ -54,7 +51,7 @@ public final class Logger {
      */
     public static void userError(final ErrorLevel level, final String message,
             final String details) {
-        MANAGER.addError(level, message, new String[]{details}, false);
+        getErrorManager().addError(level, message, new String[]{details}, false);
     }
 
     /**
@@ -66,7 +63,7 @@ public final class Logger {
      */
     public static void userError(final ErrorLevel level,
             final String message, final Throwable exception) {
-        MANAGER.addError(level, message, exception, false);
+        getErrorManager().addError(level, message, exception, false);
     }
 
     /**
@@ -79,7 +76,7 @@ public final class Logger {
      */
     public static void appError(final ErrorLevel level,
             final String message, final Throwable exception) {
-        MANAGER.addError(level, message, exception, true);
+        getErrorManager().addError(level, message, exception, true);
     }
 
     /**
@@ -94,4 +91,13 @@ public final class Logger {
         }
     }
 
+    /**
+     * Gets the manager that should be used to report errors.
+     *
+     * @return The error manager to be used.
+     */
+    private static ErrorManager getErrorManager() {
+        return ErrorManager.getErrorManager();
+    }
+
 }