Remove deprecated method calls.

Depends-On: Ie4c2dfb2da88679e367d921650dcbce87b9ba328
Change-Id: Ia70524f84070adf62dff7822ac13807eafff499f
Reviewed-on: http://gerrit.dmdirc.com/3293
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.Channel;
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
 import com.dmdirc.addons.ui_swing.commands.Input;
@@ -164,42 +162,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         swingManager.getFirstRunExecutor().showWizardAndWait();
     }
 
-    @Override
-    public void showChannelSettingsDialog(final Channel channel) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                swingManager.getChannelSettingsDialogProvider().displayOrRequestFocus(channel);
-            }
-        });
-    }
-
-    @Override
-    public void showServerSettingsDialog(final Server server) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                swingManager.getServerSettingsDialogProvider().displayOrRequestFocus(server);
-            }
-        });
-    }
-
-    /**
-     * @deprecated Callers should be given access to the provider.
-     */
-    @Deprecated
-    public void closeServerSettingsDialog(final Server server) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                swingManager.getServerSettingsDialogProvider().dispose(server);
-            }
-        });
-    }
-
     /**
      * Updates the look and feel to the current config setting.
      */

src/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

@@ -22,8 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.commands;
 
+import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -46,30 +48,28 @@ public class ChannelSettings extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",
-            "channelsettings - opens the channel settings window",
-            CommandType.TYPE_CHANNEL);
+            "channelsettings - opens the channel settings window", CommandType.TYPE_CHANNEL);
     /** The controller to use to show the settings window. */
-    private final SwingController controller;
+    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider;
 
     /**
      * Creates a new instance of the {@link ChannelSettings} command.
      *
-     * @param controller        The controller to use to show the settings window.
      * @param commandController The command controller to use for command info.
+     * @param dialogProvider    Provider to retrieve CSD instances
      */
     @Inject
     public ChannelSettings(
-            final SwingController controller,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider) {
         super(commandController);
-        this.controller = controller;
+        this.dialogProvider = dialogProvider;
     }
 
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        controller.showChannelSettingsDialog(
-                ((ChannelCommandContext) context).getChannel());
+        dialogProvider.displayOrRequestFocus(((ChannelCommandContext) context).getChannel());
     }
 
     @Override

src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -24,7 +24,8 @@ package com.dmdirc.addons.ui_swing.commands;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -40,37 +41,34 @@ import javax.inject.Inject;
 
 /**
  * Opens the server settings window for the server.
- *
- * @since 0.6.4
  */
 @CommandOptions(allowOffline = false)
 public class ServerSettings extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("serversettings",
-            "serversettings - opens the server settings window",
-            CommandType.TYPE_SERVER);
-    /** The controller to use to show the settings window. */
-    private final SwingController controller;
+            "serversettings - opens the server settings window", CommandType.TYPE_SERVER);
+    /** The dialog provider used to show the settings dialog. */
+    private final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider;
 
     /**
      * Creates a new instance of the {@link ServerSettings} command.
      *
-     * @param controller        The controller to use to show the settings window.
      * @param commandController The command controller to use for command info.
+     * @param dialogProvider    The dialog provider used to show the settings dialog
      */
     @Inject
     public ServerSettings(
-            final SwingController controller,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final KeyedDialogProvider<Server, ServerSettingsDialog> dialogProvider) {
         super(commandController);
-        this.controller = controller;
+        this.dialogProvider = dialogProvider;
     }
 
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        controller.showServerSettingsDialog((Server) context.getSource().getConnection());
+        dialogProvider.displayOrRequestFocus((Server) context.getSource().getConnection());
     }
 
     @Override

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
@@ -61,8 +60,6 @@ public final class ServerFrame extends InputTextFrame implements
 
     /** Serial version UID. */
     private static final long serialVersionUID = 9;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Main frame. */
     private final Provider<MainFrame> mainFrame;
     /** Icon manager. */
@@ -92,7 +89,6 @@ public final class ServerFrame extends InputTextFrame implements
         super(deps, inputFieldProvider, owner);
         this.mainFrame = deps.mainFrame;
         this.iconManager = deps.iconManager;
-        this.controller = deps.controller;
         this.dialogProvider = dialogProvider;
         this.server = owner;
         initComponents();
@@ -121,7 +117,7 @@ public final class ServerFrame extends InputTextFrame implements
     @Override
     public void actionPerformed(final ActionEvent actionEvent) {
         if (actionEvent.getSource() == settingsMI) {
-            controller.showServerSettingsDialog((Server) getContainer().getConnection());
+            dialogProvider.displayOrRequestFocus(server);
         }
     }
 
@@ -147,8 +143,7 @@ public final class ServerFrame extends InputTextFrame implements
 
     @Override
     public void addCustomPopupItems(final JPopupMenu popupMenu) {
-        if (getContainer().getConnection().getState()
-                .equals(ServerState.CONNECTED)) {
+        if (getContainer().getConnection().getState().equals(ServerState.CONNECTED)) {
             settingsMI.setEnabled(true);
         } else {
             settingsMI.setEnabled(false);

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

@@ -27,10 +27,11 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -49,14 +50,8 @@ import javax.swing.event.MenuListener;
 public class ServerMenu extends JMenu implements ActionListener,
         MenuListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Main frame. */
     private final MainFrame mainFrame;
     /** Menu items which can be enabled/disabled. */
@@ -64,23 +59,25 @@ public class ServerMenu extends JMenu implements ActionListener,
     private JMenuItem disconnect;
     /** Provider to use to retrieve NSD instances. */
     private final DialogProvider<NewServerDialog> newServerProvider;
+    /** Provider for server settings dialogs. */
+    private final KeyedDialogProvider<Server, ServerSettingsDialog> ssdProvider;
 
     /**
      * Creates a new Server menu.
      *
-     * @param controller        Parent swing controller
      * @param mainFrame         Parent main frame
      * @param newServerProvider Provider to use to retrieve NSD instances.
+     * @param ssdProvider       Provider to get SSD instances
      */
     @Inject
     public ServerMenu(
-            final SwingController controller,
             final MainFrame mainFrame,
-            final DialogProvider<NewServerDialog> newServerProvider) {
+            final DialogProvider<NewServerDialog> newServerProvider,
+            final KeyedDialogProvider<Server, ServerSettingsDialog> ssdProvider) {
         super("Server");
-        this.controller = controller;
         this.mainFrame = mainFrame;
         this.newServerProvider = newServerProvider;
+        this.ssdProvider = ssdProvider;
 
         setMnemonic('s');
         addMenuListener(this);
@@ -133,7 +130,7 @@ public class ServerMenu extends JMenu implements ActionListener,
                 mainFrame.quit();
                 break;
             case "ServerSettings":
-                controller.showServerSettingsDialog(
+                ssdProvider.displayOrRequestFocus(
                         (Server) mainFrame.getActiveFrame().getContainer().getConnection());
                 break;
             case "Disconnect":

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_web;
 
-import com.dmdirc.Channel;
-import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -143,16 +141,6 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    @Override
-    public void showChannelSettingsDialog(final Channel channel) {
-        // Do nothing
-    }
-
-    @Override
-    public void showServerSettingsDialog(final Server server) {
-        // Do nothing
-    }
-
     @Override
     public void showURLDialog(final URI url) {
         // Do nothing