Use config interfaces where possible.

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

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCCChat;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -54,7 +54,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param targetNick Nickname of target
      */
     public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
-            final ConfigManager configManager, final String title,
+            final AggregateConfigProvider configManager, final String title,
             final String nick, final String targetNick) {
         super(title, "dcc-chat-inactive", configManager,
                 DCCCommandParser.getDCCCommandParser(configManager),

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

@@ -72,7 +72,6 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param plugin The DCC Plugin that this command belongs to
      */
     public DCCCommand(final MainFrame mainFrame, final DCCPlugin plugin) {
-        super();
         this.mainFrame = mainFrame;
         myPlugin = plugin;
     }

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

@@ -27,7 +27,7 @@ import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 /**
  * DCC CommandParser.
@@ -45,7 +45,7 @@ public final class DCCCommandParser extends GlobalCommandParser {
      *
      * @param configManager Config manager
      */
-    private DCCCommandParser(final ConfigManager configManager) {
+    private DCCCommandParser(final AggregateConfigProvider configManager) {
         super(configManager, CommandManager.getCommandManager());
     }
 
@@ -54,7 +54,7 @@ public final class DCCCommandParser extends GlobalCommandParser {
      *
      * @return The singleton DCCCommandParser
      */
-    public static synchronized DCCCommandParser getDCCCommandParser(final ConfigManager configManager) {
+    public static synchronized DCCCommandParser getDCCCommandParser(final AggregateConfigProvider configManager) {
         if (me == null) {
             me = new DCCCommandParser(configManager);
         }

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.Collection;
@@ -48,7 +48,7 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      * @param components The UI components that this frame requires
      */
     public DCCFrameContainer(final String title, final String icon,
-            final ConfigManager configManager, final CommandParser parser,
+            final AggregateConfigProvider configManager, final CommandParser parser,
             final Collection<String> components) {
         super(icon, title, title, configManager, parser, components);
     }

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

@@ -33,7 +33,6 @@ import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -42,6 +41,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
@@ -72,7 +72,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** Config manager to read settings from. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Parent swing controller. */
     private final SwingController controller;
     /** Identity controller to read settings from. */
@@ -636,10 +636,10 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
-        final ConfigProvider defaults = identityController.getGlobalAddonIdentity();
+        final ConfigProvider defaults = identityController.getAddonSettings();
 
         defaults.setOption(getDomain(), "receive.savelocation",
-                identityController.getConfigDir() + "downloads"
+                identityController.getConfigurationDirectory() + "downloads"
                 + System.getProperty("file.separator"));
     }
 

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

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.awt.Dialog.ModalityType;
 import java.util.Arrays;
@@ -49,7 +49,7 @@ public class PlaceholderContainer extends FrameContainer {
      * @param controller Swing controller
      */
     public PlaceholderContainer(final DCCPlugin plugin,
-            final ConfigManager config, final SwingController controller) {
+            final AggregateConfigProvider config, final SwingController controller) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;

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

@@ -29,7 +29,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.ui.WindowManager;
@@ -51,7 +51,7 @@ public class TransferContainer extends FrameContainer implements
     protected final DCCPlugin plugin;
 
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
 
     /** The Window we're using. */
     private boolean windowClosing = false;
@@ -87,13 +87,13 @@ public class TransferContainer extends FrameContainer implements
      *
      * @param plugin the DCC Plugin responsible for this window
      * @param dcc The DCCTransfer object this window wraps around
-     * @param configManager Config manager
+     * @param config Config manager
      * @param title The title of this window
      * @param targetNick Nickname of target
      * @param server The server that initiated this send
      */
     public TransferContainer(final DCCPlugin plugin, final DCCTransfer dcc,
-            final ConfigManager config, final String title,
+            final AggregateConfigProvider config, final String title,
             final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",

src/com/dmdirc/addons/dcc/kde/KFileChooser.java

@@ -23,7 +23,8 @@
 package com.dmdirc.addons.dcc.kde;
 
 import com.dmdirc.addons.dcc.DCCPlugin;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+
 import java.awt.Component;
 import java.awt.HeadlessException;
 import java.io.File;
@@ -68,14 +69,14 @@ public final class KFileChooser extends JFileChooser {
     /** The plugin that this file chooser is for. */
     private final DCCPlugin plugin;
     /** Used to read settings from. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
 
     /**
      * Constructs a FileChooser pointing to the user's default directory.
      *
      * @param plugin The plugin that owns this KFileChooser
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin) {
         super();
 
         this.plugin = plugin;
@@ -88,7 +89,7 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectory Directory to use as the base directory
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory) {
         super(currentDirectory);
 
         this.plugin = plugin;
@@ -102,7 +103,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
         super(currentDirectory, fsv);
 
         this.plugin = plugin;
@@ -115,7 +116,7 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final FileSystemView fsv) {
         super(fsv);
 
         this.plugin = plugin;
@@ -128,7 +129,7 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The plugin that owns this KFileChooser
      * @param currentDirectoryPath Directory to use as the base directory
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath) {
         super(currentDirectoryPath);
 
         this.plugin = plugin;
@@ -142,7 +143,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @param fsv The FileSystemView to use
      */
-    private KFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+    private KFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
         super(currentDirectoryPath, fsv);
 
         this.plugin = plugin;
@@ -157,7 +158,7 @@ public final class KFileChooser extends JFileChooser {
      * @return return true if getFileChooser() will return a KFileChooser not a
      *         JFileChooser
      */
-    public static boolean useKFileChooser(final ConfigManager config, final DCCPlugin plugin) {
+    public static boolean useKFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin) {
         return KDialogProcess.hasKDialog() && config.getOptionBool(plugin.getDomain(), "general.useKFileChooser");
     }
 
@@ -167,7 +168,7 @@ public final class KFileChooser extends JFileChooser {
      * @param plugin The DCC Plugin that is requesting a chooser
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin) : new JFileChooser();
     }
 
@@ -178,7 +179,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectory Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory) : new JFileChooser(currentDirectory);
     }
 
@@ -190,7 +191,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final File currentDirectory, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectory, fsv) : new JFileChooser(currentDirectory, fsv);
     }
 
@@ -201,7 +202,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, fsv) : new JFileChooser(fsv);
     }
 
@@ -212,7 +213,7 @@ public final class KFileChooser extends JFileChooser {
      * @param currentDirectoryPath Directory to use as the base directory
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath) : new JFileChooser(currentDirectoryPath);
     }
 
@@ -224,7 +225,7 @@ public final class KFileChooser extends JFileChooser {
      * @param fsv The FileSystemView to use
      * @return The relevant FileChooser
      */
-    public static JFileChooser getFileChooser(final ConfigManager config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
+    public static JFileChooser getFileChooser(final AggregateConfigProvider config, final DCCPlugin plugin, final String currentDirectoryPath, final FileSystemView fsv) {
         return useKFileChooser(config, plugin) ? new KFileChooser(config, plugin, currentDirectoryPath, fsv) : new JFileChooser(currentDirectoryPath, fsv);
     }
 

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

@@ -28,7 +28,6 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.addons.debug.DebugPlugin;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
 import java.util.List;
@@ -72,8 +71,8 @@ public class Identities extends DebugCommand {
             type = args.getArgumentsAsString();
         }
 
-        final List<Identity> identities = getPlugin().getIdentityController()
-                .getIdentitiesByType(type);
+        final List<ConfigProvider> identities = getPlugin().getIdentityController()
+                .getProvidersByType(type);
         final String[][] data = new String[identities.size()][4];
 
         int i = 0;

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -48,8 +48,7 @@ import org.apache.commons.lang.StringEscapeUtils;
 /**
  * This plugin adds freedesktop Style Notifications to dmdirc.
  */
-public final class FreeDesktopNotificationsPlugin
-        extends BaseCommandPlugin implements ConfigChangeListener {
+public class FreeDesktopNotificationsPlugin extends BaseCommandPlugin implements ConfigChangeListener {
 
     /** notification timeout. */
     private int timeout;
@@ -64,7 +63,7 @@ public final class FreeDesktopNotificationsPlugin
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** Global config. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Addon identity. */
     private final ConfigProvider identity;
     /** Plugin files helper. */
@@ -84,7 +83,7 @@ public final class FreeDesktopNotificationsPlugin
         this.pluginInfo = pluginInfo;
         this.filesHelper = new PluginFilesHelper(pluginInfo);
         config = identityController.getGlobalConfiguration();
-        identity = identityController.getGlobalAddonIdentity();
+        identity = identityController.getAddonSettings();
         registerCommand(new FDNotifyCommand(this), FDNotifyCommand.INFO);
     }
 

src/com/dmdirc/addons/identd/IdentClient.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.io.StreamUtils;
@@ -35,11 +35,10 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
 
-
 /**
  * The IdentClient responds to an ident request.
  */
-public final class IdentClient implements Runnable {
+public class IdentClient implements Runnable {
 
     /** The IdentdServer that owns this Client. */
     private final IdentdServer myServer;
@@ -115,7 +114,7 @@ public final class IdentClient implements Runnable {
      * @param config The config manager to use for settings
      * @return the ident response for the given line
      */
-    protected String getIdentResponse(final String input, final ConfigManager config) {
+    protected String getIdentResponse(final String input, final AggregateConfigProvider config) {
         final String unescapedInput = unescapeString(input);
         final String[] bits = unescapedInput.replaceAll("\\s+", "").split(",", 2);
         if (bits.length < 2) {

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -33,10 +32,11 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.plugins.implementations.BasePlugin;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.util.validators.PortValidator;
 
 import java.util.ArrayList;
@@ -61,7 +61,7 @@ public class IdentdPlugin extends BasePlugin implements ActionListener {
     private final ServerManager serverManager;
     /** Global config. */
     @Getter
-    private ConfigManager config;
+    private AggregateConfigProvider config;
 
     /**
      * Creates a new instance of this plugin.

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -27,20 +27,20 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.util.collections.RollingList;
 
 import java.util.Date;
@@ -57,10 +57,9 @@ public final class LagDisplayPlugin extends BasePlugin implements
     /** The panel we use in the status bar. */
     private final LagDisplayPanel panel;
     /** A cache of ping times. */
-    private final Map<Server, String> pings = new WeakHashMap<Server, String>();
+    private final Map<Server, String> pings = new WeakHashMap<>();
     /** Ping history. */
-    private final Map<Server, RollingList<Long>> history
-            = new HashMap<Server, RollingList<Long>>();
+    private final Map<Server, RollingList<Long>> history = new HashMap<>();
     /** Parent Swing UI. */
     private final SwingController controller;
     /** Whether or not to show a graph in the info popup. */
@@ -72,7 +71,7 @@ public final class LagDisplayPlugin extends BasePlugin implements
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
     /** Global config. */
-    private ConfigManager config;
+    private AggregateConfigProvider config;
 
     /**
      * Creates a new LagDisplayPlugin.

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

@@ -22,14 +22,11 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -38,6 +35,8 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -50,6 +49,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
 
 import java.awt.Color;
@@ -90,7 +90,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     /** The action controller to use. */
     private final ActionController actionController;
     /** Global config. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Addon identity. */
     private final ConfigProvider identity;
     /** Parent Identity Manager. */
@@ -124,7 +124,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
         config = identityController.getGlobalConfiguration();
-        identity = identityController.getGlobalAddonIdentity();
+        identity = identityController.getAddonSettings();
 
         registerCommand(new LoggingCommand(this), LoggingCommand.INFO);
     }
@@ -133,7 +133,7 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     @Override
     public void domainUpdated() {
         identity.setOption(getDomain(), "general.directory",
-                identityController.getConfigDir() + "logs" + System.getProperty("file.separator"));
+                identityController.getConfigurationDirectory() + "logs" + System.getProperty("file.separator"));
     }
 
     /**

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

@@ -81,7 +81,7 @@ public class NickColourPanel extends JPanel implements ActionListener,
         super();
 
         this.plugin = plugin;
-        this.configIdentity = controller.getIdentityManager().getGlobalConfigIdentity();
+        this.configIdentity = controller.getIdentityManager().getUserSettings();
 
         final Object[][] data = plugin.getData();
 

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

@@ -28,21 +28,21 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.implementations.BasePlugin;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
@@ -58,8 +58,7 @@ import lombok.RequiredArgsConstructor;
  * Provides various features related to nickname colouring.
  */
 @RequiredArgsConstructor
-public final class NickColourPlugin extends BasePlugin implements ActionListener,
-        ConfigChangeListener {
+public class NickColourPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
 
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = new String[]{
@@ -308,7 +307,7 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
      * Updates cached settings.
      */
     private void setCachedSettings() {
-        final ConfigManager config = identityController.getGlobalConfiguration();
+        final AggregateConfigProvider config = identityController.getGlobalConfiguration();
         useowncolour = config.getOptionBool(getDomain(), "useowncolour");
         owncolour = config.getOption(getDomain(), "owncolour");
         userandomcolour = config.getOptionBool(getDomain(), "userandomcolour");

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -228,7 +228,7 @@ public class NotificationsPlugin extends BaseCommandPlugin implements ActionList
      */
     protected void saveSettings(final List<String> newOrder) {
         order = newOrder;
-        identityController.getGlobalConfigIdentity()
+        identityController.getUserSettings()
                 .setOption(getDomain(), "methodOrder", order);
     }
 }

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -207,7 +207,7 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
     @Override
     public void save() {
         plugin.saveSettings(getSources());
-        identityController.getGlobalConfigIdentity()
+        identityController.getUserSettings()
                 .setOption(plugin.getDomain(), "format", textfield.getText());
     }
 

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -135,7 +135,7 @@ public class NowPlayingPlugin extends BaseCommandPlugin implements ActionListene
      */
     protected void saveSettings(final List<String> newOrder) {
         order = newOrder;
-        identityController.getGlobalConfigIdentity().setOption(getDomain(), "sourceOrder", order);
+        identityController.getUserSettings().setOption(getDomain(), "sourceOrder", order);
     }
 
     /** Loads the plugins settings. */

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -173,9 +173,9 @@ public final class OsdPlugin extends BaseCommandPlugin implements
     /** {@inheritDoc} */
     @Override
     public void save() {
-        identityController.getGlobalConfigIdentity()
+        identityController.getUserSettings()
                 .setOption(getDomain(), "locationX", x);
-        identityController.getGlobalConfigIdentity()
+        identityController.getUserSettings()
                 .setOption(getDomain(), "locationY", y);
     }
 

src/com/dmdirc/addons/relaybot/RelayChannelPanel.java

@@ -185,13 +185,13 @@ public class RelayChannelPanel extends JPanel implements ActionListener,
     public void save() {
         // Remove all old config entries
         for (String[] parts : plugin.getData()) {
-           identityController.getGlobalConfigIdentity()
+           identityController.getUserSettings()
                    .unsetOption(plugin.getDomain(), parts[0]);
         }
 
         // And write the new ones
         for (String[] row : getData()) {
-            identityController.getGlobalConfigIdentity()
+            identityController.getUserSettings()
                     .setOption(plugin.getDomain(), row[0], row[1]);
         }
     }

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

@@ -73,7 +73,7 @@ public final class ScriptPlugin extends BaseCommandPlugin implements ActionListe
             final IdentityController identityController,
             final CommandController commandController) {
         super(commandController);
-        scriptDir = identityController.getConfigDir() + "scripts/";
+        scriptDir = identityController.getConfigurationDirectory() + "scripts/";
         this.actionController = actionController;
 
         // Add the JS Helper to the scriptFactory

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

@@ -109,7 +109,7 @@ public class Profiles extends JPanel implements ServerListListener {
 
             ConfigProvider selectedItem = null;
             comboModel.addElement(null);
-            for (ConfigProvider profile : controller.getIdentityManager().getIdentitiesByType("profile")) {
+            for (ConfigProvider profile : controller.getIdentityManager().getProvidersByType("profile")) {
                 comboModel.addElement(profile);
                 if (item != null && profile.getName().equals(
                         item.getProfile())) {

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

@@ -110,7 +110,7 @@ public abstract class ServerGroupItemBase implements ServerGroupItem {
      */
     protected ConfigProvider getProfileIdentity() {
         if (profile != null) {
-            for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
+            for (ConfigProvider identity : identityController.getProvidersByType("profile")) {
                 if (profile.equals(identity.getName())) {
                     return identity;
                 }
@@ -118,7 +118,7 @@ public abstract class ServerGroupItemBase implements ServerGroupItem {
         }
 
         if (getParent() == null) {
-            return identityController.getIdentitiesByType("profile").get(0);
+            return identityController.getProvidersByType("profile").get(0);
         } else {
             return getParent().getProfileIdentity();
         }

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

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

src/com/dmdirc/addons/swingdebug/SystemStreamContainer.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.swingdebug;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -49,7 +49,7 @@ public class SystemStreamContainer extends FrameContainer {
      * @param plugin Parent plugin
      */
     public SystemStreamContainer(final SystemStreamType stream,
-            final ConfigManager config,
+            final AggregateConfigProvider config,
             final SwingDebugPlugin plugin) {
         super("dmdirc", stream.toString(), stream.toString(), config,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));

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

@@ -26,9 +26,9 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.commandparser.commands.global.NewServer;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -53,12 +53,13 @@ import javax.swing.UIManager;
 /**
  * Integrate DMDirc with OS X better.
  */
-public final class Apple implements InvocationHandler, ActionListener {
+public class Apple implements InvocationHandler, ActionListener {
+
     /** Store any addresses that are opened before CLIENT_OPENED. */
     private final List<URI> addresses = new ArrayList<>();
 
     /** Config manager used to read settings. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /** The "Application" object used to do stuff on OS X. */
     private Object application;
@@ -89,7 +90,7 @@ public final class Apple implements InvocationHandler, ActionListener {
      *
      * @param configManager Config manager
      */
-    public Apple(final ConfigManager configManager, final SwingController controller) {
+    public Apple(final AggregateConfigProvider configManager, final SwingController controller) {
         this.configManager = configManager;
         this.controller = controller;
         if (isApple()) {

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

@@ -48,7 +48,6 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -56,6 +55,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -132,7 +132,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final PluginInfo pluginInfo;
     /** Global config manager. */
     @Getter
-    private final ConfigManager globalConfig;
+    private final AggregateConfigProvider globalConfig;
     /** Server manager. */
     @Getter
     private final ServerManager serverManager;
@@ -219,8 +219,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.themeManager = themeManager;
 
         globalConfig = identityManager.getGlobalConfiguration();
-        globalIdentity = identityManager.getGlobalConfigIdentity();
-        addonIdentity = identityManager.getGlobalAddonIdentity();
+        globalIdentity = identityManager.getUserSettings();
+        addonIdentity = identityManager.getAddonSettings();
         apple = new Apple(getGlobalConfig(), this);
         iconManager = new IconManager(globalConfig, urlBuilder);
         prefsComponentFactory = new PrefsComponentFactory(this);

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 
 import java.awt.event.ActionEvent;
@@ -57,7 +57,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
     /** Main frame component bieng shown in. */
     private final MainFrame mainFrame;
     /** Config manager to get settings from. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Option domain. */
     private final String configDomain;
     /** Are we meant to be visible? */

src/com/dmdirc/addons/ui_swing/components/NickList.java

@@ -28,9 +28,9 @@ import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.components.renderers.NicklistRenderer;
 import com.dmdirc.addons.ui_swing.textpane.ClickType;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.NicklistListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.awt.Dimension;
@@ -62,7 +62,7 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
     /** Parent frame. */
     private final ChannelFrame frame;
     /** Config. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Nick list model. */
     private final NicklistListModel nicklistModel;
 
@@ -72,7 +72,7 @@ public class NickList extends JScrollPane implements ConfigChangeListener,
      * @param frame Frame
      * @param config Config
      */
-    public NickList(final ChannelFrame frame, final ConfigManager config) {
+    public NickList(final ChannelFrame frame, final AggregateConfigProvider config) {
         super();
         this.frame = frame;
         this.config = config;

src/com/dmdirc/addons/ui_swing/components/NicklistListModel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
@@ -46,7 +46,7 @@ public final class NicklistListModel extends AbstractListModel implements
     /** stores the nicknames to be shown in this list. */
     private final List<ChannelClientInfo> nicknames;
     /** Config manager. */
-    private ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Sort by mode? */
     private boolean sortByMode;
     /** Sort by case? */
@@ -57,7 +57,7 @@ public final class NicklistListModel extends AbstractListModel implements
      *
      * @param config Config manager
      */
-    public NicklistListModel(final ConfigManager config) {
+    public NicklistListModel(final AggregateConfigProvider config) {
         this(config, Collections.synchronizedList(
                 new ArrayList<ChannelClientInfo>()));
     }
@@ -68,7 +68,7 @@ public final class NicklistListModel extends AbstractListModel implements
      * @param config Config manager
      * @param newNicknames list of nicknames used for initialisation
      */
-    public NicklistListModel(final ConfigManager config,
+    public NicklistListModel(final AggregateConfigProvider config,
             final List<ChannelClientInfo> newNicknames) {
         super();
 

src/com/dmdirc/addons/ui_swing/components/SplitPane.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 
 import java.awt.Component;
@@ -45,7 +45,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
     /** use one touch expandable? */
     private boolean useOneTouchExpandable;
     /** Global config manager. */
-    private ConfigManager config;
+    private AggregateConfigProvider config;
 
     /** Orientation type . */
     public enum Orientation {
@@ -61,7 +61,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      *
      * @param manager Config manager to read values from
      */
-    public SplitPane(final ConfigManager manager) {
+    public SplitPane(final AggregateConfigProvider manager) {
         this(manager, Orientation.HORIZONTAL, null, null);
     }
 
@@ -72,7 +72,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      * @param manager Config manager to read values from
      * @param orientation Split pane orientation
      */
-    public SplitPane(final ConfigManager manager, final Orientation orientation) {
+    public SplitPane(final AggregateConfigProvider manager, final Orientation orientation) {
         this(manager, orientation, null, null);
     }
 
@@ -87,7 +87,7 @@ public class SplitPane extends JSplitPane implements ConfigChangeListener {
      * @param leftComponent left component
      * @param rightComponent right component
      */
-    public SplitPane(final ConfigManager manager, final Orientation orientation,
+    public SplitPane(final AggregateConfigProvider manager, final Orientation orientation,
             final Component leftComponent, final Component rightComponent) {
         super((orientation.equals(Orientation.HORIZONTAL))
                 ? HORIZONTAL_SPLIT : VERTICAL_SPLIT,

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfo.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
@@ -95,7 +95,7 @@ public class AddonInfo {
      *
      * @param entry List of entries
      */
-    public AddonInfo(final ConfigManager configManager,
+    public AddonInfo(final AggregateConfigProvider configManager,
             final Map<String, String> entry) {
         id = Integer.parseInt(entry.get("id"));
         title = entry.get("title");

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -107,7 +107,7 @@ public class DataLoaderWorker
             loadingPanel.add(Box.createVerticalGlue(), "growy, pushy");
             try {
                 Downloader.downloadPage("http://addons.dmdirc.com/feed",
-                        controller.getIdentityManager().getConfigDir() + File.separator + "addons.feed",
+                        controller.getIdentityManager().getConfigurationDirectory() + File.separator + "addons.feed",
                         this);
             } catch (final IOException ex) {
                 loadingPanel.removeAll();
@@ -118,7 +118,7 @@ public class DataLoaderWorker
 
         loadingPanel.removeAll();
         loadingPanel.add(new TextLabel("Loading addon info, please wait."));
-        final ConfigFile data = new ConfigFile(controller.getIdentityManager().getConfigDir()
+        final ConfigFile data = new ConfigFile(controller.getIdentityManager().getConfigurationDirectory()
                 + File.separator + "addons.feed");
         try {
             data.read();

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -56,7 +56,7 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
     @Override
     protected String doInBackground() {
         try {
-            final File file = new File(controller.getIdentityManager().getConfigDir(),
+            final File file = new File(controller.getIdentityManager().getConfigurationDirectory(),
                     "." + info.getId());
             Downloader.downloadPage("http://addons.dmdirc.com/addondownload/"
                     + info.getDownload(), file.getAbsolutePath());

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

@@ -34,7 +34,7 @@ import com.dmdirc.addons.ui_swing.components.TypingLabel;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialog;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -95,7 +95,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         this.controller = controller;
         initComponents();
 
-        final ConfigManager config = owner.getConfigManager();
+        final AggregateConfigProvider config = owner.getConfigManager();
 
         if (!UIUtilities.isGTKUI()) {
             //GTK users appear to dislike choice, ignore them if they want some.

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

@@ -51,9 +51,9 @@ import com.dmdirc.commandparser.PopupMenuItem;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameCloseListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -118,7 +118,7 @@ public abstract class TextFrame extends JPanel implements Window,
         this.controller = controller;
         frameParent = owner;
 
-        final ConfigManager config = owner.getConfigManager();
+        final AggregateConfigProvider config = owner.getConfigManager();
 
         owner.addCloseListener(this);
         owner.setTitle(frameParent.getTitle());

src/com/dmdirc/addons/ui_swing/components/renderers/NicklistRenderer.java

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
 import com.dmdirc.ui.Colour;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.util.Map;
@@ -47,7 +47,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
      */
     private static final long serialVersionUID = 5;
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Nicklist alternate background colour. */
     private Color altBackgroundColour;
     /** Show nick colours. */
@@ -61,7 +61,7 @@ public final class NicklistRenderer extends DefaultListCellRenderer implements
      * @param config ConfigManager for the associated channel
      * @param nicklist The nicklist that we're rendering for.
      */
-    public NicklistRenderer(final ConfigManager config, final JList nicklist) {
+    public NicklistRenderer(final AggregateConfigProvider config, final JList nicklist) {
         super();
 
         this.config = config;

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.ui.IconManager;
@@ -160,7 +160,7 @@ public class DialogManager {
         injector.addParameter(SwingController.class, controller);
         injector.addParameter(IconManager.class, controller.getIconManager());
         injector.addParameter(IdentityController.class, controller.getIdentityManager());
-        injector.addParameter(ConfigManager.class, controller.getGlobalConfig());
+        injector.addParameter(AggregateConfigProvider.class, controller.getGlobalConfig());
         injector.addParameter(MainFrame.class, controller.getMainFrame());
         injector.addParameter(Window.class, controller.getMainFrame());
         injector.addParameter(SwingStatusBar.class, controller.getSwingStatusBar());

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

@@ -208,7 +208,7 @@ public final class FeedbackDialog extends StandardDialog implements
             dmdircInfo.append("DMDirc version: ").append(
                     Info.getDMDircVersion()).append("\n");
             dmdircInfo.append("Profile directory: ").append(
-                    controller.getIdentityManager().getConfigDir()).append("\n");
+                    controller.getIdentityManager().getConfigurationDirectory()).append("\n");
             dmdircInfo.append("Java version: ").append(
                     Info.getJavaVersion()).append("\n");
             dmdircInfo.append("OS Version: ").append(

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableChangeEvent;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxSelectionListener;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
-import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderListener;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -187,8 +186,8 @@ public final class NewServerDialog extends StandardDialog implements
 
     /** Populates the profiles list. */
     public void populateProfiles() {
-        final List<Identity> profiles = getController().getIdentityManager()
-                .getIdentitiesByType("profile");
+        final List<ConfigProvider> profiles = getController().getIdentityManager()
+                .getProvidersByType("profile");
         ((DefaultComboBoxModel) identityField.getModel()).removeAllElements();
         for (ConfigProvider profile : profiles) {
             ((DefaultComboBoxModel) identityField.getModel()).addElement(profile);

src/com/dmdirc/addons/ui_swing/dialogs/about/InfoPanel.java

@@ -79,7 +79,7 @@ public final class InfoPanel extends JPanel {
                  + "<b>Swing UI version: </b>" + controller.getVersion()
                  .toString() + "<br>"
                  + "<b>OS Version: </b>" + Info.getOSVersion() + "<br>"
-                 + "<b>Profile directory: </b>" + controller.getIdentityManager().getConfigDir() + "<br>"
+                 + "<b>Profile directory: </b>" + controller.getIdentityManager().getConfigurationDirectory() + "<br>"
                  + "<b>Java version: </b>" + Info.getJavaVersion() + "<br>"
                  + "<b>Look and Feel: </b>" + SwingController.getLookAndFeel()
                  + "<br>"

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 
 import java.awt.Font;
@@ -51,13 +51,12 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Licences panel.
  */
-public final class LicencesPanel extends JPanel implements
-        TreeSelectionListener {
+public class LicencesPanel extends JPanel implements TreeSelectionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Licence scroll pane. */
     private JScrollPane scrollPane;
     /** Licence list model */

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
     /** Config Manager. */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
     /** Data list. */
     private List<URI> uris;
     /** Handlers list. */
@@ -51,7 +51,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
      *
      * @param configManager Config manager
      */
-    public URLHandlerTableModel(final ConfigManager configManager) {
+    public URLHandlerTableModel(final AggregateConfigProvider configManager) {
         this(configManager, new ArrayList<URI>(), new ArrayList<String>());
     }
 
@@ -62,7 +62,7 @@ public class URLHandlerTableModel extends AbstractTableModel {
      * @param uris URIs to show
      * @param handlers Handlers to show
      */
-    public URLHandlerTableModel(final ConfigManager configManager,
+    public URLHandlerTableModel(final AggregateConfigProvider configManager,
             final List<URI> uris, final List<String> handlers) {
         super();
 

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
@@ -109,7 +109,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * Initialises the components.
      */
     private void initComponents() {
-        final ConfigManager config = controller.getGlobalConfig();
+        final AggregateConfigProvider config = controller.getGlobalConfig();
         enable = new JCheckBox();
         scrollPane = new JScrollPane();
         tableModel = new UpdateTableModel(UpdateChecker.getManager().getComponents());

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
-import com.dmdirc.config.Identity;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.validators.FileNameValidator;
@@ -57,8 +56,7 @@ public class ProfileManagerModel extends DefaultBindableModel {
      * @param identityController Identity manager to retrieve profiles from
      */
     public ProfileManagerModel(final IdentityController identityController) {
-        final List<Identity> identities = identityController
-                .getIdentitiesByType("profile");
+        final List<ConfigProvider> identities = identityController.getProvidersByType("profile");
         for (ConfigProvider identity : identities) {
             profiles.add(new Profile(identity));
         }

src/com/dmdirc/addons/ui_swing/framemanager/tree/Tree.java

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 
 import java.awt.Rectangle;
@@ -65,7 +65,7 @@ public class Tree extends JTree implements MouseMotionListener,
     /** UI Controller. */
     private final SwingController controller;
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Drag selection enabled? */
     private boolean dragSelect;
     /** Drag button 1? */

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -28,10 +28,10 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
@@ -76,11 +76,11 @@ public final class TreeFrameManager implements FrameManager,
     /** Tree scroller. */
     private TreeScroller scroller;
     /** Configuration manager. */
-    private ConfigManager config;
+    private AggregateConfigProvider config;
 
     /** creates a new instance of the TreeFrameManager. */
     public TreeFrameManager() {
-        nodes = new HashMap<FrameContainer, TreeViewNode>();
+        nodes = new HashMap<>();
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewTreeCellRenderer.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -46,7 +46,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
     /** Parent frame manager. */
     private final TreeFrameManager manager;
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Styliser to use. */
     private final Styliser styliser;
     /** Rollover colours. */
@@ -63,7 +63,7 @@ public class TreeViewTreeCellRenderer implements TreeCellRenderer,
      *
      * @param manager Parent TreeFrameManager
      */
-    public TreeViewTreeCellRenderer(final ConfigManager config,
+    public TreeViewTreeCellRenderer(final AggregateConfigProvider config,
             final TreeFrameManager manager) {
         this.manager = manager;
 

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuScroller.java

@@ -23,20 +23,20 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 
-import darrylbu.util.MenuScroller;
-
 import javax.swing.JMenu;
 
+import darrylbu.util.MenuScroller;
+
 /**
  * Window menu scroller.
  */
 public class WindowMenuScroller implements ConfigChangeListener {
 
     /** Config manager. */
-    private final ConfigManager config;
+    private final AggregateConfigProvider config;
     /** Config domain. */
     private final String configDomain;
     /** Menu to scroll. */
@@ -54,7 +54,7 @@ public class WindowMenuScroller implements ConfigChangeListener {
      * @param configDomain Domain to check config settings in
      * @param fixedCount Number of fixed items in the menu
      */
-    public WindowMenuScroller(final JMenu menu, final ConfigManager config,
+    public WindowMenuScroller(final JMenu menu, final AggregateConfigProvider config,
             final String configDomain, final int fixedCount) {
         this.menu = menu;
         this.config = config;

src/com/dmdirc/addons/ui_swing/textpane/BackgroundPainter.java

@@ -26,7 +26,7 @@ import com.dmdirc.addons.ui_swing.BackgroundOption;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.config.ConfigBinding;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Graphics;
@@ -79,7 +79,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
     /**
      * Config manager to bind to and retrieve settings from.
      */
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     /**
      * Background image.
@@ -99,7 +99,7 @@ public class BackgroundPainter extends LayerUI<JComponent> {
      * @param imageKey Key for background image
      * @param optionKey Key for background type
      */
-    public BackgroundPainter(final ConfigManager configManager,
+    public BackgroundPainter(final AggregateConfigProvider configManager,
             final String domain, final String imageKey,
             final String optionKey) {
         this.configManager = configManager;

src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCTextAttribute;
@@ -91,7 +91,7 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
     /** Last visible line (from the top). */
     private int lastVisibleLine;
     /** Config Manager. */
-    private final ConfigManager manager;
+    private final AggregateConfigProvider manager;
     /** Quick copy? */
     private boolean quickCopy;
     /** Mouse click listeners. */

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -146,7 +146,7 @@ public final class SwingFirstRunWizard implements WizardListener,
         for (Entry<String, byte[]> resource : resources.entrySet()) {
             try {
                 final String resourceName =
-                        controller.getIdentityManager().getConfigDir() + "actions" +
+                        controller.getIdentityManager().getConfigurationDirectory() + "actions" +
                         resource.getKey().
                         substring(27, resource.getKey().length());
                 final File newDir =

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

@@ -341,7 +341,7 @@ public class DynamicRequestHandler extends AbstractHandler {
 
         profileEvents.add(new Event("clearprofiles", null));
 
-        for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
+        for (ConfigProvider identity : identityController.getProvidersByType("profile")) {
             profileEvents.add(new Event("addprofile", identity.getName()));
         }
 
@@ -391,7 +391,7 @@ public class DynamicRequestHandler extends AbstractHandler {
     }
 
     private ConfigProvider findProfile(final String parameter) {
-        for (ConfigProvider identity : identityController.getIdentitiesByType("profile")) {
+        for (ConfigProvider identity : identityController.getProvidersByType("profile")) {
             if (identity.getName().equals(parameter)) {
                 return identity;
             }

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

@@ -78,7 +78,7 @@ public class WebUserRealm implements UserRealm {
         if (!identityController.getGlobalConfiguration().hasOptionString(domain, "users")) {
             final List<String> users = new ArrayList<>();
             users.add(username + ":" + getHash(username, credentials));
-            identityController.getGlobalConfigIdentity().setOption(domain, "users", users);
+            identityController.getUserSettings().setOption(domain, "users", users);
         }
 
         for (String userinfo : identityController.getGlobalConfiguration().getOptionList(domain, "users")) {

test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerModelTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
 import com.dmdirc.config.Identity;
+import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import java.util.ArrayList;
@@ -69,9 +70,9 @@ public class ProfileManagerModelTest {
     @BeforeClass
     @SuppressWarnings("unchecked")
     public static void setUpClass() throws Exception {
-        final List<Identity> identities = Collections.emptyList();
+        final List<ConfigProvider> identities = Collections.emptyList();
         manager = mock(IdentityController.class);
-        when(manager.getIdentitiesByType("profile")).thenReturn(identities);
+        when(manager.getProvidersByType("profile")).thenReturn(identities);
     }
 
     /**
@@ -87,10 +88,10 @@ public class ProfileManagerModelTest {
         when(identity.getOptionList("profile", "nicknames")).thenReturn(nicknames);
         when(identity.getOption("profile", "realname")).thenReturn("realname");
         when(identity.getOption("profile", "ident")).thenReturn("ident");
-        final List<Identity> identities = new ArrayList<>();
+        final List<ConfigProvider> identities = new ArrayList<>();
         identities.add(identity);
         final IdentityController im = mock(IdentityController.class);
-        when(im.getIdentitiesByType("profile")).thenReturn(identities);
+        when(im.getProvidersByType("profile")).thenReturn(identities);
 
         ProfileManagerModel instance = new ProfileManagerModel(im);