Remove some SwingControllers from DCC plugin

Change-Id: I0a6ccc960a4e08c0a7c6afc08a75b89d2b17c125
Reviewed-on: http://gerrit.dmdirc.com/3034
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/DCCManager.java

@@ -79,8 +79,6 @@ public class DCCManager implements ActionListener {
     private final AggregateConfigProvider config;
     /** Parent swing controller. */
     private final SwingController controller;
-    /** Identity controller to read settings from. */
-    private final IdentityController identityController;
     /** The sink manager to use to despatch messages. */
     private final MessageSinkManager messageSinkManager;
     /** Window Management. */
@@ -112,7 +110,6 @@ public class DCCManager implements ActionListener {
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory) {
-        this.identityController = identityController;
         this.controller = controller;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
@@ -666,7 +663,8 @@ public class DCCManager implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, controller);
+        container = new PlaceholderContainer(this, config, controller.getDialogManager(),
+                controller.getMainFrame());
         windowManager.addWindow(container);
     }
 

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -23,7 +23,8 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -38,22 +39,29 @@ public class PlaceholderContainer extends FrameContainer {
 
     /** The plugin which owns this placeholder. */
     private final DCCManager plugin;
-    /** Parent swing controller. */
-    private final SwingController controller;
+    /** Manager to register new dialogs with. */
+    private final DialogManager dialogManager;
+    /** Frame that will own new dialogs. */
+    private final MainFrame mainFrame;
 
     /**
      * Creates a placeholder DCC frame.
      *
      * @param plugin The plugin which owns this placeholder
      * @param config Config manager
-     * @param controller Swing controller
+     * @param dialogManager Manager to register new dialogs with.
+     * @param mainFrame Frame that will own new dialogs.
      */
-    public PlaceholderContainer(final DCCManager plugin,
-            final AggregateConfigProvider config, final SwingController controller) {
+    public PlaceholderContainer(
+            final DCCManager plugin,
+            final AggregateConfigProvider config,
+            final DialogManager dialogManager,
+            final MainFrame mainFrame) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
-        this.controller = controller;
+        this.dialogManager = dialogManager;
+        this.mainFrame = mainFrame;
     }
 
     /** {@inheritDoc} */
@@ -70,7 +78,7 @@ public class PlaceholderContainer extends FrameContainer {
         }
 
         if (dccs > 0) {
-            new StandardQuestionDialog(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS,
+            new StandardQuestionDialog(dialogManager, mainFrame, ModalityType.MODELESS,
                     "Close confirmation",
                     "Closing this window will cause all existing DCCs "
                     + "to terminate, are you sure you want to do this?") {