Revert "Continue main removal"

Revert "Begin removing CommandManager singleton."

This reverts commit eefba0d347.

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

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -73,7 +73,7 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
     /** {@inheritDoc} */
     @Override
     protected void initContent(final JPanel panel) {
-        final List<Server> servers = getController().getServerManager().getServers();
+        final List<Server> servers = getController().getMain().getServerManager().getServers();
 
         if (servers.isEmpty()) {
             panel.add(new JLabel("No open servers."));

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -83,7 +83,7 @@ public final class ServerListDialog extends StandardDialog implements
         super(controller, controller.getMainFrame(), ModalityType.MODELESS);
 
         setTitle("Server List");
-        model = new ServerListModel(controller.getPluginManager(), controller.getServerManager());
+        model = new ServerListModel(controller.getPluginManager(), controller.getMain().getServerManager());
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
         connectButton = new JButton("Connect");

src/com/dmdirc/addons/serverlists/ServerEntry.java

@@ -97,7 +97,7 @@ public class ServerEntry extends ServerGroupItemBase {
     /** {@inheritDoc} */
     @Override
     public void connect() {
-        final Server server = serverManager.createServer(address, getProfileIdentity());
+        final Server server = new Server(serverManager, address, getProfileIdentity());
         server.connect();
     }
 

src/com/dmdirc/addons/ui_dummy/DummyChannelWindow.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_dummy;
 
 import com.dmdirc.Channel;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy channel window, used for testing.
@@ -35,7 +36,7 @@ public final class DummyChannelWindow extends DummyInputWindow {
      * @param controller Parent Controller
      * @param parent Parent channel
      */
-    public DummyChannelWindow(final DummyController controller, final Channel parent) {
+    public DummyChannelWindow(final UIController controller, final Channel parent) {
         super(controller, parent);
     }
 }

src/com/dmdirc/addons/ui_dummy/DummyController.java

@@ -30,34 +30,23 @@ import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.plugins.PluginManager;
 
 import java.net.URI;
 
-import lombok.Getter;
-
 /**
  * Implements a dummy UI controller.
  */
-@SuppressWarnings("PMD.UnusedPrivateField")
 public final class DummyController extends BasePlugin implements UIController {
 
     /** The main that owns us. */
     private final Main main;
-    /** Plugin manager. */
-    @Getter
-    private final PluginManager pluginManager;
 
     /**
      * Creates a new instance of DummyController.
-     *
-     * @param main Main
-     * @param pluginManager Plugin manager
      */
-    public DummyController(final Main main, final PluginManager pluginManager) {
+    public DummyController(final Main main) {
         super();
         this.main = main;
-        this.pluginManager = pluginManager;
         StatusBarManager.getStatusBarManager().registerStatusBar(new DummyStatusBar());
     }
 

src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java

@@ -26,6 +26,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy input handler.
@@ -41,11 +42,11 @@ public class DummyInputHandler extends InputHandler {
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public DummyInputHandler(final DummyController controller,
+    public DummyInputHandler(final UIController controller,
             final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(target, commandParser, parentWindow, controller.getPluginManager());
+        super(controller, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_dummy;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.interfaces.ui.UIController;
 
 /**
  * Dummy input window, used for testing.
@@ -35,14 +36,14 @@ public class DummyInputWindow implements InputWindow {
     private final WritableFrameContainer container;
 
     /** Our Controller. */
-    private final DummyController controller;
+    private final UIController controller;
 
     /**
      * Instantiates a new DummyInputWindow.
      *
      * @param owner Parent window
      */
-    public DummyInputWindow(final DummyController controller, final WritableFrameContainer owner) {
+    public DummyInputWindow(final UIController controller, final WritableFrameContainer owner) {
         this.controller = controller;
         this.container = owner;
     }
@@ -62,7 +63,7 @@ public class DummyInputWindow implements InputWindow {
 
     /** {@inheritDoc} */
     @Override
-    public DummyController getController() {
+    public UIController getController() {
         return controller;
     }
 

src/com/dmdirc/addons/ui_swing/Apple.java

@@ -444,7 +444,7 @@ public final class Apple implements InvocationHandler, ActionListener {
             synchronized (addresses) {
                 clientOpened = true;
                 for (final URI addr : addresses) {
-                    controller.getServerManager().connectToAddress(addr);
+                    controller.getMain().getServerManager().connectToAddress(addr);
                 }
                 addresses.clear();
             }
@@ -518,7 +518,7 @@ public final class Apple implements InvocationHandler, ActionListener {
                 if (Thread.currentThread().getContextClassLoader() == null) {
                     Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
                 }
-                controller.getServerManager().connectToAddress(uri);
+                controller.getMain().getServerManager().connectToAddress(uri);
             } else {
                 addresses.add(uri);
             }

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -521,7 +521,7 @@ public final class MainFrame extends JFrame implements WindowListener,
             protected Void doInBackground() {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSING, null);
-                controller.getServerManager().closeAll(controller
+                controller.getMain().getServerManager().closeAll(controller
                         .getGlobalConfig().getOption("general", "closemessage"));
                 controller.getGlobalIdentity().setOption("ui",
                         "frameManagerSize",

src/com/dmdirc/addons/ui_swing/SwingController.java

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
 import com.dmdirc.addons.ui_swing.commands.Input;
@@ -106,7 +105,7 @@ public class SwingController extends BasePlugin implements UIController {
     private final AtomicBoolean mainFrameCreated = new AtomicBoolean(false);
     /** URL Handler to use. */
     @Getter
-    private final URLHandler URLHandler;
+    private final URLHandler URLHandler = new URLHandler(this);
     /** Singleton instance of MainFrame. */
     @Getter
     private MainFrame mainFrame;
@@ -156,31 +155,24 @@ public class SwingController extends BasePlugin implements UIController {
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
-    /** Server manager. */
-    @Getter
-    private final ServerManager serverManager;
 
     /**
      * Instantiates a new SwingController.
      *
      * @param pluginInfo Plugin info
      * @param identityManager Identity Manager
-     * @param main Main
      */
     public SwingController(final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final PluginManager pluginManager,
-            final ActionManager actionManager,
-            final ServerManager serverManager,
-            final Main main) {
+            final Main main,
+            final ActionManager actionManager) {
         super();
         this.main = main;
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
         this.actionManager = actionManager;
         this.pluginManager = pluginManager;
-        this.serverManager = serverManager;
-        URLHandler = new URLHandler(this, serverManager);
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();
         addonIdentity = identityManager.getGlobalAddonIdentity();

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -67,11 +67,11 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
                     ActionManager.installActionPack(file.getAbsolutePath());
                     break;
                 case TYPE_PLUGIN:
-                    final File newFile = new File(controller
+                    final File newFile = new File(controller.getMain()
                             .getPluginManager().getDirectory(),
                             info.getTitle() + ".jar");
                     if (file.renameTo(newFile)) {
-                        controller.getPluginManager().addPlugin(
+                        controller.getMain().getPluginManager().addPlugin(
                                 newFile.getName());
                     } else {
                         return "Unable to install addon, failed to move file: "

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -63,7 +63,7 @@ public class PluginPanel extends AddonPanel implements ActionListener {
 
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.PLUGIN_REFRESH);
-        controller.getPluginManager().refreshPlugins();
+        controller.getMain().getPluginManager().refreshPlugins();
     }
 
     /** {@inheritDoc} */
@@ -71,7 +71,7 @@ public class PluginPanel extends AddonPanel implements ActionListener {
     protected JTable populateList(final JTable table) {
         final List<PluginInfo> list = new ArrayList<PluginInfo>();
         final List<PluginInfo> sortedList = new ArrayList<PluginInfo>();
-        list.addAll(controller.getPluginManager().getPluginInfos());
+        list.addAll(controller.getMain().getPluginManager().getPluginInfos());
         Collections.sort(list);
         for (final PluginInfo plugin : list) {
             if (plugin.getMetaData().getParents().length == 0) {

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
@@ -57,11 +57,11 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public SwingInputHandler(final SwingController controller,
+    public SwingInputHandler(final UIController controller,
             final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(target, commandParser, parentWindow, controller.getPluginManager());
+        super(controller, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -95,7 +95,7 @@ public class HelpMenu extends JMenu implements ActionListener {
         if (e.getActionCommand().equals("About")) {
             controller.showDialog(AboutDialog.class);
         } else if (e.getActionCommand().equals("JoinDevChat")) {
-            controller.getServerManager().joinDevChat();
+            controller.getMain().getServerManager().joinDevChat();
         } else if (e.getActionCommand().equals("feedback")) {
             controller.showDialog(FeedbackDialog.class);
         }

src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -99,7 +99,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
         accept.setActionCommand("acceptAll");
         accept.addActionListener(this);
 
-        for (final Server server : controller.getServerManager().getServers()) {
+        for (final Server server : controller.getMain().getServerManager().getServers()) {
             server.addInviteListener(this);
         }
 

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -180,7 +180,7 @@ public final class FeedbackDialog extends StandardDialog implements
         final StringBuilder serverInfo = new StringBuilder();
         final StringBuilder dmdircInfo = new StringBuilder();
         if (serverCheckbox.isSelected()) {
-            for (Server server : getController().getServerManager()
+            for (Server server : getController().getMain().getServerManager()
                     .getServers()) {
                 if (server.getState().isDisconnected()) {
                     continue;

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -125,7 +125,7 @@ public final class NewServerDialog extends StandardDialog implements
 
         serverField.requestFocusInWindow();
 
-        if (getController().getServerManager().numServers() == 0 ||
+        if (getController().getMain().getServerManager().numServers() == 0 ||
                 getController().getMainFrame().getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
@@ -247,13 +247,13 @@ public final class NewServerDialog extends StandardDialog implements
 
             // Open in a new window?
             if (newServerWindowCheck.isSelected()
-                    || getController().getServerManager().numServers() == 0
+                    || getController().getMain().getServerManager().numServers() == 0
                     || getController().getMainFrame().getActiveFrame() == null) {
 
                 new LoggingSwingWorker<Void, Void>() {
                     @Override
                     protected Void doInBackground() {
-                        final Server server = getController().getServerManager().createServer(address, profile);
+                        final Server server = new Server(getController().getMain().getServerManager(), address, profile);
                         server.connect();
                         return null;
                     }
@@ -268,7 +268,7 @@ public final class NewServerDialog extends StandardDialog implements
                     @Override
                     protected Void doInBackground() {
                         if (server == null) {
-                            final Server newServer = getController().getServerManager().createServer(address, profile);
+                            final Server newServer = new Server(getController().getMain().getServerManager(), address, profile);
                             newServer.connect();
                         } else {
                             server.connect(address, profile);

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -81,7 +81,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
                     + "no resource manager");
         } else {
             addCoreLicences(rm);
-            for (PluginInfo pi : controller.getPluginManager()
+            for (PluginInfo pi : controller.getMain().getPluginManager()
                     .getPluginInfos()) {
                 addPluginLicences(pi);
             }

src/com/dmdirc/addons/ui_web/DynamicRequestHandler.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Channel;
+import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
@@ -277,7 +278,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     private void doNewServer(final HttpServletRequest request)
             throws IOException {
         try {
-            controller.getMain().getServerManager().createServer(
+            new Server(controller.getMain().getServerManager(),
                     new URI("irc://" + request.getParameter("password") + "@"
                     + request.getParameter("server") + ":"
                     + request.getParameter("port")),

src/com/dmdirc/addons/ui_web/WebInterfacePlugin.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Main;
 import com.dmdirc.plugins.BasePlugin;
-import com.dmdirc.plugins.PluginManager;
 
 import lombok.Getter;
 
@@ -42,24 +41,20 @@ public class WebInterfacePlugin extends BasePlugin {
     @Getter
     private WebInterfaceUI controller;
 
-    /** Plugin manager. */
-    private final PluginManager pluginManager;
-
     /**
      * Create a new WebInterfacePlugin
      *
      * @param main The instance of main that this client uses.
      */
-    public WebInterfacePlugin(final PluginManager pluginManager, final Main main) {
+    public WebInterfacePlugin(final Main main) {
         this.main = main;
-        this.pluginManager = pluginManager;
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         if (controller == null) {
-            controller = new WebInterfaceUI(pluginManager, main, getDomain());
+            controller = new WebInterfaceUI(main, getDomain());
         }
     }
 
@@ -70,7 +65,7 @@ public class WebInterfacePlugin extends BasePlugin {
      */
     public void addWebHandler(final Handler newHandler) {
         if (controller == null) {
-            controller = new WebInterfaceUI(pluginManager, main, getDomain());
+            controller = new WebInterfaceUI(main, getDomain());
         }
 
         controller.addWebHandler(newHandler);

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -29,7 +29,6 @@ import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.net.URI;
@@ -61,22 +60,15 @@ public class WebInterfaceUI implements UIController {
     /** Instance of Main that owns us. */
     private final Main main;
 
-    /** Plugin manager. */
-    @Getter
-    private final PluginManager pluginManager;
-
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
      *
-     * @param pluginManager Plugin manager
      * @param domain The domain to retrieve config settings from
      */
-    public WebInterfaceUI(final PluginManager pluginManager,
-            final Main main, final String domain) {
+    public WebInterfaceUI(final Main main, final String domain) {
         super();
 
         this.main = main;
-        this.pluginManager = pluginManager;
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
         final ConstraintMapping cm = new ConstraintMapping();

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_web.uicomponents;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_web.WebInterfaceUI;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.ui.InputField;
+import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleter;
 
@@ -34,12 +34,11 @@ import com.dmdirc.ui.input.TabCompleter;
  */
 public class WebInputHandler extends InputHandler {
 
-    public WebInputHandler(final WebInterfaceUI controller,
+    public WebInputHandler(final UIController controller,
                            final InputField thisTarget,
                            final CommandParser thisCommandParser,
                            final WritableFrameContainer thisParentWindow) {
-        super(thisTarget, thisCommandParser, thisParentWindow,
-                controller.getPluginManager());
+        super(controller, thisTarget, thisCommandParser, thisParentWindow);
     }
 
     public InputField getTarget() {

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2006-2012 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.addons.redirect;
+
+import com.dmdirc.TestMain;
+import com.dmdirc.MessageTarget;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandManager;
+import com.dmdirc.commandparser.commands.context.ChatCommandContext;
+import com.dmdirc.commandparser.commands.global.Echo;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.ui.InputWindow;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.mockito.Mockito.*;
+
+public class RedirectCommandTest {
+
+    @BeforeClass
+    public static void setupClass() throws InvalidIdentityFileException {
+        TestMain.getTestMain();
+        CommandManager.getCommandManager().registerCommand(new Echo(), Echo.INFO);
+    }
+
+    @Ignore
+    @Test
+    public void testExecute() {
+        final RedirectCommand command = new RedirectCommand();
+        final MessageTarget target = mock(MessageTarget.class);
+        final InputWindow window = mock(InputWindow.class);
+        //when(window.getCommandParser()).thenReturn(parser);
+        when(window.getContainer().getConfigManager()).thenReturn(
+                IdentityManager.getIdentityManager().getGlobalConfiguration());
+
+        command.execute(target, new CommandArguments("/redirect /echo test"),
+                new ChatCommandContext(window.getContainer(), RedirectCommand.INFO, target));
+
+        verify(target).sendLine("test");
+    }
+
+}