Pass IdentityManager into commands that use it.

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

src/com/dmdirc/Main.java

@@ -134,7 +134,7 @@ public class Main implements LifecycleController {
 
         clp.applySettings();
 
-        new CommandLoader(this, serverManager, pluginManager)
+        new CommandLoader(this, serverManager, pluginManager, IdentityManager.getIdentityManager())
                 .loadCommands(CommandManager.initCommandManager(IdentityManager.getIdentityManager(), serverManager));
 
         for (String service : new String[]{"ui", "tabcompletion", "parser"}) {

src/com/dmdirc/commandparser/CommandLoader.java

@@ -67,6 +67,7 @@ import com.dmdirc.commandparser.commands.server.Raw;
 import com.dmdirc.commandparser.commands.server.RawServerCommand;
 import com.dmdirc.commandparser.commands.server.Reconnect;
 import com.dmdirc.commandparser.commands.server.Umode;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.plugins.PluginManager;
 
@@ -84,20 +85,26 @@ public class CommandLoader {
     /** Plugin manager to give to plugin-dependent commands. */
     private final PluginManager pluginManager;
 
+    /** The identity manager to pass to config-related commands. */
+    private final IdentityManager identityManager;
+
     /**
      * Creates a new instance of {@link CommandLoader}.
      *
      * @param lifecycleController Controller to give to commands that want to start/stop the app.
      * @param serverManager The server manager to pass to server-related commands.
      * @param pluginManager The plugin manager to pass to plugin-dependent commands.
+     * @param identityManager The identity manager to pass to config-related commands.
      */
     public CommandLoader(
             final LifecycleController lifecycleController,
             final ServerManager serverManager,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager,
+            final IdentityManager identityManager) {
         this.lifecycleController = lifecycleController;
         this.serverManager = serverManager;
         this.pluginManager = pluginManager;
+        this.identityManager = identityManager;
     }
 
     /**
@@ -154,16 +161,16 @@ public class CommandLoader {
         manager.registerCommand(new Exit(lifecycleController), Exit.INFO);
         manager.registerCommand(new Help(), Help.INFO);
         manager.registerCommand(new Ifplugin(pluginManager), Ifplugin.INFO);
-        manager.registerCommand(new NewServer(serverManager, pluginManager), NewServer.INFO);
+        manager.registerCommand(new NewServer(serverManager, pluginManager, identityManager), NewServer.INFO);
         manager.registerCommand(new Notify(), Notify.INFO);
         manager.registerCommand(new LoadPlugin(pluginManager), LoadPlugin.INFO);
         manager.registerCommand(new UnloadPlugin(pluginManager), UnloadPlugin.INFO);
         manager.registerCommand(new OpenWindow(), OpenWindow.INFO);
         manager.registerCommand(new ReloadActions(), ReloadActions.INFO);
-        manager.registerCommand(new ReloadIdentities(), ReloadIdentities.INFO);
+        manager.registerCommand(new ReloadIdentities(identityManager), ReloadIdentities.INFO);
         manager.registerCommand(new ReloadPlugin(pluginManager), ReloadPlugin.INFO);
-        manager.registerCommand(new SaveConfig(), SaveConfig.INFO);
-        manager.registerCommand(new Set(), Set.INFO);
+        manager.registerCommand(new SaveConfig(identityManager), SaveConfig.INFO);
+        manager.registerCommand(new Set(identityManager, identityManager), Set.INFO);
     }
 
 }

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -60,18 +60,24 @@ public class NewServer extends Command implements IntelligentCommand {
     /** Plugin manager to query for available services. */
     private final PluginManager pluginManager;
 
+    /** Identity controller to use to find profiles. */
+    private final IdentityController identityController;
+
     /**
      * Creates a new newserver command which will use the specified factory
      * to construct servers.
      *
      * @param serverFactory The factory to use to construct servers
      * @param pluginManager The plugin manager to use to query available services.
+     * @param identityController Identity controller to use to find profiles.
      */
     public NewServer(
             final ServerFactory serverFactory,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager,
+            final IdentityController identityController) {
         this.serverFactory = serverFactory;
         this.pluginManager = pluginManager;
+        this.identityController = identityController;
     }
 
     /** {@inheritDoc} */
@@ -102,8 +108,7 @@ public class NewServer extends Command implements IntelligentCommand {
         }
 
         final Server server = serverFactory.createServer(address,
-                IdentityManager.getIdentityManager()
-                .getIdentitiesByType("profile").get(0));
+                identityController.getIdentitiesByType("profile").get(0));
         server.connect();
     }
 
@@ -159,7 +164,7 @@ public class NewServer extends Command implements IntelligentCommand {
             final CommandArguments args) {
 
         boolean ssl = false;
-        String host = "";
+        String host;
         String pass = null;
         int port = 6667;
         int offset = 0;

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

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -43,11 +43,23 @@ public class ReloadIdentities extends Command implements IntelligentCommand {
             "reloadidentities - reloads user identities (configuration files)",
             CommandType.TYPE_GLOBAL);
 
+    /** Identity controller cause to reload identities. */
+    private final IdentityController identityController;
+
+    /**
+     * Creates a new instance of the {@link ReloadIdentities} command.
+     *
+     * @param identityController The controller to reload identities on.
+     */
+    public ReloadIdentities(final IdentityController identityController) {
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        IdentityManager.getIdentityManager().loadUserIdentities();
+        identityController.loadUserIdentities();
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Identities reloaded.");
     }

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

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 /**
@@ -43,11 +43,23 @@ public final class SaveConfig extends Command implements IntelligentCommand {
             "saveconfig - force the client to save its configuration to disk",
             CommandType.TYPE_GLOBAL);
 
+    /** Identity controller cause to save identities. */
+    private final IdentityController identityController;
+
+    /**
+     * Creates a new instance of the {@link SaveConfig} command.
+     *
+     * @param identityController The controller to save identities on.
+     */
+    public SaveConfig(final IdentityController identityController) {
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        IdentityManager.getIdentityManager().saveAll();
+        identityController.saveAll();
 
         sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Configuration file saved.");
     }

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

@@ -37,7 +37,8 @@ import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
-import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.IdentityController;
+import com.dmdirc.interfaces.IdentityFactory;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
@@ -65,12 +66,25 @@ public class Set extends Command implements IntelligentCommand {
     /** The command flag handler for this command. */
     private final CommandFlagHandler handler;
 
+    /** The controller to use to set settings. */
+    private final IdentityController identityController;
+    /** The factory to use to create new identities. */
+    private final IdentityFactory identityFactory;
+
     /**
      * Creates a new instance of Set.
+     *
+     * @param identityController The controller to use to set settings.
+     * @param identityFactory The factory to use to create new identities.
      */
-    public Set() {
+    public Set(
+            final IdentityController identityController,
+            final IdentityFactory identityFactory) {
         super();
 
+        this.identityController = identityController;
+        this.identityFactory = identityFactory;
+
         unsetFlag.addDisabled(appendFlag);
         appendFlag.addDisabled(unsetFlag);
 
@@ -90,8 +104,8 @@ public class Set extends Command implements IntelligentCommand {
             return;
         }
 
-        Identity identity = IdentityManager.getIdentityManager().getGlobalConfigIdentity();
-        ConfigManager manager = IdentityManager.getIdentityManager().getGlobalConfiguration();
+        Identity identity = identityController.getGlobalConfigIdentity();
+        ConfigManager manager = identityController.getGlobalConfiguration();
 
         if (res.hasFlag(serverFlag)) {
             if (origin.getServer() == null) {
@@ -112,7 +126,7 @@ public class Set extends Command implements IntelligentCommand {
             }
 
             final Channel channel = ((ChannelCommandContext) context).getChannel();
-            identity = IdentityManager.getIdentityManager().createChannelConfig(
+            identity = identityFactory.createChannelConfig(
                     origin.getServer().getNetwork(), channel.getName());
             manager = channel.getConfigManager();
         }

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

@@ -28,6 +28,7 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandLoader;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.plugins.PluginManager;
 
@@ -58,13 +59,14 @@ public class HelpTest {
 
     @Parameterized.Parameters
     public static List<Object[]> data() throws InvalidIdentityFileException {
-        final List<Object[]> res = new LinkedList<Object[]>();
+        final List<Object[]> res = new LinkedList<>();
 
         TestMain.getTestMain();
         new CommandLoader(
                 mock(LifecycleController.class),
                 mock(ServerManager.class),
-                mock(PluginManager.class)).loadCommands(CommandManager.getCommandManager());
+                mock(PluginManager.class),
+                mock(IdentityManager.class)).loadCommands(CommandManager.getCommandManager());
 
         for (CommandType type : CommandType.values()) {
             for (CommandInfo command : CommandManager.getCommandManager().getCommands(type).keySet()) {

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -27,6 +27,7 @@ import com.dmdirc.TestMain;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
 import com.dmdirc.plugins.PluginManager;
 
@@ -35,13 +36,18 @@ import java.net.URISyntaxException;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
 
+import clover.retrotranslator.edu.emory.mathcs.backport.java.util.Arrays;
 import static org.mockito.Mockito.*;
 
+@RunWith(MockitoJUnitRunner.class)
 public class NewServerTest {
 
+    @Mock private IdentityController identityController;
+    @Mock private Identity identity;
     @Mock private FrameContainer container;
     @Mock private PluginManager pluginManager;
     @Mock private ServerFactory factory;
@@ -51,9 +57,9 @@ public class NewServerTest {
     @Before
     public void setup() {
         TestMain.getTestMain();
-        MockitoAnnotations.initMocks(this);
         when(factory.createServer(any(URI.class), any(Identity.class))).thenReturn(server);
-        command = new NewServer(factory, pluginManager);
+        when(identityController.getIdentitiesByType("profile")).thenReturn(Arrays.asList(new Identity[] { identity }));
+        command = new NewServer(factory, pluginManager, identityController);
     }
 
     @Test