Remove almost all references to Main.

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

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

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
+import com.dmdirc.CorePluginExtractor;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
@@ -113,10 +113,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** Singleton instance of MainFrame. */
     @Getter
     private MainFrame mainFrame;
-    /** Instance of Main. */
-    @Getter
-    @Deprecated
-    private final Main main;
     /** Status bar. */
     @Getter
     private SwingStatusBar swingStatusBar;
@@ -162,6 +158,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final PluginManager pluginManager;
     /** Controller to use to close the application. */
     private final LifecycleController lifecycleController;
+    /** Extractor to use for core plugins. */
+    private final CorePluginExtractor corePluginExtractor;
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
@@ -172,29 +170,29 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param pluginInfo Plugin info
      * @param identityManager Identity Manager
      * @param pluginManager Plugin manager
-     * @param main Main instance
      * @param actionManager Action manager
      * @param commandController Command controller to register commands
      * @param serverManager Server manager to use for server information.
      * @param lifecycleController Controller to use to close the application.
+     * @param corePluginExtractor Extractor to use for core plugins.
      */
     public SwingController(
             final PluginInfo pluginInfo,
             final IdentityManager identityManager,
             final PluginManager pluginManager,
-            final Main main,
             final ActionManager actionManager,
             final CommandController commandController,
             final ServerManager serverManager,
-            final LifecycleController lifecycleController) {
+            final LifecycleController lifecycleController,
+            final CorePluginExtractor corePluginExtractor) {
         super(commandController);
-        this.main = main;
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
         this.actionManager = actionManager;
         this.pluginManager = pluginManager;
         this.serverManager = serverManager;
         this.lifecycleController = lifecycleController;
+        this.corePluginExtractor = corePluginExtractor;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();
@@ -259,7 +257,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
                     }
                 };
                 final SwingFirstRunWizard wizard = new SwingFirstRunWizard(
-                        getMainFrame(), SwingController.this);
+                        getMainFrame(), SwingController.this, corePluginExtractor);
                 wizard.getWizardDialog().addWizardListener(listener);
                 wizard.display();
             }

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
+import com.dmdirc.CorePluginExtractor;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.Apple;
@@ -52,19 +53,25 @@ public final class SwingFirstRunWizard implements WizardListener,
         FirstRunWizard {
 
     /** Wizard dialog. */
-    private WizardDialog wizardDialog;
+    private final WizardDialog wizardDialog;
     /** Swing controller. */
-    private SwingController controller;
+    private final SwingController controller;
+    /** Extractor to use for core plugins. */
+    private final CorePluginExtractor corePluginExtractor;
 
     /**
      * Instantiate the wizard.
      *
      * @param parentWindow Parent window
      * @param controller Swing controller
+     * @param pluginExtractor Plugin extractor to use.
      */
-    public SwingFirstRunWizard(final Window parentWindow,
-            final SwingController controller) {
+    public SwingFirstRunWizard(
+            final Window parentWindow,
+            final SwingController controller,
+            final CorePluginExtractor pluginExtractor) {
         this.controller = controller;
+        this.corePluginExtractor = pluginExtractor;
 
         wizardDialog = new WizardDialog("Setup wizard",
                 new ArrayList<Step>(), parentWindow,
@@ -120,7 +127,7 @@ public final class SwingFirstRunWizard implements WizardListener,
     /** {@inheritDoc} */
     @Override
     public void extractPlugins() {
-        controller.getMain().extractCorePlugins(null);
+        corePluginExtractor.extractCorePlugins(null);
     }
 
     /** {@inheritDoc} */

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -37,9 +36,6 @@ import org.mortbay.jetty.Handler;
  */
 public class WebInterfacePlugin extends BasePlugin {
 
-    /** Our instance of main. */
-    private final Main main;
-
     /** Server manager to use. */
     private final ServerManager serverManager;
 
@@ -56,17 +52,14 @@ public class WebInterfacePlugin extends BasePlugin {
     /**
      * Create a new WebInterfacePlugin
      *
-     * @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 PluginManager pluginManager,
             final PluginInfo pluginInfo) {
-        this.main = main;
         this.serverManager = serverManager;
         this.pluginManager = pluginManager;
         this.pluginInfo = pluginInfo;
@@ -76,7 +69,7 @@ public class WebInterfacePlugin extends BasePlugin {
     @Override
     public void onLoad() {
         if (controller == null) {
-            controller = new WebInterfaceUI(main, getDomain(), serverManager,
+            controller = new WebInterfaceUI(getDomain(), serverManager,
                     pluginManager, pluginInfo);
         }
     }
@@ -88,7 +81,7 @@ public class WebInterfacePlugin extends BasePlugin {
      */
     public void addWebHandler(final Handler newHandler) {
         if (controller == null) {
-            controller = new WebInterfaceUI(main, getDomain(), serverManager,
+            controller = new WebInterfaceUI(getDomain(), serverManager,
                     pluginManager, pluginInfo);
         }
 

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
@@ -60,9 +59,6 @@ public class WebInterfaceUI implements UIController {
     @Getter
     private final DynamicRequestHandler handler;
 
-    /** Instance of Main that owns us. */
-    private final Main main;
-
     /** The PluginInfo object for this plugin. */
     @Getter
     private final PluginInfo pluginInfo;
@@ -80,14 +76,12 @@ public class WebInterfaceUI implements UIController {
      * @param pluginInfo The information object for this UI's plugin.
      */
     public WebInterfaceUI(
-            final Main main,
             final String domain,
             final ServerManager serverManager,
             final PluginManager pluginManager,
             final PluginInfo pluginInfo) {
         super();
 
-        this.main = main;
         this.pluginManager = pluginManager;
         this.pluginInfo = pluginInfo;
 
@@ -127,13 +121,6 @@ public class WebInterfaceUI implements UIController {
         StatusBarManager.getStatusBarManager().registerStatusBar(new WebStatusBar(handler));
     }
 
-    /** {@inheritDoc} */
-    @Override
-    @Deprecated
-    public Main getMain() {
-        return main;
-    }
-
     /**
      * Adds the specified handler to the webserver.
      *