Support for core config provider changes

awaycolours/src/main/java/com/dmdirc/addons/awaycolours/AwayColoursManager.java

@@ -24,7 +24,7 @@ import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.colours.Colour;

awaycolours/src/test/java/com/dmdirc/addons/awaycolours/AwayColoursManagerTest.java

@@ -24,7 +24,7 @@ import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.colours.Colour;
 

channelwho/src/main/java/com/dmdirc/addons/channelwho/ConnectionHandler.java

@@ -26,7 +26,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.HashMultimap;

channelwho/src/main/java/com/dmdirc/addons/channelwho/ConnectionHandlerFactory.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.channelwho;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
 import java.util.concurrent.ScheduledExecutorService;

channelwho/src/test/java/com/dmdirc/addons/channelwho/ConnectionHandlerTest.java

@@ -29,7 +29,7 @@ import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.collect.Lists;
 

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;

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

@@ -21,7 +21,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 /**
  * DCC CommandParser.

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

@@ -20,7 +20,7 @@ package com.dmdirc.addons.dcc;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.util.Collection;

dcc/src/main/java/com/dmdirc/addons/dcc/DCCManager.java

@@ -48,8 +48,8 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginDomain;

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

@@ -22,7 +22,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 

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

@@ -26,7 +26,7 @@ import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.messages.BackBufferFactory;

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

@@ -18,7 +18,7 @@
 package com.dmdirc.addons.dcc.kde;
 
 import com.dmdirc.addons.dcc.DCCManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.awt.Component;
 import java.awt.HeadlessException;

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

@@ -22,7 +22,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;

debug/src/main/java/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -30,7 +30,7 @@ import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.IRCControlCodes;

debug/src/main/java/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -24,7 +24,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.messages.IRCControlCodes;
 import com.dmdirc.updater.UpdateChecker;

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

@@ -23,8 +23,8 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;

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

@@ -22,7 +22,7 @@ import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import java.util.Collection;

debug/src/main/java/com/dmdirc/addons/debug/commands/StatusbarMessage.java

@@ -25,7 +25,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 import javax.annotation.Nonnull;
 import javax.inject.Inject;

freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDManager.java

@@ -25,9 +25,9 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.PluginFilesHelper;

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

@@ -17,21 +17,19 @@
 
 package com.dmdirc.addons.identd;
 
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ReadOnlyConfigProvider;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.LogUtils;
-import com.dmdirc.util.system.SystemInfo;
 import com.dmdirc.util.io.StreamUtils;
-
+import com.dmdirc.util.system.SystemInfo;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

identd/src/main/java/com/dmdirc/addons/identd/IdentdManager.java

@@ -29,7 +29,7 @@ import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.validators.PortValidator;

identd/src/main/java/com/dmdirc/addons/identd/IdentdServer.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.identd;
 
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.system.SystemInfo;
 import java.io.IOException;

identd/src/test/java/com/dmdirc/addons/identd/IdentClientTest.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.identd;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCClientInfo;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.util.system.SystemInfo;

jpq/src/test/java/com/dmdirc/addons/jpq/GroupChatHandlerTest.java

@@ -25,7 +25,7 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;

jpq/src/test/java/com/dmdirc/addons/jpq/JPQManagerTest.java

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.collect.Lists;
 

lagdisplay/src/main/java/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -41,8 +41,8 @@ import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.collections.RollingList;

logging/src/main/java/com/dmdirc/addons/logging/LogFileLocator.java

@@ -23,7 +23,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import java.io.File;
 import java.math.BigInteger;

logging/src/main/java/com/dmdirc/addons/logging/LoggingManager.java

@@ -48,8 +48,8 @@ import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;

logging/src/main/java/com/dmdirc/addons/logging/LoggingModule.java

@@ -22,8 +22,8 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.UserConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import dagger.Module;

logging/src/test/java/com/dmdirc/addons/logging/HistoryWindowTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.BackBufferImpl;
 import java.nio.file.Paths;

nickcolours/src/main/java/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -37,7 +37,7 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.StringConverter;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;

notifications/src/main/java/com/dmdirc/addons/notifications/NotificationConfig.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.notifications;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ListReorderButtonPanel;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 import java.util.LinkedList;
 import java.util.List;

notifications/src/main/java/com/dmdirc/addons/notifications/NotificationsManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;

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

@@ -22,8 +22,8 @@ import com.dmdirc.addons.ui_swing.components.reorderablelist.ListReorderButtonPa
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;

nowplaying/src/main/java/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleterUtils;

nowplaying/src/main/java/com/dmdirc/addons/nowplaying/NowPlayingManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;

qauth/src/main/java/com/dmdirc/addons/qauth/QAuthManager.java

@@ -33,7 +33,7 @@ import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.events.UserInfoEvent;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;

qauth/src/test/java/com/dmdirc/addons/qauth/QAuthManagerTest.java

@@ -31,8 +31,8 @@ import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.User;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.parser.events.UserInfoEvent;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginMetaData;

scriptplugin/src/main/java/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 

systray/src/main/java/com/dmdirc/addons/systray/SystrayManager.java

@@ -29,7 +29,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.messages.StyledMessageUtils;

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

@@ -22,7 +22,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 import java.awt.Image;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -37,8 +37,8 @@ import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/QuitWorker.java

@@ -20,8 +20,8 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.events.ClientClosingEvent;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import javax.inject.Inject;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/SwingPreferencesModel.java

@@ -21,8 +21,8 @@ import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.validators.NumericalValidator;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/SwingUIInitialiser.java

@@ -20,8 +20,8 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.config.AddonConfig;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.util.LogUtils;
 import java.awt.Font;
 import java.awt.KeyboardFocusManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/IconManager.java

@@ -18,8 +18,8 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.util.URLBuilder;
 import java.awt.Image;
 import java.awt.Toolkit;

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

@@ -25,8 +25,8 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

@@ -31,7 +31,7 @@ import com.dmdirc.events.NickListClientsChangedEvent;
 import com.dmdirc.events.NickListUpdatedEvent;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -18,8 +18,8 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.binding.ConfigBinding;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.awt.Component;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -23,8 +23,8 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.SearchBar;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Document;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -30,8 +30,8 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java

@@ -23,7 +23,7 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/URLProtocolPanel.java

@@ -18,8 +18,8 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.addons.ui_swing.dialogs.url.URLSubstitutionsPanel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.event.ActionEvent;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.UpdateManager;

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

@@ -20,7 +20,7 @@ package com.dmdirc.addons.ui_swing.components.addonbrowser;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ConfigFile;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorkerFactory.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.ui_swing.components.addonbrowser;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.Downloader;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.Theme;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -24,7 +24,7 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.UserConfig;
 import com.dmdirc.events.PluginRefreshEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -23,7 +23,7 @@ import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactor
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.UserConfig;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;

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

@@ -34,8 +34,8 @@ import com.dmdirc.events.ClientClosingEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -54,7 +54,7 @@ import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -22,7 +22,7 @@ import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -18,7 +18,7 @@
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -18,7 +18,7 @@
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/inputfields/ValidatingTextFieldInputField.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/modes/ModesPane.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 
 import java.awt.Insets;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/modes/ParamModePanel.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.components.modes;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.util.validators.RegexStringValidator;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/performpanel/PerformPanel.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.ui_swing.components.performpanel;
 import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.commandparser.auto.AutoCommand;
 import com.dmdirc.commandparser.auto.AutoCommandManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

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

@@ -22,7 +22,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.binding.ConfigBinding;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.awt.Color;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -24,7 +24,7 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.StatusBarMessageClearEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.StatusMessage;
 import java.awt.Window;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -20,7 +20,7 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.ui.core.util.URLHandler;
 import java.awt.Window;

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

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.dialogs.about;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.ui.core.about.Licence;
 import com.dmdirc.ui.core.about.LicensedComponent;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -22,9 +22,9 @@ import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.renderers.ListModeCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.interfaces.GroupChat;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.util.validators.NotEmptyValidator;
 

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

@@ -28,7 +28,7 @@ import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -28,7 +28,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -25,7 +25,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.input.TabCompleterUtils;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

@@ -22,7 +22,7 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
 import com.dmdirc.ui.messages.ColourManagerFactory;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -27,8 +27,8 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.validators.URLProtocolValidator;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -22,9 +22,9 @@ import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.UserConfig;
 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.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/serversetting/PerformTab.java

@@ -23,7 +23,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.PerformRenderer;
 import com.dmdirc.commandparser.auto.AutoCommand;
 import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -27,8 +27,8 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -20,8 +20,8 @@ package com.dmdirc.addons.ui_swing.dialogs.url;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
 
 import java.awt.Window;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/url/URLDialogFactory.java

@@ -20,8 +20,8 @@ package com.dmdirc.addons.ui_swing.dialogs.url;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.UserConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
 import java.awt.Window;
 import java.net.URI;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -32,7 +32,7 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.LogUtils;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;

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

@@ -24,7 +24,7 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.config.binding.ConfigBinding;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;

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

@@ -35,8 +35,8 @@ import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/TreeViewModel.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.addons.ui_swing.WindowComparator;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.MutableTreeNode;

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

@@ -18,8 +18,8 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.IRCControlCodes;
 import com.dmdirc.ui.messages.Styliser;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -42,7 +42,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.interfaces.ui.AliasDialogModel;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -52,8 +52,8 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.ServiceLocator;

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

@@ -20,7 +20,7 @@ package com.dmdirc.addons.ui_swing.textpane;
 import com.dmdirc.addons.ui_swing.BackgroundOption;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.binding.ConfigBinding;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Graphics;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -19,13 +19,12 @@ package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.Document;
 import com.dmdirc.ui.messages.DocumentListener;
 import com.dmdirc.ui.messages.LinePosition;
 import com.dmdirc.ui.messages.StyledMessageUtils;
-import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.StringUtils;
 import com.dmdirc.util.URLBuilder;
 import java.awt.Adjustable;

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

@@ -19,8 +19,8 @@ package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.textpane.LineRenderer.RenderResult;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.ui.messages.CachingDocument;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 import com.dmdirc.ui.messages.LinePosition;

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

@@ -24,7 +24,7 @@ import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.config.UserConfig;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.ui.FirstRunWizard;
 import com.dmdirc.plugins.CorePluginExtractor;
 import java.awt.Dialog.ModalityType;

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/WebUiModule.java

@@ -19,7 +19,7 @@ package com.dmdirc.addons.ui_web2;
 
 import com.dmdirc.ClientModule;
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import dagger.Module;

whoisonquery/src/main/java/com/dmdirc/addons/whoisonquery/WhoisOnQueryManager.java

@@ -25,8 +25,8 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 

whoisonquery/src/test/java/com/dmdirc/addons/whoisonquery/WhoisOnQueryManagerTest.java

@@ -28,8 +28,8 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginMetaData;
 

windowflashing/src/main/java/com/dmdirc/addons/windowflashing/WindowFlashingManager.java

@@ -29,7 +29,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.sun.jna.Native;