Use a LifeCycleController to quit.

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

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

@@ -38,6 +38,7 @@ import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -88,6 +89,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private final QueuedLinkedHashSet<TextFrame> focusOrder;
     /** Swing Controller. */
     private final SwingController controller;
+    /** Controller to use to end the program. */
+    private final LifecycleController lifecycleController;
     /** Client Version. */
     private final String version;
     /** Frame manager used for ctrl tab frame switching. */
@@ -122,11 +125,15 @@ public final class MainFrame extends JFrame implements WindowListener,
      * Creates new form MainFrame.
      *
      * @param controller Swing controller
+     * @param lifecycleController Controller to use to end the application.
      */
-    public MainFrame(final SwingController controller) {
+    public MainFrame(
+            final SwingController controller,
+            final LifecycleController lifecycleController) {
         super();
 
         this.controller = controller;
+        this.lifecycleController = lifecycleController;
 
         focusOrder = new QueuedLinkedHashSet<>();
         initComponents();
@@ -272,7 +279,7 @@ public final class MainFrame extends JFrame implements WindowListener,
             /** {@inheritDoc} */
             @Override
             public void run() {
-                controller.getMain().quit(exitCode);
+                lifecycleController.quit(exitCode);
             }
         }, "Quit thread").start();
     }

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

@@ -56,6 +56,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -159,6 +160,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** Plugin manager. */
     @Getter
     private final PluginManager pluginManager;
+    /** Controller to use to close the application. */
+    private final LifecycleController lifecycleController;
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
@@ -173,6 +176,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @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.
      */
     public SwingController(
             final PluginInfo pluginInfo,
@@ -181,7 +185,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final Main main,
             final ActionManager actionManager,
             final CommandController commandController,
-            final ServerManager serverManager) {
+            final ServerManager serverManager,
+            final LifecycleController lifecycleController) {
         super(commandController);
         this.main = main;
         this.pluginInfo = pluginInfo;
@@ -189,6 +194,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.actionManager = actionManager;
         this.pluginManager = pluginManager;
         this.serverManager = serverManager;
+        this.lifecycleController = lifecycleController;
+
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();
         addonIdentity = identityManager.getGlobalAddonIdentity();
@@ -487,7 +494,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             @Override
             public void run() {
                 initUISettings();
-                mainFrame = new MainFrame(SwingController.this);
+                mainFrame = new MainFrame(SwingController.this, lifecycleController);
                 getMainFrame().setVisible(true);
                 mainFrameCreated.set(true);
                 swingStatusBar = getMainFrame().getStatusBar();