Remove ConfigManager references.

Change-Id: I065a771ff81e565b37689f9d6ea82d4057cec2f1
Reviewed-on: http://gerrit.dmdirc.com/2779
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -25,10 +25,10 @@ package com.dmdirc.actions.metatypes;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.actions.ActionMetaType;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.swing.KeyStroke;
 import javax.swing.text.StyledDocument;
@@ -45,7 +45,7 @@ public enum ClientEvents implements ActionMetaType {
     /** Client event with frame and message. */
     WINDOW_EVENT_WITH_MESSAGE(new String[]{"window", "message"}, FrameContainer.class, String.class),
     /** A popup-related event. */
-    POPUP_EVENT(new String[]{"popup type", "popup", "configuration manager"}, PopupType.class, PopupMenu.class, ConfigManager.class),
+    POPUP_EVENT(new String[]{"popup type", "popup", "configuration provider"}, PopupType.class, PopupMenu.class, AggregateConfigProvider.class),
     /** Client event type, with a key argument. */
     CLIENT_EVENT_WITH_KEY(new String[]{"key event"}, KeyStroke.class),
     /** Client event with an origin and editable buffer. */

src/com/dmdirc/config/ConfigBinder.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config;
 
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -48,11 +49,10 @@ import lombok.Synchronized;
 public class ConfigBinder {
 
     /** A map of instances to created listeners. */
-    private final MapList<Object, ConfigChangeListener> listeners
-            = new MapList<Object, ConfigChangeListener>();
+    private final MapList<Object, ConfigChangeListener> listeners = new MapList<>();
 
     /** The configuration manager to use to retrieve settings. */
-    private final ConfigManager manager;
+    private final AggregateConfigProvider manager;
 
     /**
      * Binds all annotated methods and fields of the given instance to this
@@ -63,8 +63,8 @@ public class ConfigBinder {
      */
     @SuppressWarnings("unchecked")
     public void bind(final Object instance, final Class<?> clazz) {
-        final List<ConfigChangeListener> newListeners = new ArrayList<ConfigChangeListener>();
-        final List<AccessibleObject> elements = new ArrayList<AccessibleObject>();
+        final List<ConfigChangeListener> newListeners = new ArrayList<>();
+        final List<AccessibleObject> elements = new ArrayList<>();
 
         elements.addAll(Arrays.asList(clazz.getDeclaredMethods()));
         elements.addAll(Arrays.asList(clazz.getDeclaredFields()));
@@ -130,9 +130,7 @@ public class ConfigBinder {
         if (element instanceof Field) {
             try {
                 ((Field) element).set(instance, value);
-            } catch (IllegalAccessException ex) {
-                // Ignore
-            } catch (IllegalArgumentException ex) {
+            } catch (IllegalAccessException | IllegalArgumentException ex) {
                 // Ignore
             }
         }
@@ -140,9 +138,7 @@ public class ConfigBinder {
         if (element instanceof Method) {
             try {
                 ((Method) element).invoke(instance, value);
-            } catch (IllegalAccessException ex) {
-                // Ignore
-            } catch (IllegalArgumentException ex) {
+            } catch (IllegalAccessException | IllegalArgumentException ex) {
                 // Ignore
             } catch (InvocationTargetException ex) {
                Logger.appError(ErrorLevel.HIGH,

src/com/dmdirc/config/IdentityManager.java

@@ -23,6 +23,7 @@
 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.ConfigProviderListener;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -515,7 +516,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
 
     /** {@inheritDoc} */
     @Override
-    public synchronized ConfigManager getGlobalConfiguration() {
+    public synchronized AggregateConfigProvider getGlobalConfiguration() {
         if (globalconfig == null) {
             globalconfig = new ConfigManager("", "", "", "");
         }

test/com/dmdirc/WritableFrameContainerTest.java

@@ -24,9 +24,8 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.ConfigBinder;
-import com.dmdirc.config.ConfigManager;
-import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestWritableFrameContainer;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
 
@@ -40,25 +39,25 @@ import static org.mockito.Mockito.*;
 
 public class WritableFrameContainerTest {
 
-    @Mock private ConfigManager cm;
+    @Mock private AggregateConfigProvider acp;
     @Mock private ServerManager serverManager;
     private CommandManager commands;
 
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        when(cm.getOption("general", "silencechar")).thenReturn(".");
-        when(cm.getOption("general", "commandchar")).thenReturn("/");
-        final ConfigBinder binder = new ConfigBinder(cm);
-        when(cm.getBinder()).thenReturn(binder);
+        when(acp.getOption("general", "silencechar")).thenReturn(".");
+        when(acp.getOption("general", "commandchar")).thenReturn("/");
+        final ConfigBinder binder = new ConfigBinder(acp);
+        when(acp.getBinder()).thenReturn(binder);
         commands = new CommandManager(serverManager);
-        commands.initialise(cm);
+        commands.initialise(acp);
     }
 
     @Test
     public void testGetNumLines() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, cm, commands);
+                = new TestWritableFrameContainer(10, acp, commands);
 
         final int res0a = container10.getNumLines("");
         final int res0b = container10.getNumLines("\r");
@@ -88,7 +87,7 @@ public class WritableFrameContainerTest {
     @Test
     public void testSplitLine() {
         final WritableFrameContainer container10
-                = new TestWritableFrameContainer(10, cm, commands);
+                = new TestWritableFrameContainer(10, acp, commands);
         final String[][][] tests = new String[][][]{
             {{""}, {""}},
             {{"0123456789"}, {"0123456789"}},

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -23,8 +23,8 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.Server;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +40,7 @@ public class ActionComponentChainTest {
 
     @Mock private ActionManager actionManager;
     @Mock private IdentityManager identityManager;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
 
     @Before
     public void setUp() throws Exception {

test/com/dmdirc/actions/ActionSubstitutorTest.java

@@ -25,9 +25,9 @@ package com.dmdirc.actions;
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
 import java.util.Arrays;
@@ -68,7 +68,7 @@ public class ActionSubstitutorTest {
 
         this.channel = mock(Channel.class);
 
-        final ConfigManager manager = mock(ConfigManager.class);
+        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         final Server server = mock(Server.class);
 
         final ChannelClientInfo clientInfo = mock(ChannelClientInfo.class);

test/com/dmdirc/commandparser/CommandArgumentsTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
 
@@ -42,7 +42,7 @@ public class CommandArgumentsTest {
 
     @Mock private CommandController controller;
     @Mock private IdentityManager identityManager;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
 
     @Before
     public void setUp() {

test/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -26,8 +26,8 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.irc.IRCChannelClientInfo;
 import com.dmdirc.parser.irc.IRCChannelInfo;
 
@@ -96,7 +96,7 @@ public class KickReasonTest {
     @Test
     public void testWithoutReason() {
         final FrameContainer tiw = mock(FrameContainer.class);
-        final ConfigManager manager = mock(ConfigManager.class);
+        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         final IRCChannelInfo channelInfo = mock(IRCChannelInfo.class);
         final Channel channel = mock(Channel.class);
         final IRCChannelClientInfo cci = mock(IRCChannelClientInfo.class);

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

@@ -26,9 +26,9 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +43,7 @@ public class PartTest {
 
     @Mock private Channel channel;
     @Mock private FrameContainer origin;
-    @Mock private ConfigManager manager;
+    @Mock private AggregateConfigProvider manager;
     @Mock private CommandController controller;
     private Part command;
 

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

@@ -21,15 +21,13 @@
  */
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.TestMain;
-import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.global.Echo;
 import com.dmdirc.config.ConfigBinder;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestCommandParser;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -42,7 +40,7 @@ import static org.mockito.Mockito.*;
 public class CommandParserTest {
 
     @Mock private ServerManager serverManager;
-    @Mock private ConfigManager cm;
+    @Mock private AggregateConfigProvider cm;
     private CommandManager commands;
 
     @Before

test/com/dmdirc/config/CipherUtilsTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.config;
 
 import com.dmdirc.harness.TestCipherUtils;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
@@ -39,7 +40,7 @@ import static org.mockito.Mockito.*;
 public class CipherUtilsTest {
 
     @Mock private IdentityController identityController;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
     @Mock private ConfigProvider configProvider;
 
     @Before

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

@@ -24,8 +24,8 @@ package com.dmdirc.config.prefs;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 
@@ -48,7 +48,7 @@ public class PreferencesDialogModelTest {
         actionManager = mock(ActionManager.class);
         pluginManager = mock(PluginManager.class);
 
-        final List<Service> services = new ArrayList<Service>();
+        final List<Service> services = new ArrayList<>();
         final Service tabcompleter = mock(Service.class);
         when(tabcompleter.getName()).thenReturn("tabber");
         services.add(tabcompleter);
@@ -58,7 +58,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testDefaults() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, actionManager, pluginManager);
@@ -74,7 +74,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testDismiss() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesCategory category = mock(PreferencesCategory.class);
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -89,7 +89,7 @@ public class PreferencesDialogModelTest {
     public void testSaveNoRestart() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(false);
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -104,7 +104,7 @@ public class PreferencesDialogModelTest {
     public void testSaveRestart() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(true);
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -117,7 +117,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testGetCategory() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -127,7 +127,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testGetCategories() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -142,7 +142,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testSaveListener() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -156,7 +156,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testOpenAction() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
@@ -168,7 +168,7 @@ public class PreferencesDialogModelTest {
     @Test
     public void testCloseAction() {
         final ActionListener tal = mock(ActionListener.class);
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, actionManager, pluginManager);
@@ -179,7 +179,7 @@ public class PreferencesDialogModelTest {
 
     @Test
     public void testCategoryObjectSaveListeners() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,

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

@@ -23,10 +23,9 @@
 package com.dmdirc.config.prefs;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -35,13 +34,13 @@ import static org.mockito.Mockito.*;
 public class PreferencesManagerTest {
 
     private ActionController actionController;
-    private ConfigManager configManager;
+    private AggregateConfigProvider configManager;
     private PreferencesManager manager;
 
     @Before
     public void setup() {
         this.actionController = mock(ActionController.class);
-        this.configManager = mock(ConfigManager.class);
+        this.configManager = mock(AggregateConfigProvider.class);
         this.manager = new PreferencesManager(actionController);
     }
 

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

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.PermissiveValidator;
@@ -52,7 +52,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testNormalConstructor() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -67,7 +67,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testValidatorConstructor() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT,
                 new NotEmptyValidator(), "domain",
@@ -83,7 +83,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testRestartNeeded() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -95,7 +95,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testMultichoiceAdding() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("new");
         final Map<String, String> map = new HashMap<>();
         map.put("a", "b");
@@ -110,7 +110,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSetValue() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -120,7 +120,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testDismiss() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -137,7 +137,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testListener() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext", cm, null);
@@ -152,7 +152,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testNeedsSaving() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         when(cm.getOption("domain", "option2")).thenReturn("fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT,
@@ -173,7 +173,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSaveUnset() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
@@ -191,7 +191,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testSaveNormal() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
@@ -209,7 +209,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testIsSet() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
@@ -223,7 +223,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testIsNotSet() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider identity = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn(null);
@@ -237,7 +237,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testUnknownComboOption() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");
@@ -253,7 +253,7 @@ public class PreferencesSettingTest {
 
     @Test
     public void testKnownComboOption() {
-        ConfigManager cm = mock(ConfigManager.class);
+        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         ConfigProvider configProvider = mock(ConfigProvider.class);
 
         when(cm.getOption("unit-test", "ps")).thenReturn("abc");

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

@@ -22,21 +22,21 @@
 
 package com.dmdirc.config.validators;
 
-import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class URLProtocolValidatorTest {
 
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
 
     @Test
     public void testValidate() throws InvalidIdentityFileException {

test/com/dmdirc/harness/TestCommandParser.java

@@ -28,15 +28,14 @@ import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
-import com.dmdirc.commandparser.parsers.*;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import lombok.ToString;
 
 public class TestCommandParser extends CommandParser {
     private static final long serialVersionUID = 7073002401375438532L;
 
-    private final ConfigManager configManager;
+    private final AggregateConfigProvider configManager;
 
     public String nonCommandLine;
 
@@ -48,7 +47,7 @@ public class TestCommandParser extends CommandParser {
 
     public String invalidCommand;
 
-    public TestCommandParser(final ConfigManager configManager,
+    public TestCommandParser(final AggregateConfigProvider configManager,
             final CommandManager commandManager) {
         super(configManager, commandManager);
         this.configManager = configManager;

test/com/dmdirc/harness/TestConfigManagerMap.java

@@ -31,8 +31,7 @@ import java.util.Map;
 public class TestConfigManagerMap extends ConfigManager {
     private static final long serialVersionUID = 3604727894041756961L;
 
-    public final Map<String, String> settings =
-            new HashMap<String, String>();
+    public final Map<String, String> settings = new HashMap<>();
 
     public TestConfigManagerMap() {
         super("", "", "", "");

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -26,7 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.Collections;
@@ -36,7 +36,7 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
     private final int lineLength;
 
     public TestWritableFrameContainer(final int lineLength,
-            final ConfigManager cm, final CommandManager commandManager) {
+            final AggregateConfigProvider cm, final CommandManager commandManager) {
         super("raw", "Raw", "(Raw)", cm,
                 new GlobalCommandParser(cm, commandManager),
                 Collections.<String>emptySet());

test/com/dmdirc/ui/StatusMessageTest.java

@@ -21,7 +21,7 @@
  */
 package com.dmdirc.ui;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusMessageNotifier;
 
 import org.junit.Test;
@@ -33,35 +33,35 @@ public class StatusMessageTest {
 
     @Test
     public void testGetMessageShortConstructor() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         StatusMessage instance = new StatusMessage("test", config);
         assertEquals("test", instance.getMessage());
     }
 
     @Test
     public void testGetMessageLongConstructor() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals("test", instance.getMessage());
     }
 
     @Test
     public void testGetIconType() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals("icon", instance.getIconType());
     }
 
     @Test
     public void testGetMessageNotifierNull() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertNull(instance.getMessageNotifier());
     }
 
     @Test
     public void testGetMessageNotifierNotNull() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         final StatusMessageNotifier smn = mock(StatusMessageNotifier.class);
         StatusMessage instance = new StatusMessage("icon", "test", smn, 10, config);
         assertEquals(smn, instance.getMessageNotifier());
@@ -69,14 +69,14 @@ public class StatusMessageTest {
 
     @Test
     public void testGetTimeout() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
         StatusMessage instance = new StatusMessage("icon", "test", null, 10, config);
         assertEquals(10, instance.getTimeout());
     }
 
     @Test
     public void testGetTimeoutFallback() {
-        final ConfigManager config = mock(ConfigManager.class);
+        final AggregateConfigProvider config = mock(AggregateConfigProvider.class);
 
         when(config.getOptionInt("statusBar", "messageDisplayLength")).thenReturn(10);
 

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.Logger;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.*;
 public class ColourManagerTest {
 
     @Mock private ErrorManager errorManager;
-    @Mock private ConfigManager configManager;
+    @Mock private AggregateConfigProvider configManager;
     @Captor private ArgumentCaptor<ConfigChangeListener> configListener;
     private ColourManager manager;
 

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

@@ -21,11 +21,11 @@
  */
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.TestMain;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Arrays;
 import java.util.List;
@@ -49,7 +49,7 @@ public class IntelligentLinkingTest {
         this.expected = expected;
 
         final FrameContainer container = mock(FrameContainer.class);
-        final ConfigManager manager = mock(ConfigManager.class);
+        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         final Server server = mock(Server.class);
         when(server.getChannelPrefixes()).thenReturn("#&+");
         when(container.getServer()).thenReturn(server);

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

@@ -22,10 +22,10 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.TestMain;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.util.Utils;
 
 import java.awt.Color;
@@ -72,7 +72,7 @@ public class StyliserStylesTest {
         final StringBuilder builder = new StringBuilder();
 
         final FrameContainer container = mock(FrameContainer.class);
-        final ConfigManager manager = mock(ConfigManager.class);
+        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         when(container.getConfigManager()).thenReturn(manager);
 
         final Styliser styliser = new Styliser(container);

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

@@ -22,10 +22,10 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.TestMain;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.config.ConfigManager;
+import com.dmdirc.TestMain;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.util.Enumeration;
 
@@ -92,7 +92,7 @@ public class StyliserTest {
         final String input2 = "abcdefghi";
 
         final FrameContainer container = mock(FrameContainer.class);
-        final ConfigManager manager = mock(ConfigManager.class);
+        final AggregateConfigProvider manager = mock(AggregateConfigProvider.class);
         when(container.getConfigManager()).thenReturn(manager);
 
         final Styliser styliser = new Styliser(container);