Fix various dependencies.

Change-Id: I8a7de439f394086ec7c2a27fbef5c1ed6bc59dfe
Depends-On: I0d78fdc62431866377a06da819724a49e738b417
Reviewed-on: http://gerrit.dmdirc.com/2704
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/ClientModule.java

@@ -68,7 +68,7 @@ import dagger.Provides;
 /**
  * Provides dependencies for the client.
  */
-@Module(injects = Main.class, includes = CommandLineOptionsModule.class)
+@Module(injects = {Main.class, CommandLineParser.class}, includes = CommandLineOptionsModule.class)
 public class ClientModule {
 
     /**

src/com/dmdirc/Main.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
@@ -127,9 +126,9 @@ public class Main implements LifecycleController {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         try {
-            ObjectGraph graph = ObjectGraph.create(
-                    new ClientModule(),
-                    new CommandLineOptionsModule(new CommandLineParser(args)));
+            final ObjectGraph graph = ObjectGraph.create(new ClientModule());
+            final CommandLineParser parser = graph.get(CommandLineParser.class);
+            parser.parse(args);
             mainInstance = graph.get(Main.class);
             mainInstance.init();
         } catch (Throwable ex) {

src/com/dmdirc/commandline/CommandLineOptionsModule.java

@@ -31,7 +31,7 @@ import dagger.Provides;
 /**
  * Provides options based on the command line.
  */
-@Module(library = true)
+@Module(library = true, complete = false)
 public class CommandLineOptionsModule {
 
     /**
@@ -57,37 +57,16 @@ public class CommandLineOptionsModule {
         DirectoryType value();
     }
 
-    /** The parser to use for command-line information. */
-    private final CommandLineParser parser;
-
-    /**
-     * Creates a new {@link CommandLineOptionsModule}.
-     *
-     * @param parser The parser to use for command-line information.
-     */
-    public CommandLineOptionsModule(final CommandLineParser parser) {
-        this.parser = parser;
-    }
-
-    /**
-     * Provides the command-line parser used for this instance.
-     *
-     * @return The command-line parser.
-     */
-    @Provides
-    public CommandLineParser getParser() {
-        return parser;
-    }
-
     /**
      * Provides the base directory that all DMDirc user data is stored in.
      *
+     * @param parser The parser to get the user-supplied directory from.
      * @return The base directory.
      */
     @Provides
     @Singleton
     @Directory(DirectoryType.BASE)
-    public String getBaseDirectory() {
+    public String getBaseDirectory(final CommandLineParser parser) {
         if (parser.getConfigDirectory() == null) {
             return getDefaultBaseDirectory();
         } else {

src/com/dmdirc/commandline/CommandLineParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandline;
 
-import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.global.NewServer;
 import com.dmdirc.config.IdentityManager;
@@ -37,9 +36,14 @@ import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+
 /**
  * Parses command line arguments for the client.
  */
+@Singleton
 public class CommandLineParser {
 
     /**
@@ -62,6 +66,9 @@ public class CommandLineParser {
     /** A list of addresses to autoconnect to. */
     private final List<URI> addresses = new ArrayList<>();
 
+    /** Provider to use to get server managers. */
+    private final Provider<ServerManager> serverManagerProvider;
+
     /** Whether to disable error reporting or not. */
     private boolean disablereporting;
 
@@ -76,10 +83,18 @@ public class CommandLineParser {
 
     /**
      * Creates a new instance of CommandLineParser.
+     */
+    @Inject
+    public CommandLineParser(final Provider<ServerManager> serverManagerProvider) {
+        this.serverManagerProvider = serverManagerProvider;
+    }
+
+    /**
+     * Parses the given arguments.
      *
      * @param arguments The arguments to be parsed
      */
-    public CommandLineParser(final String ... arguments) {
+    public void parse(final String ... arguments) {
         boolean inArg = false;
         char previousArg = '.';
 
@@ -114,7 +129,7 @@ public class CommandLineParser {
             }
         }
 
-        new RemoteServer(Main.mainInstance).bind();
+        new RemoteServer(serverManagerProvider).bind();
     }
 
     /**

src/com/dmdirc/commandline/RemoteServer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandline;
 
-import com.dmdirc.Main;
+import com.dmdirc.ServerManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -34,6 +34,8 @@ import java.rmi.registry.Registry;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.List;
 
+import javax.inject.Provider;
+
 /**
  * An RMI server that allows other clients to interact with DMDirc.
  */
@@ -43,23 +45,23 @@ public class RemoteServer implements RemoteInterface {
     private static final int MINPORT = 3634;
     /** The maximum port to use for RMI binding. */
     private static final int MAXPORT = MINPORT + 5;
-    /** The interface we're exposing. */
-    private final Main main;
+    /** Provider for the server manager to use to connect. */
+    private final Provider<ServerManager> serverManager;
 
     /**
      * Crate a new RemoteServer.
      *
-     * @param main Main instance to use to do things.
+     * @param serverManager Provider of a server manager to use to connect.
      */
-    public RemoteServer(final Main main) {
-        this.main = main;
+    public RemoteServer(final Provider<ServerManager> serverManager) {
+        this.serverManager = serverManager;
     }
 
     /** {@inheritDoc} */
     @Override
     public void connect(final List<URI> addresses) throws RemoteException {
         for (URI address : addresses) {
-            main.getServerManager().connectToAddress(address);
+            serverManager.get().connectToAddress(address);
         }
     }
 
@@ -106,9 +108,7 @@ public class RemoteServer implements RemoteInterface {
                 } else {
                     return iface;
                 }
-            } catch (RemoteException ex) {
-                continue;
-            } catch (NotBoundException ex) {
+            } catch (RemoteException | NotBoundException ex) {
                 continue;
             }
         }

src/com/dmdirc/plugins/PluginInfo.java

@@ -26,6 +26,7 @@ import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
@@ -177,6 +178,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         injector.addParameter(WindowManager.class, WindowManager.getWindowManager());
         injector.addParameter(StatusBarManager.getStatusBarManager());
         injector.addParameter(PreferencesManager.class, PreferencesManager.getPreferencesManager());
+        injector.addParameter(PerformWrapper.class, PerformWrapper.getPerformWrapper());
 
         return injector;
     }

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.util;
 
+import com.dmdirc.ServerManager;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -47,6 +47,10 @@ public class URLHandler {
     private final UIController controller;
     /** Config manager. */
     private final ConfigManager config;
+    /** Server manager to use to connect to servers. */
+    private final ServerManager serverManager;
+    /** Status bar manager to use to show messages. */
+    private final StatusBarManager statusBarManager;
     /** Desktop handler. */
     private final Desktop desktop;
 
@@ -55,9 +59,15 @@ public class URLHandler {
      *
      * @param controller The UI controller to show dialogs etc on
      */
-    public URLHandler(final UIController controller) {
+    public URLHandler(
+            final UIController controller,
+            final ConfigManager globalConfig,
+            final ServerManager serverManager,
+            final StatusBarManager statusBarManager) {
         this.controller = controller;
-        this.config = IdentityManager.getIdentityManager().getGlobalConfiguration();
+        this.config = globalConfig;
+        this.serverManager = serverManager;
+        this.statusBarManager = statusBarManager;
         this.desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
     }
 
@@ -152,19 +162,19 @@ public class URLHandler {
         final String command = config.getOption("protocol", uri.getScheme().toLowerCase());
 
         if ("DMDIRC".equals(command)) {
-            StatusBarManager.getStatusBarManager().setMessage(
+            statusBarManager.setMessage(
                     new StatusMessage("Connecting to: " + uri.toString(),
                     config));
-            controller.getMain().getServerManager().connectToAddress(uri);
+            serverManager.connectToAddress(uri);
         } else if ("BROWSER".equals(command)) {
-            StatusBarManager.getStatusBarManager().setMessage(
+            statusBarManager.setMessage(
                     new StatusMessage("Opening: " + uri.toString(),
                     config));
             execBrowser(uri);
         } else if ("MAIL".equals(command)) {
             execMail(uri);
         } else {
-            StatusBarManager.getStatusBarManager().setMessage(
+            statusBarManager.setMessage(
                     new StatusMessage("Opening: " + uri.toString(),
                     config));
             execApp(substituteParams(uri, command));