Remove some usages of Main.

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

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

@@ -26,7 +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;
+import com.dmdirc.plugins.ServiceManager;
 
 /**
  * Dummy input handler.
@@ -37,16 +37,17 @@ public class DummyInputHandler extends InputHandler {
      * Creates a new instance of InputHandler. Adds listeners to the target
      * that we need to operate.
      *
-     * @param controller The controller that owns us.
+     * @param serviceManager Manager to use to look up tab completion services.
      * @param target The text field this input handler is dealing with.
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public DummyInputHandler(final UIController controller,
+    public DummyInputHandler(
+            final ServiceManager serviceManager,
             final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(controller, target, commandParser, parentWindow);
+        super(serviceManager, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_dummy;
 
+import com.dmdirc.Main;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.interfaces.ui.InputWindow;
@@ -51,7 +52,10 @@ public class DummyInputWindow implements InputWindow {
     /** {@inheritDoc} */
     @Override
     public InputHandler getInputHandler() {
-        return new DummyInputHandler(controller, new DummyInputField(), null,
+        return new DummyInputHandler(
+                Main.mainInstance.getPluginManager(),
+                new DummyInputField(),
+                null,
                 getContainer());
     }
 

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -128,7 +128,8 @@ public class TopicBar extends JComponent implements ActionListener,
                 channelFrame.getIconManager().getIcon("close"),
                 channelFrame.getIconManager().getIcon("close-active"));
 
