Add bundle for config providers.

api/build.gradle

@@ -46,6 +46,7 @@ dependencies {
     compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
     compile group: 'com.google.guava', name:'guava', version: '19.0'
     compile group: 'com.dmdirc', name: 'com.dmdirc.config.binding', version: '+', changing: true
+    compile group: 'com.dmdirc', name: 'com.dmdirc.config.provider', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'util', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'parser-common', version: '+', changing: true

api/src/main/java/com/dmdirc/interfaces/Connection.java

@@ -24,7 +24,7 @@ package com.dmdirc.interfaces;
 
 import com.dmdirc.ServerState;
 import com.dmdirc.config.profiles.Profile;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.interfaces.Parser;
 

api/src/main/java/com/dmdirc/interfaces/WindowModel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.interfaces;
 
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 

api/src/main/java/com/dmdirc/interfaces/config/ConfigChangeListener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.interfaces.config;
-
-/**
- * Defines the method required for config change listeners.
- */
-@FunctionalInterface
-public interface ConfigChangeListener {
-
-    /**
-     * Called when a monitored config entry has been changed. Note that the values may be null if
-     * the setting wasn't, or is no longer, set. Also note that the new value may not be the same as
-     * you'd get returned from ConfigManager.getOption, as listeners are triggered for any change in
-     * any of the manager's identities.
-     *
-     * @param domain The domain that was altered
-     * @param key    The key that was altered
-     */
-    void configChanged(String domain, String key);
-
-}

build.gradle

@@ -47,6 +47,7 @@ dependencies {
     bundle group: 'com.google.code.gson', name: 'gson', 'version': '2.5'
 
     bundle group: 'com.dmdirc', name: 'com.dmdirc.config.binding', version: '+', changing: true
+    bundle group: 'com.dmdirc', name: 'com.dmdirc.config.provider', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'com.dmdirc.util.io.yaml', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'com.dmdirc.util.system', version: '+', changing: true

bundles/com.dmdirc.config.provider/build.gradle

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+plugins {
+    id 'java'
+    id 'findbugs'
+    id 'pmd'
+    id 'idea'
+    id 'osgi'
+}
+
+group = 'com.dmdirc'
+
+idea {
+    module {
+         sourceDirs += file('src/main/generated')
+         testSourceDirs += file('src/test/generated_tests')
+         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheDynamicVersionsFor 2, 'minutes'
+    resolutionStrategy.cacheChangingModulesFor 2, 'minutes'
+}
+
+dependencies {
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
+    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
+
+    compile group: 'com.dmdirc', name: 'util', version: '+', changing: true
+    compile group: 'com.dmdirc', name: 'com.dmdirc.config.binding', version: '+', changing: true
+
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+

api/src/main/java/com/dmdirc/interfaces/config/AggregateConfigProvider.java → bundles/com.dmdirc.config.provider/src/main/java/com/dmdirc/config/provider/AggregateConfigProvider.java

@@ -1,29 +1,23 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.interfaces.config;
+package com.dmdirc.config.provider;
 
 import com.dmdirc.config.binding.ConfigBinder;
-
 import java.util.List;
 import java.util.Set;
 

bundles/com.dmdirc.config.provider/src/main/java/com/dmdirc/config/provider/ConfigChangeListener.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2006-2017 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.dmdirc.config.provider;
+
+/**
+ * Defines the method required for config change listeners.
+ */
+@FunctionalInterface
+public interface ConfigChangeListener {
+
+    /**
+     * Called when a monitored config entry has been changed. Note that the values may be null if
+     * the setting wasn't, or is no longer, set. Also note that the new value may not be the same as
+     * you'd get returned from ConfigManager.getOption, as listeners are triggered for any change in
+     * any of the manager's identities.
+     *
+     * @param domain The domain that was altered
+     * @param key    The key that was altered
+     */
+    void configChanged(String domain, String key);
+
+}

api/src/main/java/com/dmdirc/interfaces/config/ConfigProvider.java → bundles/com.dmdirc.config.provider/src/main/java/com/dmdirc/config/provider/ConfigProvider.java

@@ -1,29 +1,23 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.interfaces.config;
+package com.dmdirc.config.provider;
 
 import com.dmdirc.util.io.InvalidConfigFileException;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;

api/src/main/java/com/dmdirc/interfaces/config/ConfigProviderMigrator.java → bundles/com.dmdirc.config.provider/src/main/java/com/dmdirc/config/provider/ConfigProviderMigrator.java

@@ -1,26 +1,21 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.interfaces.config;
+package com.dmdirc.config.provider;
 
 /**
  * Describes an object that can migrate a specific {@link AggregateConfigProvider} to use different

api/src/main/java/com/dmdirc/interfaces/config/ReadOnlyConfigProvider.java → bundles/com.dmdirc.config.provider/src/main/java/com/dmdirc/config/provider/ReadOnlyConfigProvider.java

@@ -1,26 +1,21 @@
 /*
- * Copyright (c) 2006-2015 DMDirc Developers
+ * Copyright (c) 2006-2017 DMDirc Developers
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+ * OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package com.dmdirc.interfaces.config;
+package com.dmdirc.config.provider;
 
 import com.dmdirc.util.validators.DisabledOptionValidator;
 import com.dmdirc.util.validators.NumericalValidator;

src/main/java/com/dmdirc/Channel.java

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.parser.common.ChannelListModeItem;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;

src/main/java/com/dmdirc/ChannelFactory.java

@@ -23,7 +23,7 @@ import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;

src/main/java/com/dmdirc/ClientModule.java

@@ -34,7 +34,7 @@ import com.dmdirc.interfaces.ConnectionFactory;
 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.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginModule;
 import com.dmdirc.ui.messages.ColourManager;

src/main/java/com/dmdirc/CustomWindow.java

@@ -20,7 +20,7 @@ package com.dmdirc;
 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.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
 

src/main/java/com/dmdirc/FrameContainer.java

@@ -27,8 +27,8 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.InputModel;
 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.parser.common.CompositionState;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;

src/main/java/com/dmdirc/GlobalWindow.java

@@ -23,8 +23,8 @@ import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
-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.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;

src/main/java/com/dmdirc/GroupChatManagerImpl.java

@@ -21,7 +21,7 @@ import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatManager;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.interfaces.ChannelInfo;

src/main/java/com/dmdirc/Server.java

@@ -31,9 +31,9 @@ import com.dmdirc.interfaces.InviteManager;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.DefaultStringConverter;
 import com.dmdirc.parser.common.IgnoreList;

src/main/java/com/dmdirc/ServerFactoryImpl.java

@@ -23,8 +23,8 @@ import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;

src/main/java/com/dmdirc/ServerManager.java

@@ -23,7 +23,7 @@ import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.parser.interfaces.Parser;

src/main/java/com/dmdirc/SystemLifecycleController.java

@@ -23,7 +23,7 @@ import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.util.system.SystemLifecycleComponent;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
 import java.util.HashSet;

src/main/java/com/dmdirc/commandline/CommandLineParser.java

@@ -19,7 +19,7 @@ package com.dmdirc.commandline;
 
 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.util.InvalidURIException;
 import com.dmdirc.util.system.SystemInfo;
 import com.dmdirc.util.URIParser;

src/main/java/com/dmdirc/commandparser/CommandManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.PrivateChat;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionType;
 

src/main/java/com/dmdirc/commandparser/PopupManager.java

@@ -20,7 +20,7 @@ package com.dmdirc.commandparser;
 import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import javax.inject.Inject;
 

src/main/java/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.CommandController;
 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.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.BackBufferFactory;

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

@@ -32,8 +32,8 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 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.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;

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

@@ -27,7 +27,7 @@ import com.dmdirc.events.CommandErrorEvent;
 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 javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Singleton;

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

@@ -29,7 +29,7 @@ import com.dmdirc.interfaces.CommandController;
 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 javax.annotation.Nonnull;
 

src/main/java/com/dmdirc/config/ConfigBinderImpl.java

@@ -19,8 +19,8 @@ package com.dmdirc.config;
 
 import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.config.binding.ConfigBinding;
-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.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;

src/main/java/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -17,8 +17,8 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.validators.Validator;
@@ -42,8 +42,6 @@ import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.dmdirc.util.LogUtils.USER_ERROR;
-
 /**
  * Provides configuration settings from a {@link ConfigFile}.
  */
@@ -67,7 +65,7 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
     protected final List<WeakReference<ConfigChangeListener>> listeners =
             new CopyOnWriteArrayList<>();
     /** Whether this identity needs to be saved. */
-    protected boolean needSave;
+    private boolean needSave;
 
     /**
      * Creates a new instance of Identity.
@@ -457,7 +455,7 @@ public class ConfigFileBackedConfigProvider implements ConfigProvider {
 
                 needSave = false;
             } catch (IOException ex) {
-                LOG.warn(USER_ERROR, "Unable to save identity file", ex);
+                LOG.warn("Unable to save identity file", ex);
             }
         }
     }

src/main/java/com/dmdirc/config/ConfigManager.java

@@ -18,10 +18,10 @@
 package com.dmdirc.config;
 
 import com.dmdirc.config.binding.ConfigBinder;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.Validator;
 import com.google.common.collect.ArrayListMultimap;

src/main/java/com/dmdirc/config/ConfigManagerMigrator.java

@@ -17,8 +17,8 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 
 /**
  * Facilitates migration of a {@link ConfigManager}.

src/main/java/com/dmdirc/config/ConfigModule.java

@@ -18,8 +18,8 @@
 package com.dmdirc.config;
 
 import com.dmdirc.commandline.CommandLineParser;
-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.interfaces.config.IdentityFactory;
 import com.dmdirc.logger.ErrorManager;

src/main/java/com/dmdirc/config/ConfigProviderTargetComparator.java

@@ -17,8 +17,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigProvider;
-
+import com.dmdirc.config.provider.ConfigProvider;
 import java.util.Comparator;
 
 /**

src/main/java/com/dmdirc/config/IdentityManager.java

@@ -18,9 +18,9 @@
 package com.dmdirc.config;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.util.ClientInfo;

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

@@ -20,8 +20,8 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 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.Service;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.util.collections.ListenerList;

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

@@ -20,8 +20,8 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 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.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;

src/main/java/com/dmdirc/config/profiles/IdentitiesProfileMigrator.java

@@ -17,16 +17,13 @@
 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.Migrator;
-import com.dmdirc.interfaces.config.ConfigProvider;
-
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.google.common.collect.Lists;
-
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
-
 import javax.inject.Inject;
 
 /**
@@ -35,11 +32,11 @@ import javax.inject.Inject;
 public class IdentitiesProfileMigrator implements Migrator {
 
     private static final String DOMAIN_PROFILE = "profile";
-    private final IdentityManager identityManager;
+    private final IdentityController identityManager;
     private final ProfileManager profileManager;
 
     @Inject
-    public IdentitiesProfileMigrator(final IdentityManager identityManager,
+    public IdentitiesProfileMigrator(final IdentityController identityManager,
             final ProfileManager profileManager) {
         this.identityManager = identityManager;
         this.profileManager = profileManager;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.config.validators;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.util.validators.Validator;
 

src/main/java/com/dmdirc/events/ClientPopupGeneratedEvent.java

@@ -20,7 +20,7 @@ package com.dmdirc.events;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.events.eventbus.BaseEvent;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 /**
  * Raised when a popup is being generated.

src/main/java/com/dmdirc/events/ConnectionPrefsRequestedEvent.java

@@ -18,8 +18,8 @@
 package com.dmdirc.events;
 
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 /**
  * Raised when the connection preferences are requested.

src/main/java/com/dmdirc/events/GroupChatPrefsRequestedEvent.java

@@ -18,8 +18,8 @@
 package com.dmdirc.events;
 
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 /**
  * Raised when the group chat preferences are requested.

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

@@ -19,6 +19,8 @@ package com.dmdirc.interfaces.config;
 
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
 
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import java.util.Collection;
 
 /**

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

@@ -19,6 +19,9 @@ package com.dmdirc.interfaces.config;
 
 import com.dmdirc.Precondition;
 import com.dmdirc.config.ConfigTarget;
+import com.dmdirc.config.provider.AggregateConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 
 /**
  * Defines methods implemented by a factory which can create useful identities.

src/main/java/com/dmdirc/logger/DiskLoggingErrorManager.java

@@ -24,7 +24,7 @@ import com.dmdirc.config.binding.ConfigBinding;
 import com.dmdirc.events.ErrorEvent;
 import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.collect.Lists;
 

src/main/java/com/dmdirc/logger/ErrorManager.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.util.Set;
 

src/main/java/com/dmdirc/logger/ModeAliasReporter.java

@@ -19,7 +19,7 @@ package com.dmdirc.logger;
 
 import com.dmdirc.MissingModeAliasException;
 import com.dmdirc.events.ServerConnectedEvent;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 
 import javax.inject.Inject;

src/main/java/com/dmdirc/logger/SentryLoggingErrorManager.java

@@ -23,7 +23,7 @@ import com.dmdirc.events.ProgramErrorAddedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorStatusEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.base.Throwables;
 

src/main/java/com/dmdirc/plugins/PluginInfo.java

@@ -22,7 +22,7 @@ import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.validators.ValidationResponse;
 

src/main/java/com/dmdirc/tls/CertificateManager.java

@@ -21,8 +21,8 @@ import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
 import com.dmdirc.events.ServerCertificateProblemResolvedEvent;
 import com.dmdirc.interfaces.Connection;
 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 java.io.FileInputStream;
 import java.io.FileNotFoundException;

src/main/java/com/dmdirc/ui/StatusMessage.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.ui;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusMessageNotifier;
 
 /**

src/main/java/com/dmdirc/ui/core/feedback/FeedbackHelper.java

@@ -22,7 +22,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.ClientInfo;
 

src/main/java/com/dmdirc/ui/core/feedback/FeedbackSender.java

@@ -19,7 +19,7 @@ package com.dmdirc.ui.core.feedback;
 
 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.ui.StatusMessage;
 import com.dmdirc.util.io.Downloader;
 

src/main/java/com/dmdirc/ui/core/feedback/FeedbackSenderFactory.java

@@ -19,7 +19,7 @@ package com.dmdirc.ui.core.feedback;
 
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
 import javax.inject.Inject;
 

src/main/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModel.java

@@ -25,8 +25,8 @@ import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 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.ui.NewServerDialogModel;
 import com.dmdirc.interfaces.ui.NewServerDialogModelListener;
 import com.dmdirc.util.collections.ListenerList;

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

@@ -21,7 +21,7 @@ import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UnknownURLEvent;
 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.ui.StatusMessage;
 import com.dmdirc.util.CommandUtils;
 

src/main/java/com/dmdirc/ui/input/InputHandler.java

@@ -28,7 +28,7 @@ import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
 import com.dmdirc.parser.common.CompositionState;

src/main/java/com/dmdirc/ui/input/TabCompleterFactory.java

@@ -19,7 +19,7 @@ package com.dmdirc.ui.input;
 
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import javax.inject.Inject;
 import javax.inject.Provider;

src/main/java/com/dmdirc/ui/input/TabCompleterImpl.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 

src/main/java/com/dmdirc/ui/messages/ColourManagerFactory.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;

src/main/java/com/dmdirc/ui/messages/ColourManagerImpl.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.util.validators.ColourValidator;
 import com.dmdirc.util.validators.Validator;

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

@@ -18,7 +18,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.Precondition;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.util.DateUtils;
 
 import java.util.HashMap;

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

@@ -18,8 +18,8 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.events.DisplayPropertyMap;
-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.collections.ListenerList;
 
 import java.awt.Font;

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

@@ -18,8 +18,8 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.interfaces.Connection;
-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.colours.Colour;
 import com.google.common.annotations.VisibleForTesting;
 import java.util.Locale;

src/main/java/com/dmdirc/updater/UpdateChecker.java

@@ -17,7 +17,7 @@
 
 package com.dmdirc.updater;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;

src/main/java/com/dmdirc/updater/checking/DMDircCheckStrategy.java

@@ -19,7 +19,7 @@ package com.dmdirc.updater.checking;
 
 import com.dmdirc.config.binding.ConfigBinding;
 import com.dmdirc.config.GlobalConfig;
-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.Version;

src/main/java/com/dmdirc/updater/checking/NightlyChecker.java

@@ -19,7 +19,7 @@ package com.dmdirc.updater.checking;
 
 import com.dmdirc.config.binding.ConfigBinding;
 import com.dmdirc.config.GlobalConfig;
-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.Version;

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

@@ -19,7 +19,7 @@ package com.dmdirc.updater.components;
 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;

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

@@ -19,7 +19,7 @@ package com.dmdirc.updater.components;
 
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.Version;

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

@@ -17,7 +17,7 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginException;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.updater.UpdateComponent;

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

@@ -18,7 +18,7 @@
 package com.dmdirc.updater.manager;
 
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.updater.UpdateComponent;
 
 import javax.inject.Inject;

src/test/java/com/dmdirc/ServerManagerTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.ConfigProviderMigrator;
+import com.dmdirc.config.provider.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;

src/test/java/com/dmdirc/WritableFrameContainerTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.harness.TestWritableFrameContainer;
 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.ui.messages.BackBufferFactory;
 
 import java.util.Arrays;

src/test/java/com/dmdirc/commandparser/commands/channel/PartTest.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
 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;

src/test/java/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -32,7 +32,7 @@ import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.util.Optional;
 

src/test/java/com/dmdirc/config/ConfigBinderImplTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config;
 
 import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.config.binding.ConfigBinding;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;

src/test/java/com/dmdirc/config/ConfigFileBackedConfigProviderTest.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.tests.JimFsRule;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.validators.NumericalValidator;

src/test/java/com/dmdirc/config/ConfigManagerTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.config.provider.ConfigChangeListener;
 import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.PermissiveValidator;
 

src/test/java/com/dmdirc/config/IdentityManagerTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 import com.dmdirc.tests.JimFsRule;
 import com.dmdirc.util.ClientInfo;
 

src/test/java/com/dmdirc/config/prefs/PreferencesDialogModelTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 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.Service;
 import com.dmdirc.plugins.ServiceManager;
 

src/test/java/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -21,8 +21,8 @@
  */
 package com.dmdirc.config.prefs;
 
-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.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.StringLengthValidator;

src/test/java/com/dmdirc/config/profiles/IdentitiesProfileMigratorTest.java

@@ -23,7 +23,7 @@
 package com.dmdirc.config.profiles;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.config.provider.ConfigProvider;
 
 import com.google.common.collect.Lists;
 

src/test/java/com/dmdirc/config/validators/URLProtocolValidatorTest.java

@@ -23,7 +23,7 @@
 package com.dmdirc.config.validators;
 
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/dmdirc/harness/TestCommandParser.java

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.parsers.BaseCommandParser;
 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 javax.annotation.Nonnull;
 

src/test/java/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 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.input.TabCompleterImpl;
 import com.dmdirc.ui.messages.BackBufferFactory;
 

src/test/java/com/dmdirc/logger/DiskLoggingErrorManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.logger;
 import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.tests.JimFsRule;
 
 import java.nio.file.Files;

src/test/java/com/dmdirc/logger/SentryLoggingErrorManagerTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.logger;
 import com.dmdirc.config.binding.ConfigBinder;
 import com.dmdirc.events.ProgramErrorAddedEvent;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import com.google.common.util.concurrent.MoreExecutors;
 

src/test/java/com/dmdirc/ui/StatusMessageTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.ui;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusMessageNotifier;
 
 import org.junit.Test;

src/test/java/com/dmdirc/ui/core/feedback/FeedbackHelperTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.ui.core.feedback;
 import com.dmdirc.ServerState;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.ClientInfo;
 

src/test/java/com/dmdirc/ui/core/feedback/FeedbackSenderTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.core.feedback;
 
 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.util.io.Downloader;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;

src/test/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModelTest.java

@@ -28,8 +28,8 @@ import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 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.ui.NewServerDialogModelListener;
 
 import com.google.common.collect.Lists;

src/test/java/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.events.eventbus.EventBus;
-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.logger.ErrorManager;
 import com.dmdirc.util.colours.Colour;
 import com.dmdirc.util.colours.ColourUtils;

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

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.messages;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.util.Arrays;
 import java.util.List;

src/test/java/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.messages;
 
 import com.dmdirc.events.eventbus.MBassadorEventBus;
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import java.awt.Color;
 import java.awt.font.TextAttribute;

src/test/java/com/dmdirc/ui/messages/StyliserTest.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.events.eventbus.EventBus;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.config.provider.AggregateConfigProvider;
 
 import org.junit.Ignore;
 import org.junit.Test;