Remove SwingController.getIdentityFactory().

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

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

@@ -42,7 +42,6 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -92,8 +91,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final PluginInfo pluginInfo;
     /** Global config manager. */
     private final AggregateConfigProvider globalConfig;
-    /** Identity factory. */
-    private final IdentityFactory identityFactory;
     /** Global config identity. */
     private final ConfigProvider globalIdentity;
     /** Addon config identity. */
@@ -116,7 +113,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      *
      * @param pluginInfo Plugin info
      * @param identityManager Identity Manager
-     * @param identityFactory Factory used to create identities.
      * @param pluginManager Plugin manager
      * @param serverManager Server manager to use for server information.
      * @param urlBuilder URL builder to use to resolve icons etc.
@@ -126,14 +122,12 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public SwingController(
             final PluginInfo pluginInfo,
             final IdentityController identityManager,
-            final IdentityFactory identityFactory,
             final PluginManager pluginManager,
             final ServerManager serverManager,
             final URLBuilder urlBuilder,
             final ColourManager colourManager,
             final EventBus eventBus) {
         this.pluginInfo = pluginInfo;
-        this.identityFactory = identityFactory;
         this.pluginManager = pluginManager;
         this.colourManager = colourManager;
         this.urlBuilder = urlBuilder;
@@ -152,11 +146,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return globalConfig;
     }
 
-    @Deprecated
-    public IdentityFactory getIdentityFactory() {
-        return identityFactory;
-    }
-
     @Deprecated
     public ConfigProvider getGlobalIdentity() {
         return globalIdentity;

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

@@ -36,6 +36,7 @@ import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
@@ -81,12 +82,14 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      * and default options for the form.
      *
      * @param deps The dependencies required by text frames.
+     * @param identityFactory The factory to use to create a channel identity.
      * @param topicBarFactory The factory to use to create topic bars.
      * @param urlBuilder The URL Builder to use for constructing icons paths.
      * @param owner The Channel object that owns this frame
      */
     public ChannelFrame(
             final TextFrameDependencies deps,
+            final IdentityFactory identityFactory,
             final TopicBarFactory topicBarFactory,
             final URLBuilder urlBuilder,
             @Unbound final Channel owner) {
@@ -102,8 +105,8 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.CLIENT_CLOSING);
 
-        identity = controller.getIdentityFactory().createChannelConfig(
-                owner.getConnection().getNetwork(), owner.getChannelInfo().getName());
+        identity = identityFactory.createChannelConfig(owner.getConnection().getNetwork(),
+                owner.getChannelInfo().getName());
     }
 
     /**