-        final SwingInputHandler handler = new SwingInputHandler(controller, topicText,
+        final SwingInputHandler handler = new SwingInputHandler(
+                controller.getPluginManager(), topicText,
                 channelFrame.getContainer().getCommandParser(),
                 channelFrame.getContainer());
         handler.setTypes(true, false, true, false);

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -131,8 +131,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      */
     private void initComponents() {
         inputField = new SwingInputField(this, getController().getMainFrame());
-        inputHandler = new SwingInputHandler(controller, inputField,
-                getContainer().getCommandParser(), getContainer());
+        inputHandler = new SwingInputHandler(controller.getPluginManager(),
+                inputField, getContainer().getCommandParser(), getContainer());
         inputHandler.addValidationListener(inputField);
         inputHandler.setTabCompleter(((WritableFrameContainer) frameParent).
                 getTabCompleter());

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

@@ -28,9 +28,9 @@ 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.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 
 import java.awt.event.ActionEvent;
@@ -52,16 +52,17 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      * Creates a new instance of InputHandler. Adds listeners to the target
      * that we need to operate.
      *
-     * @param controller The UIController that owns this input handler.
+     * @param serviceManager Manager to use to look up tab completion services.
      * @param target The text field this input handler is dealing with.
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public SwingInputHandler(final UIController controller,
+    public SwingInputHandler(
+            final ServiceManager serviceManager,
             final InputField target,
             final CommandParser commandParser,
             final WritableFrameContainer parentWindow) {
-        super(controller, target, commandParser, parentWindow);
+        super(serviceManager, target, commandParser, parentWindow);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -104,8 +104,9 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         topicText.setWrapStyleWord(true);
         topicText.setRows(5);
         topicText.setColumns(30);
-        final SwingInputHandler handler = new SwingInputHandler(parent.getController(),
-                topicText, channel.getCommandParser(), channelWindow.getContainer());
+        final SwingInputHandler handler = new SwingInputHandler(
+                parent.getController().getPluginManager(), topicText,
+                channel.getCommandParser(), channelWindow.getContainer());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -121,8 +121,8 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         textField.setColumns(50);
         textField.setRows(10);
 
-        new SwingInputHandler(getController(), textField, parent.getContainer()
-                .getCommandParser(), parent.getContainer())
+        new SwingInputHandler(getController().getPluginManager(), textField,
+                parent.getContainer().getCommandParser(), parent.getContainer())
                 .setTypes(false, false, true,false);
 
         scrollPane.setViewportView(textField);

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

@@ -60,8 +60,7 @@ public class StaticRequestHandler extends AbstractHandler {
 
         if (rm == null) {
             try {
-                rm = controller.getMain().getPluginManager()
-                    .getPluginInfoByName("ui_web").getResourceManager();
+                rm = controller.getPluginInfo().getResourceManager();
             } catch (IOException ex) {
                 // Die horribly
             }

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

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BasePlugin;
 
 import lombok.Getter;
@@ -41,6 +43,12 @@ public class WebInterfacePlugin extends BasePlugin {
     /** Server manager to use. */
     private final ServerManager serverManager;
 
+    /** Plugin manager to use. */
+    private final PluginManager pluginManager;
+
+    /** This plugin's information object. */
+    private final PluginInfo pluginInfo;
+
     /** The UI that we're using. */
     @Getter
     private WebInterfaceUI controller;
@@ -50,19 +58,26 @@ public class WebInterfacePlugin extends BasePlugin {
      *
      * @param main The instance of main that this client uses.
      * @param serverManager Server manager to use.
+     * @param pluginManager Plugin manager to use.
+     * @param pluginInfo This plugin's info object.
      */
     public WebInterfacePlugin(
             final Main main,
-            final ServerManager serverManager) {
+            final ServerManager serverManager,
+            final PluginManager pluginManager,
+            final PluginInfo pluginInfo) {
         this.main = main;
         this.serverManager = serverManager;
+        this.pluginManager = pluginManager;
+        this.pluginInfo = pluginInfo;
     }
 
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
         if (controller == null) {
-            controller = new WebInterfaceUI(main, getDomain(), serverManager);
+            controller = new WebInterfaceUI(main, getDomain(), serverManager,
+                    pluginManager, pluginInfo);
         }
     }
 
@@ -73,7 +88,8 @@ public class WebInterfacePlugin extends BasePlugin {
      */
     public void addWebHandler(final Handler newHandler) {
         if (controller == null) {
-            controller = new WebInterfaceUI(main, getDomain(), serverManager);
+            controller = new WebInterfaceUI(main, getDomain(), serverManager,
+                    pluginManager, pluginInfo);
         }
 
         controller.addWebHandler(newHandler);

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

@@ -30,6 +30,8 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.net.URI;
@@ -61,18 +63,34 @@ public class WebInterfaceUI implements UIController {
     /** Instance of Main that owns us. */
     private final Main main;
 
+    /** The PluginInfo object for this plugin. */
+    @Getter
+    private final PluginInfo pluginInfo;
+
+    /** The plugin manager used to find other plugins. */
+    @Getter
+    private final PluginManager pluginManager;
+
     /**
      * Creates a new WebInterfaceUI belonging to the specified plugin.
      *
      * @param domain The domain to retrieve config settings from
+     * @param serverManager The manager to use to find and create servers
+     * @param pluginManager The manager to use to find other plugins
+     * @param pluginInfo The information object for this UI's plugin.
      */
     public WebInterfaceUI(
             final Main main,
             final String domain,
-            final ServerManager serverManager) {
+            final ServerManager serverManager,
+            final PluginManager pluginManager,
+            final PluginInfo pluginInfo) {
         super();
 
         this.main = main;
+        this.pluginManager = pluginManager;
+        this.pluginInfo = pluginInfo;
+
         final SecurityHandler sh = new SecurityHandler();
         final Constraint constraint = new Constraint();
         final ConstraintMapping cm = new ConstraintMapping();

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

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

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

@@ -47,8 +47,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     private final WebInputHandler inputHandler;
 
-    private final Map<Client, WebInputHandler> inputHandlers
-            = new HashMap<Client, WebInputHandler>();
+    private final Map<Client, WebInputHandler> inputHandlers = new HashMap<>();
 
     private final WebInterfaceUI controller;
 
@@ -58,8 +57,8 @@ public class WebInputWindow extends WebWindow implements InputWindow {
         this.container = parent;
         this.commandparser = parent.getCommandParser();
         this.controller = controller;
-        this.inputHandler = new WebInputHandler(controller, new WebInputField(),
-                commandparser, getContainer());
+        this.inputHandler = new WebInputHandler(controller.getPluginManager(),
+                new WebInputField(), commandparser, getContainer());
     }
 
     /** {@inheritDoc} */
@@ -70,8 +69,9 @@ public class WebInputWindow extends WebWindow implements InputWindow {
 
     public WebInputHandler getInputHandler(final Client client) {
         if (!inputHandlers.containsKey(client)) {
-            final WebInputHandler ih = new WebInputHandler(controller,
-                    new WebInputField(client), commandparser, getContainer());
+            final WebInputHandler ih = new WebInputHandler(
+                    controller.getPluginManager(), new WebInputField(client),
+                    commandparser, getContainer());
             ih.setTabCompleter(inputHandler.getTabCompleter());
             inputHandlers.put(client, ih);
         }