Inject the CommandLoader.

Create a proper LifecycleController implementation that can be
injected, move the interface to the interfaces package, and
then inject the CommandLoader instead of creating it in Main.

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

src/com/dmdirc/ClientModule.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.LifecycleController;
 
 import javax.inject.Singleton;
 
@@ -100,4 +101,15 @@ public class ClientModule {
         return actionManager;
     }
 
+    /**
+     * Provides a lifecycle controller.
+     *
+     * @param controller The concrete implementation to use.
+     * @return The lifecycle controller the app should use.
+     */
+    @Provides
+    public LifecycleController getLifecycleController(final SystemLifecycleController controller) {
+        return controller;
+    }
+
 }

src/com/dmdirc/Main.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.commandline.CommandLineOptionsModule;
@@ -90,6 +91,9 @@ public class Main implements LifecycleController {
     /** The plugin manager the client will use. */
     private final PluginManager pluginManager;
 
+    /** The command loader to use to initialise the command manager. */
+    private final CommandLoader commandLoader;
+
     /** The config dir to use for the client. */
     private final String configdir;
 
@@ -105,6 +109,7 @@ public class Main implements LifecycleController {
      * @param actionManager The action manager the client will use.
      * @param commandLineParser The command-line parser used for this instance.
      * @param pluginManager The plugin manager the client will use.
+     * @param commandLoader The command loader to use to initialise the command manager.
      * @param configDir The base configuration directory to use.
      */
     @Inject
@@ -114,12 +119,14 @@ public class Main implements LifecycleController {
             final ActionManager actionManager,
             final CommandLineParser commandLineParser,
             final PluginManager pluginManager,
+            final CommandLoader commandLoader,
             @Directory(DirectoryType.BASE) final String configDir) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;
         this.commandLineParser = commandLineParser;
         this.pluginManager = pluginManager;
+        this.commandLoader = commandLoader;
         this.configdir = configDir;
     }
 
@@ -167,8 +174,7 @@ public class Main implements LifecycleController {
 
         commandLineParser.applySettings(identityManager.getGlobalConfigIdentity());
 
-        new CommandLoader(this, serverManager, pluginManager, identityManager)
-                .loadCommands(CommandManager.initCommandManager(identityManager, serverManager));
+        commandLoader.loadCommands(CommandManager.initCommandManager(identityManager, serverManager));
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {
             ensureExists(pluginManager, service);
@@ -400,27 +406,47 @@ public class Main implements LifecycleController {
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use a proper {@link LifecycleController}.
+     */
     @Override
+    @Deprecated
     public void quit() {
         quit(0);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use a proper {@link LifecycleController}.
+     */
     @Override
+    @Deprecated
     public void quit(final int exitCode) {
-        quit(IdentityManager.getIdentityManager().getGlobalConfiguration().getOption("general",
+        quit(identityManager.getGlobalConfiguration().getOption("general",
                 "closemessage"), exitCode);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use a proper {@link LifecycleController}.
+     */
     @Override
+    @Deprecated
     public void quit(final String reason) {
         quit(reason, 0);
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     *
+     * @deprecated Use a proper {@link LifecycleController}.
+     */
     @Override
+    @Deprecated
     public void quit(final String reason, final int exitCode) {
         serverManager.disconnectAll(reason);
 

src/com/dmdirc/SystemLifecycleController.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.LifecycleController;
+
+import javax.inject.Inject;
+
+/**
+ * Simple {@link LifecycleController} implementation that calls {@link System#exit(int)}.
+ */
+public class SystemLifecycleController implements LifecycleController {
+
+    /** Controller to retrieve settings from. */
+    private final IdentityController identityController;
+
+    /** Manager to use to disconnect servers. */
+    private final ServerManager serverManager;
+
+    @Inject
+    public SystemLifecycleController(
+            final IdentityController identityController,
+            final ServerManager serverManager) {
+        this.identityController = identityController;
+        this.serverManager = serverManager;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void quit() {
+        quit(0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void quit(final int exitCode) {
+        quit(identityController.getGlobalConfiguration()
+                .getOption("general", "closemessage"), exitCode);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void quit(final String reason) {
+        quit(reason, 0);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void quit(final String reason, final int exitCode) {
+        serverManager.disconnectAll(reason);
+
+        System.exit(exitCode);
+    }
+
+}

src/com/dmdirc/commandparser/CommandLoader.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.LifecycleController;
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.channel.Ban;
 import com.dmdirc.commandparser.commands.channel.Cycle;
@@ -71,6 +71,8 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginManager;
 
+import javax.inject.Inject;
+
 /**
  * Facilitates loading of core commands into a {@link CommandManager}.
  */
@@ -96,6 +98,7 @@ public class CommandLoader {
      * @param pluginManager The plugin manager to pass to plugin-dependent commands.
      * @param identityManager The identity manager to pass to config-related commands.
      */
+    @Inject
     public CommandLoader(
             final LifecycleController lifecycleController,
             final ServerManager serverManager,

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

@@ -23,7 +23,7 @@
 package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.LifecycleController;
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;

src/com/dmdirc/LifecycleController.java → src/com/dmdirc/interfaces/LifecycleController.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc;
+package com.dmdirc.interfaces;
 
 /**
  * Provides methods that control the lifecycle of the application.

test/com/dmdirc/TestMain.java

@@ -30,7 +30,8 @@ public class TestMain extends Main {
             final CommandLineParser commandLineParser,
             final PluginManager pluginManager,
             final String configDir) {
-        super(identityManager, serverManager, actionManager, commandLineParser, pluginManager, configDir);
+        super(identityManager, serverManager, actionManager, commandLineParser,
+                pluginManager, null, configDir);
         this.identityManager = identityManager;
         this.serverManager = serverManager;
         this.actionManager = actionManager;

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.LifecycleController;
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.ServerManager;
 import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandInfo;