Remove deprecated method.

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

src/com/dmdirc/addons/serverlistdialog/Profiles.java

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.serverlistdialog;
 
 import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -53,20 +53,20 @@ public class Profiles extends JPanel implements ServerListListener {
     private final Map<ServerGroupItem, JComboBox> combos = new HashMap<>();
     /** Info label. */
     private final JLabel label;
-    /** Swing controller. */
-    private final SwingController controller;
+    /** Controller to use to get profiles. */
+    private final IdentityController identityController;
 
     /**
      * Creates a new profile panel backed by the specified model.
      *
      * @param model Backing server list model
-     * @param controller Swing controller
+     * @param identityController Controller to use to get profiles.
      */
-    public Profiles(final ServerListModel model, final SwingController controller) {
+    public Profiles(final ServerListModel model, final IdentityController identityController) {
         super();
 
         this.model = model;
-        this.controller = controller;
+        this.identityController = identityController;
 
         label = new JLabel("Use this profile on this network: ");
         setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
@@ -109,7 +109,7 @@ public class Profiles extends JPanel implements ServerListListener {
 
             ConfigProvider selectedItem = null;
             comboModel.addElement(null);
-            for (ConfigProvider profile : controller.getIdentityManager().getProvidersByType("profile")) {
+            for (ConfigProvider profile : identityController.getProvidersByType("profile")) {
                 comboModel.addElement(profile);
                 if (item != null && profile.getName().equals(
                         item.getProfile())) {

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LockedLayer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.color.ColorSpace;
@@ -83,6 +84,7 @@ public class ServerListDialog extends StandardDialog implements
      * @param serverListModel The model to use for the dialog.
      * @param mainFrame The main frame that owns the dialog.
      * @param settingsPanel The panel to use for settings.
+     * @param identityController Controller to use to get profiles.
      */
     @Inject
     public ServerListDialog(
@@ -91,7 +93,8 @@ public class ServerListDialog extends StandardDialog implements
             final PerformWrapper performWrapper,
             final ServerListModel serverListModel,
             final MainFrame mainFrame,
-            final Settings settingsPanel) {
+            final Settings settingsPanel,
+            final IdentityController identityController) {
         super(mainFrame, ModalityType.MODELESS);
 
         setTitle("Server List");
@@ -112,7 +115,7 @@ public class ServerListDialog extends StandardDialog implements
         infoLock = new LockedLayer<>(new BufferedImageOpEffect(
                 new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY),
                 null)));
-        profileLayer = new JXLayer<>(new Profiles(model, controller), profileLock);
+        profileLayer = new JXLayer<>(new Profiles(model, identityController), profileLock);
         performLayer = new JXLayer<>(new Perform(controller, performWrapper, model), performLock);
         settingsLayer = new JXLayer<>(settingsPanel, settingsLock);
         infoLayer = new JXLayer<>(new Info(model, urlHandler), infoLock);

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

@@ -92,8 +92,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final PluginInfo pluginInfo;
     /** Global config manager. */
     private final AggregateConfigProvider globalConfig;
-    /** Identity Manager. */
-    private final IdentityController identityManager;
     /** Identity factory. */
     private final IdentityFactory identityFactory;
     /** Global config identity. */
@@ -135,7 +133,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final ColourManager colourManager,
             final EventBus eventBus) {
         this.pluginInfo = pluginInfo;
-        this.identityManager = identityManager;
         this.identityFactory = identityFactory;
         this.pluginManager = pluginManager;
         this.colourManager = colourManager;
@@ -155,11 +152,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return globalConfig;
     }
 
-    @Deprecated
-    public IdentityController getIdentityManager() {
-        return identityManager;
-    }
-
     @Deprecated
     public IdentityFactory getIdentityFactory() {
         return identityFactory;