Switch to ConfigProvider in a few places.

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

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

@@ -34,7 +34,6 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -42,8 +41,9 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -65,7 +65,7 @@ import javax.swing.JOptionPane;
 /**
  * This plugin adds DCC to DMDirc.
  */
-public final class DCCPlugin extends BaseCommandPlugin implements ActionListener {
+public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
 
     /** Our DCC Container window. */
     private PlaceholderContainer container;
@@ -636,7 +636,7 @@ public final class DCCPlugin extends BaseCommandPlugin implements ActionListener
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        final Identity defaults = identityController.getGlobalAddonIdentity();
+        final ConfigProvider defaults = identityController.getGlobalAddonIdentity();
 
         defaults.setOption(getDomain(), "receive.savelocation",
                 identityController.getConfigDir() + "downloads"

src/com/dmdirc/addons/debug/commands/ConfigInfo.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.addons.debug.DebugPlugin;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 /**
  * Outputs the config info related to the current context.
@@ -61,7 +61,7 @@ public class ConfigInfo extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        for (Identity source : origin.getConfigManager().getSources()) {
+        for (ConfigProvider source : origin.getConfigManager().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
                     + " - " + source + "(" + source.getTarget().getOrder()
                     + ")");

src/com/dmdirc/addons/debug/commands/GlobalConfigInfo.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.addons.debug.DebugPlugin;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 /**
  * Outputs information about the global config sources.
@@ -61,7 +61,7 @@ public class GlobalConfigInfo extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        for (Identity source : getPlugin().getIdentityController()
+        for (ConfigProvider source : getPlugin().getIdentityController()
                 .getGlobalConfiguration().getSources()) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, source.getTarget()
                     + " - " + source + "(" + source.getTarget().getOrder()

src/com/dmdirc/addons/debug/commands/Identities.java

@@ -29,6 +29,7 @@ import com.dmdirc.addons.debug.DebugPlugin;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.List;
 
@@ -76,7 +77,7 @@ public class Identities extends DebugCommand {
         final String[][] data = new String[identities.size()][4];
 
         int i = 0;
-        for (Identity source : identities) {
+        for (ConfigProvider source : identities) {
             data[i++] = new String[]{source.getName(),
             source.getTarget().getTypeName(), source.getTarget().getData(),
             String.valueOf(source.getTarget().getOrder())};

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.freedesktop_notifications;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -31,6 +30,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -66,7 +66,7 @@ public final class FreeDesktopNotificationsPlugin
     /** Global config. */
     private final ConfigManager config;
     /** Addon identity. */
-    private final Identity identity;
+    private final ConfigProvider identity;
     /** Plugin files helper. */
     private final PluginFilesHelper filesHelper;
 

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -30,7 +30,6 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -40,6 +39,7 @@ import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -92,7 +92,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /** Global config. */
     private final ConfigManager config;
     /** Addon identity. */
-    private final Identity identity;
+    private final ConfigProvider identity;
     /** Parent Identity Manager. */
     private final IdentityController identityController;
 

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;
@@ -61,7 +61,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
     /** The plugin we're associated with. */
     private final transient NickColourPlugin plugin;
     /** The identity to write settings to. */
-    private final Identity configIdentity;
+    private final ConfigProvider configIdentity;
     /** The table headings. */
     private static final String[] HEADERS = {"Network", "Nickname",
         "Text colour", "Nicklist colour"};

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

@@ -22,13 +22,12 @@
 
 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.config.Identity;
-import com.dmdirc.addons.serverlists.ServerGroupItem;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -51,8 +50,7 @@ public class Profiles extends JPanel implements ServerListListener {
     /** Server list model. */
     private final ServerListModel model;
     /** Combo boxes. */
-    private final Map<ServerGroupItem, JComboBox> combos =
-            new HashMap<ServerGroupItem, JComboBox>();
+    private final Map<ServerGroupItem, JComboBox> combos = new HashMap<>();
     /** Info label. */
     private final JLabel label;
     /** Swing controller. */
@@ -109,11 +107,9 @@ public class Profiles extends JPanel implements ServerListListener {
         if (!combos.containsKey(item)) {
             final DefaultComboBoxModel comboModel = new VetoableComboBoxModel();
 
-            final List<Identity> profiles = controller.getIdentityManager()
-                    .getIdentitiesByType("profile");
-            Identity selectedItem = null;
+            ConfigProvider selectedItem = null;
             comboModel.addElement(null);
-            for (Identity profile : profiles) {
+            for (ConfigProvider profile : controller.getIdentityManager().getIdentitiesByType("profile")) {
                 comboModel.addElement(profile);
                 if (item != null && profile.getName().equals(
                         item.getProfile())) {
@@ -135,7 +131,7 @@ public class Profiles extends JPanel implements ServerListListener {
                     if (entry.getValue().getSelectedItem() == null) {
                         entry.getKey().setProfile(null);
                     } else {
-                        entry.getKey().setProfile(((Identity) entry.getValue().
+                        entry.getKey().setProfile(((ConfigProvider) entry.getValue().
                                 getSelectedItem()).getName());
                     }
                 }

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -51,8 +51,7 @@ public class Settings extends JPanel implements ServerListListener {
     /** Server list model. */
     private final ServerListModel model;
     /** Settings panel. */
-    private final Map<ServerGroupItem, SettingsPanel> panels =
-            new HashMap<ServerGroupItem, SettingsPanel>();
+    private final Map<ServerGroupItem, SettingsPanel> panels = new HashMap<>();
     /** Platform border. */
     private final Border border;
     /** Swing controller. */
@@ -152,9 +151,11 @@ public class Settings extends JPanel implements ServerListListener {
      * Adds the settings to the panel.
      *
      * @param settingsPanel Settings panel to add settings to
+     * @param manager The config manager to read current settings from.
+     * @param identity The provider to write settings to.
      */
     private void addSettings(final SettingsPanel settingsPanel,
-            final ConfigManager manager, final Identity identity) {
+            final ConfigManager manager, final ConfigProvider identity) {
         settingsPanel.addOption(PreferencesManager.getPreferencesManager()
                 .getServerSettings(manager, identity));
     }

src/com/dmdirc/addons/serverlists/ServerGroupItemBase.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.serverlists;
 
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import lombok.RequiredArgsConstructor;
@@ -108,9 +108,9 @@ public abstract class ServerGroupItemBase implements ServerGroupItem {
      *
      * @return This server's profile identity
      */
-    protected Identity getProfileIdentity() {
+    protected ConfigProvider getProfileIdentity() {
         if (profile != null) {
-            for (Identity identity : identityController.getIdentitiesByType("profile")) {
+            for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
                 if (profile.equals(identity.getName())) {
                     return identity;
                 }

src/com/dmdirc/addons/serverlists/ServerList.java

@@ -72,7 +72,7 @@ public class ServerList implements ConfigProviderListener {
 
         identityController.registerIdentityListener("servergroup", this);
 
-        for (Identity identity : identityController.getIdentitiesByType("servergroup")) {
+        for (ConfigProvider identity : identityController.getIdentitiesByType("servergroup")) {
             configProviderAdded(identity);
         }
 

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

@@ -49,16 +49,16 @@ import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 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.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -144,10 +144,10 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final IdentityFactory identityFactory;
     /** Global config identity. */
     @Getter
-    private final Identity globalIdentity;
+    private final ConfigProvider globalIdentity;
     /** Addon config identity. */
     @Getter
-    private final Identity addonIdentity;
+    private final ConfigProvider addonIdentity;
     /** Global Swing UI Icon manager. */
     @Getter
     private final IconManager iconManager;
@@ -182,6 +182,7 @@ 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 actionManager Action manager
      * @param commandController Command controller to register commands

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
@@ -48,7 +48,7 @@ public final class AddonToggle {
     /** Listener list. */
     private final ListenerList listeners = new ListenerList();
     /** Identity to change update settings in. */
-    private final Identity identity;
+    private final ConfigProvider identity;
     /** The manager to update when toggling a theme. */
     private final ThemeManager themeManager;
 
@@ -59,7 +59,7 @@ public final class AddonToggle {
      * @param identity Identity to change update settings in.
      * @param pi The PluginInfo to be wrapped.
      */
-    public AddonToggle(final Identity identity, final PluginInfo pi) {
+    public AddonToggle(final ConfigProvider identity, final PluginInfo pi) {
         this.identity = identity;
         this.pi = pi;
         this.theme = null;
@@ -83,7 +83,7 @@ public final class AddonToggle {
      * @param themeManager The manager to update when toggling a theme.
      * @param theme The Theme to be wrapped
      */
-    public AddonToggle(final Identity identity, final ThemeManager themeManager, final Theme theme) {
+    public AddonToggle(final ConfigProvider identity, final ThemeManager themeManager, final Theme theme) {
         this.identity = identity;
         this.pi = null;
         this.theme = theme;

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

@@ -33,8 +33,8 @@ import com.dmdirc.addons.ui_swing.components.NickList;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.TopicBar;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -59,7 +59,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
      */
     private static final long serialVersionUID = 10;
     /** Identity. */
-    private final Identity identity;
+    private final ConfigProvider identity;
     /** split pane. */
     private SplitPane splitPane;
     /** popup menu item. */

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -190,7 +190,7 @@ public final class NewServerDialog extends StandardDialog implements
         final List<Identity> profiles = getController().getIdentityManager()
                 .getIdentitiesByType("profile");
         ((DefaultComboBoxModel) identityField.getModel()).removeAllElements();
-        for (Identity profile : profiles) {
+        for (ConfigProvider profile : profiles) {
             ((DefaultComboBoxModel) identityField.getModel()).addElement(profile);
         }
     }
@@ -244,7 +244,7 @@ public final class NewServerDialog extends StandardDialog implements
         dispose();
         openingServer = true;
 
-        final Identity profile = (Identity) identityField.getSelectedItem();
+        final ConfigProvider profile = (ConfigProvider) identityField.getSelectedItem();
 
         try {
             final URI address = new URI("irc" + (sslCheck.isSelected() ? "s" :

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -29,8 +29,8 @@ import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 
 import java.awt.Window;
@@ -55,7 +55,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements
     /** The channel object that this dialog belongs to. */
     private final Channel channel;
     /** Channel identity file. */
-    private final Identity identity;
+    private final ConfigProvider identity;
     /** Channel window. */
     private final InputWindow channelWindow;
     /** Tabbed pane. */
@@ -75,7 +75,6 @@ public final class ChannelSettingsDialog extends StandardDialog implements
      * @param controller Swing controller
      * @param newChannel The channel object that we're editing settings for
      * @param parentWindow Parent window
-     * @param channelWindow Channel window
      */
     public ChannelSettingsDialog(final SwingController controller,
             final Channel newChannel, final Window parentWindow) {

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java

@@ -25,9 +25,9 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.UpdateChannel;
@@ -89,7 +89,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void save() {
-        final Identity identity = controller.getGlobalIdentity();
+        final ConfigProvider identity = controller.getGlobalIdentity();
         identity.setOption("updater", "enable", enable.isSelected());
 
         identity.setOption("updater", "channel", updateChannel

src/com/dmdirc/addons/ui_swing/dialogs/profiles/Profile.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -42,7 +43,7 @@ import lombok.ToString;
 public class Profile {
 
     /** Identity backing this profile. */
-    private Identity identity;
+    private ConfigProvider identity;
     /** Profile Name, must be a sanitised filename. */
     @Getter @Setter
     private String name;
@@ -69,11 +70,11 @@ public class Profile {
      *
      * @param identity Identity to create profile from
      */
-    public Profile(final Identity identity) {
+    public Profile(final ConfigProvider identity) {
         this.identity = identity;
         if (identity == null) {
             name = "New Profile";
-            nicknames = new ArrayList<String>();
+            nicknames = new ArrayList<>();
             realname = "";
             ident = "";
         } else {

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerModel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.IdentValidator;
@@ -58,7 +59,7 @@ public class ProfileManagerModel extends DefaultBindableModel {
     public ProfileManagerModel(final IdentityController identityController) {
         final List<Identity> identities = identityController
                 .getIdentitiesByType("profile");
-        for (Identity identity : identities) {
+        for (ConfigProvider identity : identities) {
             profiles.add(new Profile(identity));
         }
         updateDisplayedProfiles();

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

@@ -27,7 +27,7 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputHandler;
 import com.dmdirc.addons.ui_web.uicomponents.WebInputWindow;
 import com.dmdirc.addons.ui_web.uicomponents.WebWindow;
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -46,6 +46,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import lombok.extern.slf4j.Slf4j;
+
 import org.mortbay.jetty.HttpConnection;
 import org.mortbay.jetty.Request;
 import org.mortbay.jetty.handler.AbstractHandler;
@@ -340,7 +341,7 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         profileEvents.add(new Event("clearprofiles", null));
 
-        for (Identity identity : identityController.getIdentitiesByType("profile")) {
+        for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
             profileEvents.add(new Event("addprofile", identity.getName()));
         }
 
@@ -389,8 +390,8 @@ public class DynamicRequestHandler extends AbstractHandler {
                 "target"));
     }
 
-    private Identity findProfile(final String parameter) {
-        for (Identity identity : identityController.getIdentitiesByType("profile")) {
+    private ConfigProvider findProfile(final String parameter) {
+        for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
             if (identity.getName().equals(parameter)) {
                 return identity;
             }