Continue main removal

Change-Id: I28c660092aabbc8eeebd9ed4dcc80cb9f3940aaf
Depends-On: I28c660092aabbc8eeebd9ed4dcc80cb9f3940aaf
Reviewed-on: http://gerrit.dmdirc.com/2589
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Main.java

@@ -104,7 +104,6 @@ public class Main {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
 
         IdentityManager.getIdentityManager().loadVersionIdentity();
-        serverManager = new ServerManager(this);
         ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
 
         final CommandLineParser clp = new CommandLineParser(this, args);
@@ -124,6 +123,7 @@ public class Main {
                 serverManager, ActionManager.getActionManager(),
                 IdentityManager.getIdentityManager(), this);
         checkBundledPlugins(pluginManager, IdentityManager.getIdentityManager().getGlobalConfiguration());
+        serverManager = new ServerManager(new ParserFactory(pluginManager));
 
         ThemeManager.loadThemes();
 

src/com/dmdirc/Server.java

@@ -194,11 +194,14 @@ public class Server extends WritableFrameContainer
      * the specified profile.
      *
      * @since 0.6.3
+     *
+     * @param parserFactory Parser factory used to create parsers.
      * @param manager The servermanager that owns this server.
      * @param uri The address of the server to connect to
      * @param profile The profile to use
      */
-    public Server(final ServerManager manager, final URI uri, final Identity profile) {
+    public Server(final ParserFactory parserFactory,
+            final ServerManager manager, final URI uri, final Identity profile) {
         super("server-disconnected", getHost(uri), getHost(uri),
                 new ConfigManager(uri.getScheme(), "", "", uri.getHost()),
                 new ServerCommandParser(
@@ -208,7 +211,7 @@ public class Server extends WritableFrameContainer
                 WindowComponent.CERTIFICATE_VIEWER.getIdentifier()));
 
         this.manager = manager;
-        parserFactory = new ParserFactory(manager.getMain().getPluginManager());
+        this.parserFactory = parserFactory;
         setConnectionDetails(uri, profile);
 
         manager.registerServer(this);

src/com/dmdirc/ServerManager.java

@@ -36,40 +36,25 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import lombok.RequiredArgsConstructor;
+
 /**
  * The ServerManager maintains a list of all servers, and provides methods to
  * search or iterate over them.
  */
+@RequiredArgsConstructor
 public class ServerManager implements ServerFactory {
 
-    /** Main that owns this ServerManager. */
-    private final Main main;
+    /** Parser factory. */
+    private final ParserFactory parserFactory;
 
     /** All servers that currently exist. */
     private final Set<Server> servers = new CopyOnWriteArraySet<Server>();
 
-    /**
-     * Creates a new instance of ServerManager.
-     */
-    public ServerManager(final Main main) {
-        this.main = main;
-    }
-
-    /**
-     * Get the Main that owns this ServerManager.
-     *
-     * @return The Main that owns this ServerManager.
-     * @Deprecated Global state is bad.
-     */
-    @Deprecated
-    public Main getMain() {
-        return main;
-    }
-
     /** {@inheritDoc} */
     @Override
     public Server createServer(final URI uri, final Identity profile) {
-        return new Server(this, uri, profile);
+        return new Server(parserFactory, this, uri, profile);
     }
 
     /**
@@ -212,7 +197,7 @@ public class ServerManager implements ServerFactory {
         }
 
         if (server == null) {
-            server = new Server(this, uri, profile);
+            server = new Server(parserFactory, this, uri, profile);
             server.connect();
             return server;
         }
@@ -248,7 +233,7 @@ public class ServerManager implements ServerFactory {
 
         if (connectedServer == null) {
             try {
-                final Server server = new Server(this, new URI("irc://irc.quakenet.org/DMDirc"),
+                final Server server = new Server(parserFactory, this, new URI("irc://irc.quakenet.org/DMDirc"),
                         IdentityManager.getIdentityManager()
                         .getIdentitiesByType("profile").get(0));
                 server.connect();

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

@@ -22,6 +22,7 @@
 
 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;
@@ -45,6 +46,8 @@ public class URLHandler {
     private static Date lastLaunch;
     /** The UI Controller that owns this handler. */
     private final UIController controller;
+    /** Server manager used to create servers. */
+    private final ServerManager serverManager;
     /** Config manager. */
     private final ConfigManager config;
     /** Desktop handler. */
@@ -54,9 +57,11 @@ public class URLHandler {
      * Instantiates a new URL Handler.
      *
      * @param controller The UI controller to show dialogs etc on
+     * @param serverManager Server manager used to create servers
      */
-    public URLHandler(final UIController controller) {
+    public URLHandler(final UIController controller, final ServerManager serverManager) {
         this.controller = controller;
+        this.serverManager = serverManager;
         this.config = IdentityManager.getIdentityManager().getGlobalConfiguration();
         this.desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
     }
@@ -155,7 +160,7 @@ public class URLHandler {
             StatusBarManager.getStatusBarManager().setMessage(
                     new StatusMessage("Connecting to: " + uri.toString(),
                     config));
-            controller.getMain().getServerManager().connectToAddress(uri);
+            serverManager.connectToAddress(uri);
         } else if ("BROWSER".equals(command)) {
             StatusBarManager.getStatusBarManager().setMessage(
                     new StatusMessage("Opening: " + uri.toString(),

src/com/dmdirc/ui/input/InputHandler.java

@@ -35,8 +35,8 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
-import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.parser.common.CompositionState;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
 import com.dmdirc.ui.messages.Styliser;
@@ -110,8 +110,8 @@ public abstract class InputHandler implements ConfigChangeListener {
     private CompositionState state = CompositionState.IDLE;
     /** Timer used to manage timeouts of composition state. */
     private Timer compositionTimer;
-    /** UIController that owns this InputHandler. */
-    private final UIController controller;
+    /** Plugin managed used to retrieve tab completers. */
+    private final PluginManager pluginManager;
 
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target
@@ -120,12 +120,14 @@ public abstract class InputHandler implements ConfigChangeListener {
      * @param thisTarget The text field this input handler is dealing with.
      * @param thisCommandParser The command parser to use for this text field.
      * @param thisParentWindow The window that owns this input handler
+     * @param pluginManager pluginManager used to retrieve tab completers
      */
-    public InputHandler(final UIController controller, final InputField thisTarget,
+    public InputHandler(final InputField thisTarget,
             final CommandParser thisCommandParser,
-            final WritableFrameContainer thisParentWindow) {
+            final WritableFrameContainer thisParentWindow,
+            final PluginManager pluginManager) {
 
-        this.controller = controller;
+        this.pluginManager = pluginManager;
         buffer = new RollingList<String>(thisParentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 
@@ -191,7 +193,7 @@ public abstract class InputHandler implements ConfigChangeListener {
      * Sets this inputhandler's tab completion style.
      */
     private void setStyle() {
-        style = (TabCompletionStyle) controller.getMain().getPluginManager()
+        style = (TabCompletionStyle) pluginManager
                 .getServiceProvider("tabcompletion", parentWindow
                 .getConfigManager().getOption("tabcompletion", "style"))
                 .getExportedService("getCompletionStyle").execute(tabCompleter,

test/com/dmdirc/ServerTest.java

@@ -22,16 +22,15 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 
-import com.dmdirc.plugins.PluginManager;
 import java.net.URI;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ServerTest {
 
@@ -40,7 +39,9 @@ public class ServerTest {
     @BeforeClass
     public static void setUp() throws Exception {
         TestMain.getTestMain();
-        server = new Server(TestMain.getTestMain().getServerManager(), new URI("irc-test://255.255.255.255"),
+        server = new Server(mock(ParserFactory.class),
+                mock(ServerManager.class),
+                new URI("irc-test://255.255.255.255"),
                 IdentityManager.getIdentityManager()
                 .getIdentitiesByType("profile").get(0));
     }

test/com/dmdirc/TestMain.java

@@ -28,13 +28,13 @@ public class TestMain extends Main {
             // DON'T do anything to the user's configuration... (so no calls
             // to handleInvalidConfigFile(); here)
         }
-        serverManager = new ServerManager(this);
         ActionManager.initActionManager(this, serverManager, IdentityManager.getIdentityManager());
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this);
         pluginManager = new PluginManager(CommandManager.getCommandManager(),
                 serverManager, ActionManager.getActionManager(),
                 IdentityManager.getIdentityManager(), this);
         pluginManager.refreshPlugins();
+        serverManager = new ServerManager(new ParserFactory(pluginManager));
         CommandManager.initCommandManager(IdentityManager.getIdentityManager(), this);
 
         ActionManager.getActionManager().initialise();

test/com/dmdirc/ui/WindowManagerTest.java

@@ -60,7 +60,7 @@ public class WindowManagerTest {
     public void testAddRoot() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
 
         manager.addListener(tfm);
 
@@ -77,8 +77,8 @@ public class WindowManagerTest {
     public void testAddChild() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addListener(tfm);
 
@@ -92,7 +92,7 @@ public class WindowManagerTest {
     public void testRemoveRoot() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addListener(tfm);
 
@@ -105,8 +105,8 @@ public class WindowManagerTest {
     public void testRemoveChild() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
         manager.addWindow(parent.getContainer(), child.getContainer());
         manager.addListener(tfm);
@@ -123,8 +123,8 @@ public class WindowManagerTest {
     public void testRemoveFrameManager() {
         final WindowManager manager = new WindowManager();
         final FrameListener tfm = mock(FrameListener.class);
-        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
-        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain()), new TestWritableFrameContainer(512, cm, commands));
+        final Window parent = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
+        final Window child = new DummyInputWindow(new DummyController(TestMain.getTestMain(), TestMain.getTestMain().getPluginManager()), new TestWritableFrameContainer(512, cm, commands));
         manager.addWindow(parent.getContainer());
 
         manager.addListener(tfm);