Use config interfaces where possible.

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

src/com/dmdirc/ClientModule.java

@@ -32,16 +32,16 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.CommandModule;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.ServerFactory;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.messages.MessageSinkManager;
@@ -107,7 +107,7 @@ public class ClientModule {
         }
 
         if (commandLineParser.getDisableReporting()) {
-            identityManager.getGlobalConfigIdentity()
+            identityManager.getUserSettings()
                     .setOption("temp", "noerrorreporting", true);
         }
 
@@ -517,7 +517,7 @@ public class ClientModule {
     private void checkBundledPlugins(
             final CorePluginExtractor corePluginExtractor,
             final PluginManager pm,
-            final ConfigManager config) {
+            final AggregateConfigProvider config) {
         for (PluginInfo plugin : pm.getPluginInfos()) {
             if (config.hasOptionString("bundledplugins_versions", plugin.getMetaData().getName())) {
                 final Version bundled = new Version(config.getOption("bundledplugins_versions",

src/com/dmdirc/FrameContainer.java

@@ -24,12 +24,12 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.FrameComponentChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
@@ -91,7 +91,7 @@ public abstract class FrameContainer {
 
     /** The config manager for this container. */
     @Getter
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /** The IconChanger for this container. */
     private final IconChanger changer = new IconChanger();
@@ -124,7 +124,7 @@ public abstract class FrameContainer {
      */
     protected FrameContainer(
             final String icon, final String name,
-            final String title, final ConfigManager config,
+            final String title, final AggregateConfigProvider config,
             final Collection<String> components) {
         this.configManager = config;
         this.name = name;

src/com/dmdirc/GlobalWindow.java

@@ -27,8 +27,8 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -58,7 +58,7 @@ public class GlobalWindow extends WritableFrameContainer {
      * @param config The ConfigManager to retrieve settings from.
      * @param parser The command parser to use to parse input.
      */
-    public GlobalWindow(final ConfigManager config, final CommandParser parser) {
+    public GlobalWindow(final AggregateConfigProvider config, final CommandParser parser) {
         super("icon", "Global", "(Global)",
                 config, parser,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
@@ -129,7 +129,7 @@ public class GlobalWindow extends WritableFrameContainer {
      * general.showglobalwindow config setting.
      */
     protected static void updateWindowState() {
-        final ConfigManager configManager = IdentityManager.getIdentityManager()
+        final AggregateConfigProvider configManager = IdentityManager.getIdentityManager()
                 .getGlobalConfiguration();
 
         synchronized (GlobalWindow.class) {

src/com/dmdirc/Main.java

@@ -195,7 +195,7 @@ public class Main {
                 new WarningDialog(WarningDialog.NO_COMPAT_UIS_TITLE,
                         WarningDialog.NO_RECOV_UIS).displayBlocking();
             }
-            identityManager.getGlobalConfigIdentity().unsetOption("debug", "uiFixAttempted");
+            identityManager.getUserSettings().unsetOption("debug", "uiFixAttempted");
             System.exit(1);
         } else {
             // Try to extract the UIs again incase they changed between versions
@@ -210,7 +210,7 @@ public class Main {
             }
 
             // Allow the rebooted DMDirc to know that we have attempted restarting.
-            identityManager.getGlobalConfigIdentity().setOption("debug", "uiFixAttempted", "true");
+            identityManager.getUserSettings().setOption("debug", "uiFixAttempted", "true");
             // Tell the launcher to restart!
             System.exit(42);
         }
@@ -243,7 +243,7 @@ public class Main {
         } else {
             // The fix worked!
             if (identityManager.getGlobalConfiguration().hasOptionBool("debug", "uiFixAttempted")) {
-                identityManager.getGlobalConfigIdentity().unsetOption("debug", "uiFixAttempted");
+                identityManager.getUserSettings().unsetOption("debug", "uiFixAttempted");
             }
         }
     }
@@ -253,7 +253,7 @@ public class Main {
      */
     private void doFirstRun() {
         if (identityManager.getGlobalConfiguration().getOptionBool("general", "firstRun")) {
-            identityManager.getGlobalConfigIdentity().setOption("general", "firstRun", "false");
+            identityManager.getUserSettings().setOption("general", "firstRun", "false");
             for (UIController controller : CONTROLLERS) {
                 controller.showFirstRunWizard();
             }

src/com/dmdirc/MessageTarget.java

@@ -23,7 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Collection;
 
@@ -45,7 +45,7 @@ public abstract class MessageTarget extends WritableFrameContainer {
      * @since 0.6.4
      */
     public MessageTarget(final String icon, final String name,
-            final String title, final ConfigManager config,
+            final String title, final AggregateConfigProvider config,
             final CommandParser parser, final Collection<String> components) {
         super(icon, name, title, config, parser, components);
     }

src/com/dmdirc/Server.java

@@ -27,14 +27,14 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.AwayStateListener;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.InviteListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -210,7 +210,7 @@ public class Server extends WritableFrameContainer
      */
     public Server(
             final ServerManager manager,
-            final ConfigManager configManager,
+            final AggregateConfigProvider configManager,
             final CommandParser commandParser,
             final ParserFactory parserFactory,
             final WindowManager windowManager,

src/com/dmdirc/ServerManager.java

@@ -222,7 +222,7 @@ public class ServerManager implements ServerFactory {
      */
     public Server connectToAddress(final URI uri) {
         return connectToAddress(uri,
-                identityController.getIdentitiesByType("profile").get(0));
+                identityController.getProvidersByType("profile").get(0));
     }
 
     /**

src/com/dmdirc/WritableFrameContainer.java

@@ -24,8 +24,8 @@ package com.dmdirc;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.ui.input.TabCompleter;
@@ -43,10 +43,10 @@ import java.util.List;
 public abstract class WritableFrameContainer extends FrameContainer {
 
     /** The name of the server notification target. */
-    protected static final String NOTIFICATION_SERVER = "server".intern();
+    protected static final String NOTIFICATION_SERVER = "server";
 
     /** The name of the channel notification target. */
-    protected static final String NOTIFICATION_CHANNEL = "channel".intern();
+    protected static final String NOTIFICATION_CHANNEL = "channel";
 
     /** The command parser used for commands in this container. */
     protected final CommandParser commandParser;
@@ -63,7 +63,7 @@ public abstract class WritableFrameContainer extends FrameContainer {
      * @since 0.6.4
      */
     public WritableFrameContainer(final String icon, final String name,
-            final String title, final ConfigManager config,
+            final String title, final AggregateConfigProvider config,
             final CommandParser parser, final Collection<String> components) {
         super(icon, name, title, config, components);
 

src/com/dmdirc/actions/Action.java

@@ -267,7 +267,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
                         PreferencesType.valueOf(data.get("type")), "actions",
                         data.get("setting"), data.get("title"), data.get("tooltip"),
                         IdentityManager.getIdentityManager().getGlobalConfiguration(),
-                        IdentityManager.getIdentityManager().getGlobalConfigIdentity()));
+                        IdentityManager.getIdentityManager().getUserSettings()));
             }
         }
     }
@@ -592,10 +592,10 @@ public class Action extends ActionModel implements ConfigChangeListener {
      */
     public void setEnabled(final boolean enabled) {
         if (enabled) {
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity()
+            IdentityManager.getIdentityManager().getUserSettings()
                     .unsetOption("disable_action", (group + "/" + name).replace(' ', '.'));
         } else {
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity()
+            IdentityManager.getIdentityManager().getUserSettings()
                     .setOption("disable_action", (group + "/" + name).replace(' ', '.'), true);
         }
     }

src/com/dmdirc/actions/ActionManager.java

@@ -28,10 +28,10 @@ import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionComparison;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.UpdateChecker;
@@ -162,7 +162,7 @@ public class ActionManager implements ActionController {
             addGroup(wrapper);
         }
 
-        new WhoisNumericFormatter(identityManager.getGlobalAddonIdentity()).register();
+        new WhoisNumericFormatter(identityManager.getAddonSettings()).register();
 
         // Register a listener for the closing event, so we can save actions
         registerListener(new ActionListener() {
@@ -189,7 +189,7 @@ public class ActionManager implements ActionController {
     @Override
     public void registerSetting(final String name, final String value) {
         log.debug("Registering new action setting: {} = {}", name, value);
-        identityManager.getGlobalAddonIdentity().setOption("actions", name, value);
+        identityManager.getAddonSettings().setOption("actions", name, value);
     }
 
     /** {@inheritDoc} */
@@ -438,7 +438,7 @@ public class ActionManager implements ActionController {
      * @return The directory that should be used to store actions
      */
     public String getDirectory() {
-        return this.identityManager.getConfigDir() + "actions" + System.getProperty("file.separator");
+        return this.identityManager.getConfigurationDirectory() + "actions" + System.getProperty("file.separator");
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/actions/ActionSubstitutor.java

@@ -27,11 +27,11 @@ import com.dmdirc.Precondition;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 
 import java.util.Arrays;
@@ -270,7 +270,7 @@ public class ActionSubstitutor {
             }
         }
 
-        final ConfigManager manager = getConfigManager(args);
+        final AggregateConfigProvider manager = getConfigManager(args);
 
         if (manager.hasOptionString("actions", substitution)) {
             return manager.getOption("actions", substitution);
@@ -328,7 +328,7 @@ public class ActionSubstitutor {
      * @return The best config manager to use for those arguments
      * @since 0.6.3m2
      */
-    protected ConfigManager getConfigManager(final Object ... args) {
+    protected AggregateConfigProvider getConfigManager(final Object ... args) {
         for (Object arg : args) {
             if (arg instanceof FrameContainer) {
                 return ((FrameContainer) arg).getConfigManager();

src/com/dmdirc/commandparser/CommandManager.java

@@ -28,8 +28,8 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.util.collections.MapList;
@@ -86,7 +86,7 @@ public class CommandManager implements CommandController {
      *
      * @param configManager The configuration manager to read settings from.
      */
-    public void initialise(final ConfigManager configManager) {
+    public void initialise(final AggregateConfigProvider configManager) {
         configManager.getBinder().bind(this, CommandManager.class);
     }
 

src/com/dmdirc/commandparser/PopupManager.java

@@ -24,8 +24,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
-
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 /**
  * The popup manager manages which commands should be present in popup menus.
@@ -47,7 +46,7 @@ public class PopupManager {
      * @param configManager The config manager to be used for the menu
      * @return The PopupMenu that should be displayed
      */
-    public static PopupMenu getMenu(final PopupType menuType, final ConfigManager configManager) {
+    public static PopupMenu getMenu(final PopupType menuType, final AggregateConfigProvider configManager) {
         final PopupMenu menu = getMenu(menuType.toString(), menuType, configManager);
 
         ActionManager.getActionManager().triggerEvent(
@@ -66,7 +65,7 @@ public class PopupManager {
      * @return The PopupMenu with the specified name
      */
     private static PopupMenu getMenu(final String menuName,
-            final PopupType type, final ConfigManager configManager) {
+            final PopupType type, final AggregateConfigProvider configManager) {
         final PopupMenu res = new PopupMenu();
 
         for (String item : configManager.getOptionList("popups", menuName)) {
@@ -89,7 +88,7 @@ public class PopupManager {
      * @return The corresponding PopupMenuItem
      */
     private static PopupMenuItem getItem(final String item,
-            final PopupType type, final ConfigManager configManager) {
+            final PopupType type, final AggregateConfigProvider configManager) {
         PopupMenuItem res;
 
         if ("-".equals(item)) {

src/com/dmdirc/commandparser/commands/global/NewServer.java

@@ -115,7 +115,7 @@ public class NewServer extends Command implements IntelligentCommand {
         }
 
         final Server server = serverFactory.createServer(address,
-                identityController.getIdentitiesByType("profile").get(0));
+                identityController.getProvidersByType("profile").get(0));
         server.connect();
     }
 

src/com/dmdirc/commandparser/commands/global/SetCommand.java

@@ -35,8 +35,8 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.flags.CommandFlag;
 import com.dmdirc.commandparser.commands.flags.CommandFlagHandler;
 import com.dmdirc.commandparser.commands.flags.CommandFlagResult;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -110,8 +110,8 @@ public class SetCommand extends Command implements IntelligentCommand {
             return;
         }
 
-        ConfigProvider identity = identityController.getGlobalConfigIdentity();
-        ConfigManager manager = identityController.getGlobalConfiguration();
+        ConfigProvider identity = identityController.getUserSettings();
+        AggregateConfigProvider manager = identityController.getGlobalConfiguration();
 
         if (res.hasFlag(serverFlag)) {
             if (origin.getServer() == null) {
@@ -178,7 +178,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param manager The config manager to use to retrieve data
      */
     private void doDomainList(final FrameContainer origin, final boolean isSilent,
-            final ConfigManager manager) {
+            final AggregateConfigProvider manager) {
         final StringBuffer output = new StringBuffer(67);
 
         output.append("Valid domains (use ");
@@ -202,7 +202,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param domain The domain to be inspected
      */
     private void doOptionsList(final FrameContainer origin,
-            final boolean isSilent, final ConfigManager manager, final String domain) {
+            final boolean isSilent, final AggregateConfigProvider manager, final String domain) {
         final StringBuffer output = new StringBuffer(24);
 
         output.append("Options in domain '");
@@ -235,7 +235,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param option The name of the option
      */
     private void doShowOption(final FrameContainer origin,
-            final boolean isSilent, final ConfigManager manager,
+            final boolean isSilent, final AggregateConfigProvider manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, "The current value of "
@@ -276,7 +276,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      * @param data The data to be appended
      */
     private void doAppendOption(final FrameContainer origin,
-            final boolean isSilent, final ConfigProvider identity, final ConfigManager manager,
+            final boolean isSilent, final ConfigProvider identity, final AggregateConfigProvider manager,
             final String domain, final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
                 (manager.hasOptionString(domain, option)

src/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -35,7 +35,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.RollingList;
 
 import java.io.Serializable;
@@ -73,7 +73,7 @@ public abstract class CommandParser implements Serializable {
     protected final CommandManager commandManager;
 
     /** Creates a new instance of CommandParser. */
-    protected CommandParser(final ConfigManager configManager,
+    protected CommandParser(final AggregateConfigProvider configManager,
             final CommandManager commandManager) {
         commands = new HashMap<>();
         history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));

src/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -51,7 +51,7 @@ public class GlobalCommandParser extends CommandParser {
      * @param configManager Config manager to read settings from
      * @param commandManager Command manager to load commands from
      */
-    public GlobalCommandParser(final ConfigManager configManager,
+    public GlobalCommandParser(final AggregateConfigProvider configManager,
             final CommandManager commandManager) {
         super(configManager, commandManager);
     }

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 /**
  * A command parser used in the context of a server.
@@ -50,7 +50,7 @@ public class ServerCommandParser extends GlobalCommandParser {
      *
      * @param configManager Config manager to read settings from
      */
-    public ServerCommandParser(final ConfigManager configManager) {
+    public ServerCommandParser(final AggregateConfigProvider configManager) {
         super(configManager, CommandManager.getCommandManager());
     }
 

src/com/dmdirc/config/CipherUtils.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config;
 
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -184,7 +185,7 @@ public abstract class CipherUtils {
      * @return true if auth was successful, false otherwise.
      */
     public boolean auth() {
-        final ConfigManager configManager = identityController.getGlobalConfiguration();
+        final AggregateConfigProvider configManager = identityController.getGlobalConfiguration();
 
         String passwordHash = null;
         String prompt = "Please enter your password";
@@ -200,7 +201,7 @@ public abstract class CipherUtils {
                 password = getPassword(prompt);
                 if (passwordHash == null) {
                     passwordHash = hash(password);
-                    identityController.getGlobalConfigIdentity()
+                    identityController.getUserSettings()
                             .setOption("encryption", "passwordHash", passwordHash);
                 }
                 if (!hash(password).equals(passwordHash)) {

src/com/dmdirc/config/ConfigManager.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.validators.Validator;
 
@@ -56,7 +56,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
     private static final String VERSION_DOMAIN = "version";
 
     /** A list of sources for this config manager. */
-    private final List<Identity> sources;
+    private final List<ConfigProvider> sources;
 
     /** The listeners registered for this manager. */
     private final MapList<String, ConfigChangeListener> listeners = new MapList<>();
@@ -115,7 +115,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         log.debug("Found {} source(s) for protocol: {}, ircd: {}, network: {}, server: {}, channel: {}",
                 new Object[] { sources.size(), protocol, ircd, network, server, chanName });
 
-        for (Identity identity : sources) {
+        for (ConfigProvider identity : sources) {
             log.trace("Found {}", identity);
             identity.addListener(this);
         }
@@ -131,11 +131,11 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
 
         if (VERSION_DOMAIN.equals(domain)) {
             return IdentityManager.getIdentityManager()
-                    .getGlobalVersionIdentity().getOption(domain, option, validator);
+                    .getVersionSettings().getOption(domain, option, validator);
         }
 
         synchronized (sources) {
-            for (Identity source : sources) {
+            for (ConfigProvider source : sources) {
                 if (source.hasOption(domain, option, validator)) {
                     return source.getOption(domain, option, validator);
                 }
@@ -147,17 +147,17 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
 
     /** {@inheritDoc} */
     @Override
-    protected boolean hasOption(final String domain, final String option,
+    public boolean hasOption(final String domain, final String option,
             final Validator<String> validator) {
         doStats(domain, option);
 
         if (VERSION_DOMAIN.equals(domain)) {
             return IdentityManager.getIdentityManager()
-                    .getGlobalVersionIdentity().hasOption(domain, option, validator);
+                    .getVersionSettings().hasOption(domain, option, validator);
         }
 
         synchronized (sources) {
-            for (Identity source : sources) {
+            for (ConfigProvider source : sources) {
                 if (source.hasOption(domain, option, validator)) {
                     return true;
                 }
@@ -172,7 +172,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
     public Map<String, String> getOptions(final String domain) {
         if (VERSION_DOMAIN.equals(domain)) {
             return IdentityManager.getIdentityManager()
-                    .getGlobalVersionIdentity().getOptions(domain);
+                    .getVersionSettings().getOptions(domain);
         }
 
         final Map<String, String> res = new HashMap<>();
@@ -191,7 +191,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
      *
      * @param identity The identity to be removed
      */
-    public void removeIdentity(final Identity identity) {
+    public void removeIdentity(final ConfigProvider identity) {
         if (!sources.contains(identity)) {
             return;
         }
@@ -226,14 +226,14 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
      * @param option The option to search for
      * @return The identity that defines that setting, or null on failure
      */
-    protected Identity getScope(final String domain, final String option) {
+    protected ConfigProvider getScope(final String domain, final String option) {
         if (VERSION_DOMAIN.equals(domain)) {
             return IdentityManager.getIdentityManager()
-                    .getGlobalVersionIdentity();
+                    .getVersionSettings();
         }
 
         synchronized (sources) {
-            for (Identity source : sources) {
+            for (ConfigProvider source : sources) {
                 if (source.hasOptionString(domain, option)) {
                     return source;
                 }
@@ -249,7 +249,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
      * @param identity The identity to test
      * @return True if the identity applies, false otherwise
      */
-    public boolean identityApplies(final Identity identity) {
+    public boolean identityApplies(final ConfigProvider identity) {
         String comp;
 
         switch (identity.getTarget().getType()) {
@@ -308,12 +308,12 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
      *
      * @param identity The identity to be checked
      */
-    public void checkIdentity(final Identity identity) {
+    public void checkIdentity(final ConfigProvider identity) {
         if (!sources.contains(identity) && identityApplies(identity)) {
             synchronized (sources) {
                 sources.add(identity);
                 identity.addListener(this);
-                Collections.sort(sources);
+                Collections.sort(sources, new ConfigProviderTargetComparator());
             }
 
             // Determine which settings will have changed
@@ -333,7 +333,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         final Set<String> res = new HashSet<>();
 
         synchronized (sources) {
-            for (Identity source : sources) {
+            for (ConfigProvider source : sources) {
                 res.addAll(source.getDomains());
             }
         }
@@ -343,7 +343,7 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
 
     /** {@inheritDoc} */
     @Override
-    public List<Identity> getSources() {
+    public List<ConfigProvider> getSources() {
         return new ArrayList<>(sources);
     }
 
@@ -370,16 +370,16 @@ public class ConfigManager extends ConfigSource implements ConfigChangeListener,
         this.server = server;
         this.channel = channel + "@" + network;
 
-        for (Identity identity : new ArrayList<>(sources)) {
+        for (ConfigProvider identity : new ArrayList<>(sources)) {
             if (!identityApplies(identity)) {
                 log.debug("Removing identity that no longer applies: {}", identity);
                 removeIdentity(identity);
             }
         }
 
-        final List<Identity> newSources = IdentityManager.getIdentityManager()
+        final List<ConfigProvider> newSources = IdentityManager.getIdentityManager()
                 .getIdentitiesForManager(this);
-        for (Identity identity : newSources) {
+        for (ConfigProvider identity : newSources) {
             log.trace("Testing new identity: {}", identity);
             checkIdentity(identity);
         }

src/com/dmdirc/config/ConfigProviderTargetComparator.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2013 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.config;
+
+import com.dmdirc.interfaces.config.ConfigProvider;
+
+import java.util.Comparator;
+
+/**
+ * Compares {@link ConfigProvider}s by their targets.
+ *
+ * A collection sorted by this comparator will have the most specific (tightly scoped) providers
+ * first, and global (loosely scoped) last.
+ */
+public class ConfigProviderTargetComparator implements Comparator<ConfigProvider> {
+
+    /** {@inheritDoc} */
+    @Override
+    public int compare(final ConfigProvider t, final ConfigProvider t1) {
+        return t1.getTarget().compareTo(t.getTarget());
+    }
+}

src/com/dmdirc/config/ConfigSource.java

@@ -103,19 +103,6 @@ public abstract class ConfigSource implements ReadOnlyConfigProvider {
     public abstract String getOption(final String domain,
             final String option, final Validator<String> validator);
 
-    /**
-     * Determines if this source has a value for the specified option which
-     * matches the specified validator.
-     *
-     * @since 0.6.5
-     * @param domain The domain of the option
-     * @param option The name of the option
-     * @param validator The validator to use to check legal values
-     * @return True iff a matching option exists, false otherwise.
-     */
-    protected abstract boolean hasOption(final String domain,
-            final String option, final Validator<String> validator);
-
     /** {@inheritDoc} */
     @Override
     public boolean hasOptionString(final String domain, final String option) {

src/com/dmdirc/config/Identity.java

@@ -58,10 +58,10 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
     protected static final String ILLEGAL_CHARS = "[\\\\\"/:\\*\\?\"<>\\|]";
 
     /** The domain used for identity settings. */
-    private static final String DOMAIN = "identity".intern();
+    private static final String DOMAIN = "identity";
 
     /** The domain used for profile settings. */
-    private static final String PROFILE_DOMAIN = "profile".intern();
+    private static final String PROFILE_DOMAIN = "profile";
 
     /** The target for this identity. */
     protected final ConfigTarget myTarget;
@@ -299,7 +299,7 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
 
     /** {@inheritDoc} */
     @Override
-    protected boolean hasOption(final String domain, final String option,
+    public boolean hasOption(final String domain, final String option,
             final Validator<String> validator) {
         return file.isKeyDomain(domain)
                 && file.getKeyDomain(domain).containsKey(option)
@@ -449,10 +449,10 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
                 }
 
                 globalConfig.removeIdentity(this);
-                globalConfig.removeIdentity(IdentityManager.getIdentityManager().getGlobalVersionIdentity());
+                globalConfig.removeIdentity(IdentityManager.getIdentityManager().getVersionSettings());
 
                 if (log.isTraceEnabled()) {
-                    for (Identity source : globalConfig.getSources()) {
+                    for (ConfigProvider source : globalConfig.getSources()) {
                         log.trace("{}: source: {}",
                                 new Object[]{ getName(), source.getName() });
                     }
@@ -498,7 +498,7 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
             file.delete();
         }
 
-        IdentityManager.getIdentityManager().unregisterIdentity(this);
+        IdentityManager.getIdentityManager().removeConfigProvider(this);
     }
 
     /** {@inheritDoc} */
@@ -584,7 +584,7 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
         }
 
         final String fs = System.getProperty("file.separator");
-        final String location = IdentityManager.getIdentityManager().getConfigDir() + "identities" + fs;
+        final String location = IdentityManager.getIdentityManager().getConfigurationDirectory() + "identities" + fs;
         final String name = settings.get(DOMAIN).get("name").replaceAll(ILLEGAL_CHARS, "_");
 
         File file = new File(location + name);
@@ -603,7 +603,7 @@ public class Identity extends ConfigSource implements Comparable<Identity>, Conf
         configFile.write();
 
         final Identity identity = new Identity(file, false);
-        IdentityManager.getIdentityManager().registerIdentity(identity);
+        IdentityManager.getIdentityManager().addConfigProvider(identity);
 
         return identity;
     }

src/com/dmdirc/config/IdentityManager.java

@@ -22,8 +22,9 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.Precondition;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorLevel;
@@ -39,6 +40,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -66,7 +68,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * Standard identities are inserted with a <code>null</code> key, custom
      * identities use their custom type as the key.
      */
-    private final MapList<String, Identity> identities = new MapList<>();
+    private final MapList<String, ConfigProvider> identities = new MapList<>();
 
     /**
      * The {@link IdentityListener}s that have registered with this manager.
@@ -99,12 +101,17 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public String getConfigDir() {
+    @Deprecated
+    public String getConfigurationDirectory() {
         return configDirectory;
     }
 
-    /** {@inheritDoc} */
-    @Override
+    /**
+     * Loads all identity files.
+     *
+     * @throws InvalidIdentityFileException If there is an error with the config
+     * file.
+     */
     public void initialise() throws InvalidIdentityFileException {
         identities.clear();
 
@@ -113,7 +120,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         loadUserIdentities();
         loadConfig();
 
-        if (getIdentitiesByType("profile").isEmpty()) {
+        if (getProvidersByType("profile").isEmpty()) {
             try {
                 Identity.buildProfile("Default Profile");
             } catch (IOException ex) {
@@ -132,7 +139,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         addonConfigFile.addDomain("identity", addonSettings);
 
         addonConfig = new Identity(addonConfigFile, target);
-        registerIdentity(addonConfig);
+        addConfigProvider(addonConfig);
 
         if (!getGlobalConfiguration().hasOptionString("identity", "defaultsversion")) {
             Logger.userError(ErrorLevel.FATAL, "Default settings "
@@ -143,7 +150,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     /** Loads the default (built in) identities. */
     private void loadDefaults() {
         final String[] targets = {"default", "modealiases"};
-        final String dir = getIdentityDirectory();
+        final String dir = getUserSettingsDirectory();
 
         for (String target : targets) {
             final File file = new File(dir + target);
@@ -197,7 +204,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             ResourceManager.getResourceManager().extractResource(
                     "com/dmdirc/config/defaults/default/formatter",
-                    getIdentityDirectory() + "default/", false);
+                    getUserSettingsDirectory() + "default/", false);
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to extract default "
                     + "formatters: " + ex.getMessage());
@@ -214,7 +221,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             ResourceManager.getResourceManager().extractResources(
                     "com/dmdirc/config/defaults/" + target,
-                    getIdentityDirectory() + target, false);
+                    getUserSettingsDirectory() + target, false);
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to extract default "
                     + "identities: " + ex.getMessage());
@@ -223,14 +230,15 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public String getIdentityDirectory() {
+    @Deprecated
+    public String getUserSettingsDirectory() {
         return configDirectory + "identities" + System.getProperty("file.separator");
     }
 
     /** {@inheritDoc} */
     @Override
     public void loadUserIdentities() {
-        final File dir = new File(getIdentityDirectory());
+        final File dir = new File(getUserSettingsDirectory());
 
         if (!dir.exists()) {
             try {
@@ -280,8 +288,10 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      */
     private void loadIdentity(final File file) {
         synchronized (identities) {
-            for (Identity identity : getAllIdentities()) {
-                if (identity.isFile(file)) {
+            for (ConfigProvider identity : getAllIdentities()) {
+                if ((identity instanceof Identity) && ((Identity) identity).isFile(file)) {
+                    // TODO: This manager should keep a list of files->identities instead of
+                    //       relying on the identities remembering.
                     try {
                         identity.reload();
                     } catch (IOException ex) {
@@ -298,7 +308,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         }
 
         try {
-            registerIdentity(new Identity(file, false));
+            addConfigProvider(new Identity(file, false));
         } catch (InvalidIdentityFileException ex) {
             Logger.userError(ErrorLevel.MEDIUM,
                     "Invalid identity file: " + file.getAbsolutePath()
@@ -316,10 +326,10 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @return A set of all known identities
      * @since 0.6.4
      */
-    private Set<Identity> getAllIdentities() {
-        final Set<Identity> res = new LinkedHashSet<>();
+    private Set<ConfigProvider> getAllIdentities() {
+        final Set<ConfigProvider> res = new LinkedHashSet<>();
 
-        for (Map.Entry<String, List<Identity>> entry : identities.entrySet()) {
+        for (Map.Entry<String, List<ConfigProvider>> entry : identities.entrySet()) {
             res.addAll(entry.getValue());
         }
 
@@ -335,7 +345,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @return The group of the specified identity
      * @since 0.6.4
      */
-    private String getGroup(final Identity identity) {
+    private String getGroup(final ConfigProvider identity) {
         return identity.getTarget().getType() == ConfigTarget.TYPE.CUSTOM
                 ? identity.getTarget().getData() : null;
     }
@@ -345,7 +355,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     public void loadVersionIdentity() {
         try {
             versionConfig = new Identity(IdentityManager.class.getResourceAsStream("/com/dmdirc/version.config"), false);
-            registerIdentity(versionConfig);
+            addConfigProvider(versionConfig);
         } catch (IOException | InvalidIdentityFileException ex) {
             Logger.appError(ErrorLevel.FATAL, "Unable to load version information", ex);
         }
@@ -367,7 +377,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
             config = new Identity(file, true);
             config.setOption("identity", "name", "Global config");
-            registerIdentity(config);
+            addConfigProvider(config);
         } catch (IOException ex) {
             Logger.userError(ErrorLevel.FATAL, "I/O error when loading global config: "
                     + ex.getMessage(), ex);
@@ -376,19 +386,19 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public Identity getGlobalConfigIdentity() {
+    public Identity getUserSettings() {
         return config;
     }
 
     /** {@inheritDoc} */
     @Override
-    public Identity getGlobalAddonIdentity() {
+    public Identity getAddonSettings() {
         return addonConfig;
     }
 
     /** {@inheritDoc} */
     @Override
-    public Identity getGlobalVersionIdentity() {
+    public Identity getVersionSettings() {
         return versionConfig;
     }
 
@@ -396,7 +406,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public void saveAll() {
         synchronized (identities) {
-            for (Identity identity : getAllIdentities()) {
+            for (ConfigProvider identity : getAllIdentities()) {
                 identity.save();
             }
         }
@@ -404,13 +414,13 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public void registerIdentity(final Identity identity) {
+    public void addConfigProvider(final ConfigProvider identity) {
         Logger.assertTrue(identity != null);
 
         final String target = getGroup(identity);
 
         if (identities.containsValue(target, identity)) {
-            unregisterIdentity(identity);
+            removeConfigProvider(identity);
         }
 
         synchronized (identities) {
@@ -429,7 +439,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public void unregisterIdentity(final Identity identity) {
+    public void removeConfigProvider(final ConfigProvider identity) {
         Logger.assertTrue(identity != null);
 
         final String group = getGroup(identity);
@@ -471,24 +481,30 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public List<Identity> getIdentitiesByType(final String type) {
+    public List<ConfigProvider> getProvidersByType(final String type) {
         return Collections.unmodifiableList(identities.safeGet(type));
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public List<Identity> getIdentitiesForManager(final ConfigManager manager) {
-        final List<Identity> sources = new ArrayList<>();
+    /**
+     * Retrieves a list of all config sources that should be applied to the
+     * specified config manager.
+     *
+     * @param manager The manager requesting sources
+     * @return A list of all matching config sources
+     */
+    public List<ConfigProvider> getIdentitiesForManager(final ConfigManager manager) {
+        final List<ConfigProvider> sources = new ArrayList<>();
 
         synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.safeGet(null)) {
                 if (manager.identityApplies(identity)) {
                     sources.add(identity);
                 }
             }
         }
 
-        Collections.sort(sources);
+        // TODO: Expose this as a comparator other classes can use.
+        Collections.sort(sources, new ConfigProviderTargetComparator());
 
         return sources;
     }
@@ -505,7 +521,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public Identity createChannelConfig(final String network, final String channel) {
+    public ConfigProvider createChannelConfig(final String network, final String channel) {
         if (network == null || network.isEmpty()) {
             throw new IllegalArgumentException("getChannelConfig called "
                     + "with null or empty network\n\nNetwork: " + network);
@@ -519,7 +535,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = (channel + "@" + network).toLowerCase();
 
         synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.CHANNEL
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -541,7 +557,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public Identity createNetworkConfig(final String network) {
+    public ConfigProvider createNetworkConfig(final String network) {
         if (network == null || network.isEmpty()) {
             throw new IllegalArgumentException("getNetworkConfig called "
                     + "with null or empty network\n\nNetwork:" + network);
@@ -550,7 +566,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = network.toLowerCase();
 
         synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.NETWORK
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -572,7 +588,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public Identity createServerConfig(final String server) {
+    public ConfigProvider createServerConfig(final String server) {
         if (server == null || server.isEmpty()) {
             throw new IllegalArgumentException("getServerConfig called "
                     + "with null or empty server\n\nServer: " + server);
@@ -581,7 +597,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         final String myTarget = server.toLowerCase();
 
         synchronized (identities) {
-            for (Identity identity : identities.safeGet(null)) {
+            for (ConfigProvider identity : identities.safeGet(null)) {
                 if (identity.getTarget().getType() == ConfigTarget.TYPE.SERVER
                         && identity.getTarget().getData().equalsIgnoreCase(myTarget)) {
                     return identity;
@@ -605,6 +621,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * Gets a singleton instance of the Identity Manager.
      *
      * @return A singleton instance of the IdentityManager.
+     * @deprecated Shouldn't use global state.
      */
     @Deprecated
     public static IdentityManager getIdentityManager() {
@@ -615,6 +632,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * Sets the singleton instance of the Identity Manager.
      *
      * @param identityManager The identity manager to use.
+     * @deprecated Shouldn't use global state.
      */
     @Deprecated
     public static void setIdentityManager(final IdentityManager identityManager) {

src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
@@ -59,7 +59,7 @@ public class PreferencesDialogModel {
     private final PreferencesInterface urlHandlerPanel;
     /** Config Manager to read settings from. */
     @Getter
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
     /** Identity to write settings to. */
     @Getter
     private final ConfigProvider identity;
@@ -84,7 +84,7 @@ public class PreferencesDialogModel {
             final PreferencesInterface themePanel,
             final PreferencesInterface updatesPanel,
             final PreferencesInterface urlHandlerPanel,
-            final ConfigManager configManager,
+            final AggregateConfigProvider configManager,
             final ConfigProvider identity,
             final ActionManager actionManager,
             final PluginManager pluginManager) {

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -24,8 +24,8 @@ package com.dmdirc.config.prefs;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -54,7 +54,7 @@ public class PreferencesManager {
      * @param identity The identity to save settings to
      * @return A preferences category populated with channel settings
      */
-    public PreferencesCategory getServerSettings(final ConfigManager manager,
+    public PreferencesCategory getServerSettings(final AggregateConfigProvider manager,
             final ConfigProvider identity) {
         final PreferencesCategory category
                 = new PreferencesCategory("Server settings",
@@ -139,7 +139,7 @@ public class PreferencesManager {
      * @param identity The identity to save settings to
      * @return A preferences category populated with channel settings
      */
-    public PreferencesCategory getChannelSettings(final ConfigManager manager,
+    public PreferencesCategory getChannelSettings(final AggregateConfigProvider manager,
             final ConfigProvider identity) {
         final PreferencesCategory category
                 = new PreferencesCategory("Channel settings",

src/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
@@ -87,7 +86,7 @@ public class PreferencesSetting {
     public PreferencesSetting(final PreferencesType type,
             final Validator<String> validator, final String domain,
             final String option, final String title, final String helptext,
-            final ConfigManager configManager, final ConfigProvider identity) {
+            final AggregateConfigProvider configManager, final ConfigProvider identity) {
         if (PreferencesType.MULTICHOICE.equals(type)) {
             throw new IllegalArgumentException("Multi-choice preferences must "
                     + "have their options specified.");
@@ -120,7 +119,7 @@ public class PreferencesSetting {
      */
     public PreferencesSetting(final PreferencesType type, final String domain,
             final String option, final String title, final String helptext,
-            final ConfigManager configManager, final ConfigProvider identity) {
+            final AggregateConfigProvider configManager, final ConfigProvider identity) {
         if (PreferencesType.MULTICHOICE.equals(type)) {
             throw new IllegalArgumentException("Multi-choice preferences must "
                     + "have their options specified.");
@@ -153,7 +152,7 @@ public class PreferencesSetting {
     public PreferencesSetting(final String domain, final String option,
             final String title, final String helptext,
             final Map<String, String> options,
-            final ConfigManager configManager, final ConfigProvider identity) {
+            final AggregateConfigProvider configManager, final ConfigProvider identity) {
         this.type = PreferencesType.MULTICHOICE;
         this.comboOptions = new HashMap<>(options);
         this.validator = new PermissiveValidator<>();

src/com/dmdirc/config/validators/URLProtocolValidator.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.config.validators;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
 
@@ -33,7 +33,7 @@ import com.dmdirc.util.validators.Validator;
 public class URLProtocolValidator implements Validator<String> {
 
     /** The global configuration to read settings from. */
-    private final ConfigManager globalConfig;
+    private final AggregateConfigProvider globalConfig;
 
     /**
      * Creates a {@link URLProtocolValidator} that will read from the given
@@ -41,7 +41,7 @@ public class URLProtocolValidator implements Validator<String> {
      *
      * @param globalConfig The config manager to read protocol info from.
      */
-    public URLProtocolValidator(final ConfigManager globalConfig) {
+    public URLProtocolValidator(final AggregateConfigProvider globalConfig) {
         this.globalConfig = globalConfig;
     }
 

src/com/dmdirc/interfaces/config/AggregateConfigProvider.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.interfaces.config;
 
-import com.dmdirc.config.Identity;
+import com.dmdirc.config.ConfigBinder;
 
 import java.util.List;
 import java.util.Set;
@@ -64,7 +64,7 @@ public interface AggregateConfigProvider extends ReadOnlyConfigProvider {
      * Retrieves a list of sources for this config manager.
      * @return This config manager's sources.
      */
-    List<Identity> getSources();
+    List<ConfigProvider> getSources();
 
     /**
      * Removes the specified listener for all domains and options.
@@ -100,4 +100,13 @@ public interface AggregateConfigProvider extends ReadOnlyConfigProvider {
      */
     void migrate(String protocol, String ircd, String network, String server, String channel);
 
+    /**
+     * Gets a binder that may be used to bind methods or fields in a class to configuration
+     * values known by this provider. Bound values update automatically whenever the value in
+     * this provider changes.
+     *
+     * @return A config binder for use with this provider.
+     */
+    ConfigBinder getBinder();
+
 }

src/com/dmdirc/interfaces/config/IdentityController.java

@@ -22,11 +22,6 @@
 
 package com.dmdirc.interfaces.config;
 
-import com.dmdirc.Precondition;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
-import com.dmdirc.config.InvalidIdentityFileException;
-
 import java.util.List;
 
 /**
@@ -40,21 +35,21 @@ public interface IdentityController {
      *
      * @return The addons defaults identity
      */
-    Identity getGlobalAddonIdentity();
+    ConfigProvider getAddonSettings();
 
     /**
      * Retrieves the identity used for the global config.
      *
      * @return The global config identity
      */
-    Identity getGlobalConfigIdentity();
+    ConfigProvider getUserSettings();
 
     /**
      * Retrieves the global config manager.
      *
      * @return The global config manager
      */
-    ConfigManager getGlobalConfiguration();
+    AggregateConfigProvider getGlobalConfiguration();
 
     /**
      * Retrieves the identity bundled with the DMDirc client containing
@@ -63,7 +58,7 @@ public interface IdentityController {
      * @return The version identity
      * @since 0.6.3m2
      */
-    Identity getGlobalVersionIdentity();
+    ReadOnlyConfigProvider getVersionSettings();
 
     /**
      * Retrieves a list of identities that belong to the specified custom type.
@@ -72,38 +67,25 @@ public interface IdentityController {
      * @return A list of matching identities
      * @since 0.6.4
      */
-    List<Identity> getIdentitiesByType(final String type);
-
-    /**
-     * Retrieves a list of all config sources that should be applied to the
-     * specified config manager.
-     *
-     * @param manager The manager requesting sources
-     * @return A list of all matching config sources
-     */
-    List<Identity> getIdentitiesForManager(final ConfigManager manager);
+    List<ConfigProvider> getProvidersByType(String type);
 
     /**
      * Retrieves the directory used to store identities in.
      *
      * @return The identity directory path
+     * @deprecated Shouldn't be exposed through the controller.
      */
-    String getIdentityDirectory();
-
-    /**
-     * Loads all identity files.
-     *
-     * @throws InvalidIdentityFileException If there is an error with the config
-     * file.
-     */
-    void initialise() throws InvalidIdentityFileException;
+    @Deprecated
+    String getUserSettingsDirectory();
 
     /**
      * Get the config directory used by this identity controller.
      *
      * @return The config directory.
+     * @deprecated Shouldn't be exposed through the controller.
      */
-    String getConfigDir();
+    @Deprecated
+    String getConfigurationDirectory();
 
     /**
      * Loads user-defined identity files.
@@ -117,10 +99,10 @@ public interface IdentityController {
 
     /**
      * Adds the specific identity to this manager.
+     *
      * @param identity The identity to be added
      */
-    @Precondition(value = "The specified Identity is not null")
-    void registerIdentity(final Identity identity);
+    void addConfigProvider(ConfigProvider identity);
 
     /**
      * Adds a new identity listener which will be informed of all settings
@@ -129,8 +111,7 @@ public interface IdentityController {
      * @param listener The listener to be added
      * @since 0.6.4
      */
-    @Precondition(value = "The specified listener is not null")
-    void registerIdentityListener(final ConfigProviderListener listener);
+    void registerIdentityListener(ConfigProviderListener listener);
 
     /**
      * Adds a new identity listener which will be informed of all identities
@@ -140,15 +121,14 @@ public interface IdentityController {
      * @param listener The listener to be added
      * @since 0.6.4
      */
-    @Precondition(value = "The specified listener is not null")
-    void registerIdentityListener(final String type, final ConfigProviderListener listener);
+    void registerIdentityListener(String type, ConfigProviderListener listener);
 
     /**
      * Unregisters the given identity listener.
      *
      * @param listener The listener to be removed
      */
-    void unregisterIdentityListener(final ConfigProviderListener listener);
+    void unregisterIdentityListener(ConfigProviderListener listener);
 
     /**
      * Saves all modified identity files to disk.
@@ -159,7 +139,6 @@ public interface IdentityController {
      * Removes an identity from this manager.
      * @param identity The identity to be removed
      */
-    @Precondition(value = {"The specified Identity is not null", "The specified Identity has previously been added and not removed"})
-    void unregisterIdentity(final Identity identity);
+    void removeConfigProvider(ConfigProvider identity);
 
 }

src/com/dmdirc/interfaces/config/IdentityFactory.java

@@ -23,7 +23,6 @@
 package com.dmdirc.interfaces.config;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.config.Identity;
 
 /**
  * Defines methods implemented by a factory which can create useful identities.
@@ -39,7 +38,7 @@ public interface IdentityFactory {
      * @return A config source for the channel
      */
     @Precondition(value = {"The specified network is non-null and not empty", "The specified channel is non-null and not empty"})
-    Identity createChannelConfig(final String network, final String channel);
+    ConfigProvider createChannelConfig(final String network, final String channel);
 
     /**
      * Retrieves the config for the specified network. The config is
@@ -49,7 +48,7 @@ public interface IdentityFactory {
      * @return A config source for the network
      */
     @Precondition(value = "The specified network is non-null and not empty")
-    Identity createNetworkConfig(final String network);
+    ConfigProvider createNetworkConfig(final String network);
 
     /**
      * Retrieves the config for the specified server. The config is
@@ -59,6 +58,6 @@ public interface IdentityFactory {
      * @return A config source for the server
      */
     @Precondition(value = "The specified server is non-null and not empty")
-    Identity createServerConfig(final String server);
+    ConfigProvider createServerConfig(final String server);
 
 }

src/com/dmdirc/interfaces/config/ReadOnlyConfigProvider.java

@@ -54,6 +54,18 @@ public interface ReadOnlyConfigProvider {
      */
     String getOption(String domain, String option, Validator<String> validator);
 
+    /**
+     * Determines if this source has a value for the specified option which
+     * matches the specified validator.
+     *
+     * @since 0.6.5
+     * @param domain The domain of the option
+     * @param option The name of the option
+     * @param validator The validator to use to check legal values
+     * @return True iff a matching option exists, false otherwise.
+     */
+    boolean hasOption(String domain, String option, Validator<String> validator);
+
     /**
      * Retrieves a boolean representation of the specified option.
      *

src/com/dmdirc/logger/ErrorManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.FatalErrorDialog;
@@ -86,7 +86,7 @@ public class ErrorManager implements ConfigChangeListener {
      * @param controller The controller to use to read/write settings.
      */
     public void initialise(final IdentityController controller) {
-        final ConfigManager config = controller.getGlobalConfiguration();
+        final AggregateConfigProvider config = controller.getGlobalConfiguration();
 
         config.addChangeListener("general", "logerrors", this);
         config.addChangeListener("general", "submitErrors", this);
@@ -495,7 +495,7 @@ public class ErrorManager implements ConfigChangeListener {
 
     /** Updates the settings used by this error manager. */
     protected void updateSettings() {
-        final ConfigManager config = IdentityManager.getIdentityManager().getGlobalConfiguration();
+        final AggregateConfigProvider config = IdentityManager.getIdentityManager().getGlobalConfiguration();
 
         try {
             sendReports = config.getOptionBool("general", "submitErrors")

src/com/dmdirc/logger/ProgramError.java

@@ -271,7 +271,7 @@ public final class ProgramError implements Serializable {
         WRITING_SEM.acquireUninterruptibly();
 
         if (errorDir == null || !errorDir.exists()) {
-            errorDir = new File(IdentityManager.getIdentityManager().getConfigDir() + "errors");
+            errorDir = new File(IdentityManager.getIdentityManager().getConfigurationDirectory() + "errors");
             if (!errorDir.exists()) {
                 errorDir.mkdirs();
             }

src/com/dmdirc/plugins/PluginInfo.java

@@ -194,7 +194,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Get the defaults, formatters and icons for this plugin.
      */
     private void getDefaults() {
-        final ConfigProvider defaults = IdentityManager.getIdentityManager().getGlobalAddonIdentity();
+        final ConfigProvider defaults = IdentityManager.getIdentityManager().getAddonSettings();
         final String domain = "plugin-" + metaData.getName();
 
         log.trace("{}: Using domain '{}'",
@@ -244,7 +244,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 synchronized (identities) {
                     try {
                         final Identity thisIdentity = new Identity(stream, false);
-                        IdentityManager.getIdentityManager().registerIdentity(thisIdentity);
+                        IdentityManager.getIdentityManager().addConfigProvider(thisIdentity);
                         identities.add(thisIdentity);
                     } catch (final InvalidIdentityFileException ex) {
                         Logger.userError(ErrorLevel.MEDIUM,
@@ -265,7 +265,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     private void unloadIdentities() {
         synchronized (identities) {
             for (Identity identity : identities) {
-                IdentityManager.getIdentityManager().unregisterIdentity(identity);
+                IdentityManager.getIdentityManager().removeConfigProvider(identity);
             }
 
             identities.clear();

src/com/dmdirc/plugins/PluginManager.java

@@ -551,7 +551,7 @@ public class PluginManager implements ActionListener, ServiceManager {
             list.remove(path);
         }
 
-        identityController.getGlobalConfigIdentity().setOption("plugins", "autoload", list);
+        identityController.getUserSettings().setOption("plugins", "autoload", list);
     }
 
     /**

src/com/dmdirc/tls/CertificateManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.tls;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.collections.ListenerList;
@@ -77,7 +77,7 @@ public class CertificateManager implements X509TrustManager {
     private final String serverName;
 
     /** The configuration manager to use for settings. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
 
     /** The set of CAs from the global cacert file. */
     private final Set<X509Certificate> globalTrustedCAs = new HashSet<X509Certificate>();
@@ -104,7 +104,7 @@ public class CertificateManager implements X509TrustManager {
      * @param serverName The name the user used to connect to the server
      * @param config The configuration manager to use
      */
-    public CertificateManager(final String serverName, final ConfigManager config) {
+    public CertificateManager(final String serverName, final AggregateConfigProvider config) {
         this.serverName = serverName;
         this.config = config;
         this.checkDate = config.getOptionBool("ssl", "checkdate");
@@ -365,7 +365,7 @@ public class CertificateManager implements X509TrustManager {
                     final List<String> list = new ArrayList<String>(config
                             .getOptionList("ssl", "trusted"));
                     list.add(Base64.encodeToString(chain[0].getSignature(), false));
-                    IdentityManager.getIdentityManager().getGlobalConfigIdentity()
+                    IdentityManager.getIdentityManager().getUserSettings()
                             .setOption("ssl", "trusted", list);
                     break;
                 case IGNORE_TEMPORARILY:

src/com/dmdirc/ui/IconManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.URLBuilder;
 
@@ -51,7 +51,7 @@ public class IconManager implements ConfigChangeListener {
     /** A map of existing images. */
     private final Map<String, Image> images;
     /** Config manager to retrieve settings from. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
     /** URL builder to use for icons. */
     private final URLBuilder urlBuilder;
 
@@ -62,7 +62,7 @@ public class IconManager implements ConfigChangeListener {
      * @param urlBuilder URL builder to use for icons.
      */
     public IconManager(
-            final ConfigManager configManager,
+            final AggregateConfigProvider configManager,
             final URLBuilder urlBuilder) {
         this.configManager = configManager;
         this.urlBuilder = urlBuilder;

src/com/dmdirc/ui/StatusMessage.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusMessageNotifier;
 
 /**
@@ -39,7 +39,7 @@ public class StatusMessage {
     /** Timeout when initially displayed. */
     private final int timeout;
     /** Config manager to get default timeout from. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /**
      * Creates a new statusbar message.
@@ -52,7 +52,7 @@ public class StatusMessage {
      */
     public StatusMessage(final String iconType, final String message,
             final StatusMessageNotifier messageNotifier, final int timeout,
-            final ConfigManager configManager) {
+            final AggregateConfigProvider configManager) {
         this.iconType = iconType;
         this.message = message;
         this.messageNotifier = messageNotifier;
@@ -67,7 +67,7 @@ public class StatusMessage {
      * @param message Message to show
      * @param manager Config manager to get default timeout from
      */
-    public StatusMessage(final String message, final ConfigManager manager) {
+    public StatusMessage(final String message, final AggregateConfigProvider manager) {
         this(null, message, null, -1, manager);
     }
 

src/com/dmdirc/ui/core/util/URLHandler.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.core.util;
 
 import com.dmdirc.ServerManager;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -46,7 +46,7 @@ public class URLHandler {
     /** The UI Controller that owns this handler. */
     private final UIController controller;
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Server manager to use to connect to servers. */
     private final ServerManager serverManager;
     /** Status bar manager to use to show messages. */
@@ -61,7 +61,7 @@ public class URLHandler {
      */
     public URLHandler(
             final UIController controller,
-            final ConfigManager globalConfig,
+            final AggregateConfigProvider globalConfig,
             final ServerManager serverManager,
             final StatusBarManager statusBarManager) {
         this.controller = controller;

src/com/dmdirc/ui/input/TabCompleter.java

@@ -30,8 +30,8 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.MapList;
 
 import java.util.Arrays;
@@ -56,7 +56,7 @@ public class TabCompleter {
     /**
      * The config manager to use for reading settings.
      */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /**
      * The entries in this completer.
@@ -74,7 +74,7 @@ public class TabCompleter {
      *
      * @param configManager The manager to read config settings from.
      */
-    public TabCompleter(final ConfigManager configManager) {
+    public TabCompleter(final AggregateConfigProvider configManager) {
         this.parent = null;
         this.configManager = configManager;
     }
@@ -85,7 +85,7 @@ public class TabCompleter {
      * @param configManager The manager to read config settings from.
      * @param parent The parent tab completer to inherit completions from.
      */
-    public TabCompleter(final ConfigManager configManager, final TabCompleter parent) {
+    public TabCompleter(final AggregateConfigProvider configManager, final TabCompleter parent) {
         this.parent = parent;
         this.configManager = configManager;
     }

src/com/dmdirc/ui/messages/ColourManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -55,7 +55,7 @@ public class ColourManager {
     private final Map<String, Colour> colourCache = new HashMap<>();
 
     /** Config manager to read settings from. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /** Actual colours we're using for the 16 IRC colours. */
     private Colour[] ircColours = DEFAULT_COLOURS.clone();
@@ -65,7 +65,7 @@ public class ColourManager {
      *
      * @param configManager The manager to read config settings from.
      */
-    public ColourManager(final ConfigManager configManager) {
+    public ColourManager(final AggregateConfigProvider configManager) {
         this.configManager = configManager;
 
         configManager.addChangeListener("colour", new ConfigChangeListener() {

src/com/dmdirc/ui/messages/Formatter.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.DateUtils;
 
 import java.util.HashMap;
@@ -40,8 +40,7 @@ public final class Formatter {
     /**
      * A cache of types needed by the various formatters.
      */
-    private static final Map<String, Character[]> TYPE_CACHE
-            = new HashMap<String, Character[]>();
+    private static final Map<String, Character[]> TYPE_CACHE = new HashMap<>();
 
     /**
      * Creates a new instance of Formatter.
@@ -60,7 +59,7 @@ public final class Formatter {
      * @return A formatted string
      */
     @Precondition("The specified message type is not null")
-    public static String formatMessage(final ConfigManager config, final String messageType,
+    public static String formatMessage(final AggregateConfigProvider config, final String messageType,
             final Object... arguments) {
         assert messageType != null;
 

src/com/dmdirc/ui/messages/IRCDocument.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
@@ -57,7 +57,7 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
     /** Cached attributed strings. */
     private final RollingList<AttributedString> cachedStrings;
     /** Config Manager for getting settings. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
     /** This document's styliser. */
     private final Styliser styliser;
     /** Font size. */
@@ -74,16 +74,16 @@ public class IRCDocument implements Serializable, ConfigChangeListener {
      * @param styliser Styliser to style text
      * @since 0.6.3
      */
-    public IRCDocument(final ConfigManager configManager,
+    public IRCDocument(final AggregateConfigProvider configManager,
             final Styliser styliser) {
         this.configManager = configManager;
         this.styliser = styliser;
 
-        lines = new ArrayList<Line>();
+        lines = new ArrayList<>();
         listeners = new ListenerList();
 
-        cachedLines = new RollingList<Line>(50);
-        cachedStrings = new RollingList<AttributedString>(50);
+        cachedLines = new RollingList<>(50);
+        cachedStrings = new RollingList<>(50);
         frameBufferSize = configManager.getOptionInt("ui", "frameBufferSize", false);
 
         configManager.addChangeListener("ui", "textPaneFontSize", this);

src/com/dmdirc/ui/messages/Styliser.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -142,7 +142,7 @@ public class Styliser implements ConfigChangeListener {
     /** Server to get channel prefixes from, or null if not applicable. */
     private final Server server;
     /** Config manager to retrieve settings from. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /**
      * Creates a new instance of Styliser.
@@ -160,7 +160,7 @@ public class Styliser implements ConfigChangeListener {
      * @param configManager the {@link ConfigManager} to get settings from.
      * @since 0.6.3
      */
-    public Styliser(final Server server, final ConfigManager configManager) {
+    public Styliser(final Server server, final AggregateConfigProvider configManager) {
         this.server = server;
         this.configManager = configManager;
 

src/com/dmdirc/ui/themes/Theme.java

@@ -106,7 +106,7 @@ public class Theme implements Comparable<Theme> {
         if (stream != null) {
             try {
                 identity = new ThemeIdentity(stream, this);
-                identityController.registerIdentity(identity);
+                identityController.addConfigProvider(identity);
             } catch (InvalidIdentityFileException | IOException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Error loading theme identity file: "
                         + ex.getMessage());
@@ -123,7 +123,7 @@ public class Theme implements Comparable<Theme> {
         }
 
         enabled = false;
-        identityController.unregisterIdentity(identity);
+        identityController.removeConfigProvider(identity);
     }
 
     /**

src/com/dmdirc/ui/themes/ThemeManager.java

@@ -163,7 +163,7 @@ public final class ThemeManager {
             enabled.remove(theme.getFileName());
         }
 
-        identityController.getGlobalConfigIdentity()
+        identityController.getUserSettings()
                 .setOption("themes", "enabled", enabled);
     }
 

src/com/dmdirc/updater/UpdateChecker.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.updater;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.manager.CachingUpdateManager;
@@ -64,10 +64,10 @@ public final class UpdateChecker implements Runnable {
             return;
         }
 
-        final ConfigManager config = IdentityManager.getIdentityManager().getGlobalConfiguration();
+        final AggregateConfigProvider config = IdentityManager.getIdentityManager().getGlobalConfiguration();
 
         if (!config.getOptionBool(DOMAIN, "enable")) {
-            IdentityManager.getIdentityManager().getGlobalConfigIdentity().setOption(DOMAIN,
+            IdentityManager.getIdentityManager().getUserSettings().setOption(DOMAIN,
                     "lastcheck", String.valueOf((int) (new Date().getTime() / 1000)));
 
             MUTEX.release();
@@ -79,7 +79,7 @@ public final class UpdateChecker implements Runnable {
 
         MUTEX.release();
 
-        IdentityManager.getIdentityManager().getGlobalConfigIdentity().setOption(DOMAIN,
+        IdentityManager.getIdentityManager().getUserSettings().setOption(DOMAIN,
                 "lastcheck", String.valueOf((int) (new Date().getTime() / 1000)));
 
         UpdateChecker.initTimer();

src/com/dmdirc/updater/components/DefaultsComponent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
@@ -72,7 +72,7 @@ public class DefaultsComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public Version getVersion() {
-        final ConfigManager globalConfig = identityController.getGlobalConfiguration();
+        final AggregateConfigProvider globalConfig = identityController.getGlobalConfiguration();
 
         if (globalConfig.hasOptionString("identity", "defaultsversion")) {
             return new Version(globalConfig.getOption("identity",
@@ -109,7 +109,7 @@ public class DefaultsComponent implements UpdateComponent {
     public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
 
-        ziprm.extractResources("", identityController.getIdentityDirectory());
+        ziprm.extractResources("", identityController.getUserSettingsDirectory());
 
         identityController.loadUserIdentities();
 

src/com/dmdirc/updater/components/ModeAliasesComponent.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
@@ -72,7 +72,7 @@ public class ModeAliasesComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public Version getVersion() {
-        final ConfigManager globalConfig = identityController.getGlobalConfiguration();
+        final AggregateConfigProvider globalConfig = identityController.getGlobalConfiguration();
 
         if (globalConfig.hasOptionString("identity", "modealiasversion")) {
             return new Version(globalConfig.getOption("identity",
@@ -109,7 +109,7 @@ public class ModeAliasesComponent implements UpdateComponent {
     public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
 
-        ziprm.extractResources("", identityController.getIdentityDirectory());
+        ziprm.extractResources("", identityController.getUserSettingsDirectory());
 
         identityController.loadUserIdentities();
 

src/com/dmdirc/updater/components/PluginComponent.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;
@@ -42,7 +42,7 @@ import lombok.RequiredArgsConstructor;
 public class PluginComponent implements UpdateComponent {
 
     /** The config to use. */
-    private static final ConfigManager CONFIG = IdentityManager.getIdentityManager().getGlobalConfiguration();
+    private static final AggregateConfigProvider CONFIG = IdentityManager.getIdentityManager().getGlobalConfiguration();
 
     /** The plugin this component is for. */
     private final PluginInfo plugin;

src/com/dmdirc/updater/manager/ConfigComponentPolicy.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.updater.manager;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateComponent;
 
 import lombok.RequiredArgsConstructor;
@@ -35,7 +35,7 @@ import lombok.RequiredArgsConstructor;
 public class ConfigComponentPolicy implements UpdateComponentPolicy {
 
     /** The configuration manager to check. */
-    private final ConfigManager manager;
+    private final AggregateConfigProvider manager;
 
     /** {@inheritDoc} */
     @Override

src/com/dmdirc/updater/manager/DMDircUpdateManager.java

@@ -70,7 +70,7 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
         checkStrategy = new DMDircCheckStrategy(UpdateChannel.STABLE);
         identityController.getGlobalConfiguration().getBinder().bind(this, DMDircUpdateManager.class);
         addCheckStrategy(checkStrategy);
-        addRetrievalStrategy(new DownloadRetrievalStrategy(identityController.getConfigDir()));
+        addRetrievalStrategy(new DownloadRetrievalStrategy(identityController.getConfigurationDirectory()));
         addInstallationStrategy(new LegacyInstallationStrategy());
 
         for (UpdateComponent component : components) {

test/com/dmdirc/ServerTest.java

@@ -24,9 +24,9 @@ package com.dmdirc;
 
 import com.dmdirc.actions.wrappers.AliasWrapper;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.WindowManager;
 
@@ -44,7 +44,7 @@ public class ServerTest {
 
     @Mock private ServerManager serverManager;
     @Mock private Identity profile;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
     @Mock private CommandParser commandParser;
     @Mock private ParserFactory parserFactory;
     @Mock private IdentityFactory identityFactory;

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -25,10 +25,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ServerFactory;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginManager;
 
 import java.net.URI;
@@ -48,7 +48,7 @@ public class NewServerTest {
 
     @Mock private CommandController controller;
     @Mock private IdentityController identityController;
-    @Mock private Identity identity;
+    @Mock private ConfigProvider identity;
     @Mock private FrameContainer container;
     @Mock private PluginManager pluginManager;
     @Mock private ServerFactory factory;
@@ -57,8 +57,8 @@ public class NewServerTest {
 
     @Before
     public void setup() {
-        when(factory.createServer(any(URI.class), any(Identity.class))).thenReturn(server);
-        when(identityController.getIdentitiesByType("profile")).thenReturn(Arrays.asList(new Identity[] { identity }));
+        when(factory.createServer(any(URI.class), any(ConfigProvider.class))).thenReturn(server);
+        when(identityController.getProvidersByType("profile")).thenReturn(Arrays.asList(new ConfigProvider[] { identity }));
         command = new NewServer(controller, factory, pluginManager, identityController);
     }
 
@@ -67,7 +67,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo irc.foo.com"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("irc://irc.foo.com:6667")), any(Identity.class));
+        verify(factory).createServer(eq(new URI("irc://irc.foo.com:6667")), any(ConfigProvider.class));
         verify(server).connect();
     }
 
@@ -76,7 +76,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo irc.foo.com:1234"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(Identity.class));
+        verify(factory).createServer(eq(new URI("irc://irc.foo.com:1234")), any(ConfigProvider.class));
         verify(server).connect();
     }
 
@@ -85,7 +85,7 @@ public class NewServerTest {
         command.execute(container, new CommandArguments(controller, "/foo otheruri://foo.com:123/blah"),
                 new CommandContext(null, NewServer.INFO));
 
-        verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), any(Identity.class));
+        verify(factory).createServer(eq(new URI("otheruri://foo.com:123/blah")), any(ConfigProvider.class));
         verify(server).connect();
     }
 

test/com/dmdirc/config/CipherUtilsTest.java

@@ -45,7 +45,7 @@ public class CipherUtilsTest {
     @Before
     public void setup() {
         when(identityController.getGlobalConfiguration()).thenReturn(configManager);
-        when(identityController.getGlobalConfigIdentity()).thenReturn(identity);
+        when(identityController.getUserSettings()).thenReturn(identity);
     }
 
     @Test

test/com/dmdirc/config/ConfigManagerTest.java

@@ -22,9 +22,11 @@
 package com.dmdirc.config;
 
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.PermissiveValidator;
 
 import java.util.Collections;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,7 +45,7 @@ public class ConfigManagerTest {
     public void setup() {
         IdentityManager.setIdentityManager(identityManager);
         when(identityManager.getIdentitiesForManager(any(ConfigManager.class)))
-                .thenReturn(Collections.<Identity>emptyList());
+                .thenReturn(Collections.<ConfigProvider>emptyList());
     }
 
     @Test

test/com/dmdirc/harness/TestConfigSource.java

@@ -30,7 +30,7 @@ import java.util.Map;
 public class TestConfigSource extends ConfigSource {
 
     @Override
-    protected boolean hasOption(String domain, String option, Validator<String> validator) {
+    public boolean hasOption(String domain, String option, Validator<String> validator) {
         return Boolean.parseBoolean(domain);
     }
 

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -22,9 +22,9 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestConfigManagerOptionToggle;
+import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.Collections;
 
@@ -49,7 +49,7 @@ public class FormatterTest {
     public void setup() {
         IdentityManager.setIdentityManager(identityManager);
         when(identityManager.getIdentitiesForManager(any(ConfigManager.class)))
-                .thenReturn(Collections.<Identity>emptyList());
+                .thenReturn(Collections.<ConfigProvider>emptyList());
 
         mcm = new TestConfigManagerOptionToggle();
     }