Merge pull request #716 from csmith/master

Add config annotations to API.

api/src/main/java/com/dmdirc/config/AddonConfig.java

@@ -0,0 +1,10 @@
+package com.dmdirc.config;
+
+import javax.inject.Qualifier;
+
+/**
+ * Qualifier that identities the addon defaults config provider.
+ */
+@Qualifier
+public @interface AddonConfig {
+}

api/src/main/java/com/dmdirc/config/GlobalConfig.java

@@ -0,0 +1,10 @@
+package com.dmdirc.config;
+
+import javax.inject.Qualifier;
+
+/**
+ * Qualifier that identities a global configuration source.
+ */
+@Qualifier
+public @interface GlobalConfig {
+}

api/src/main/java/com/dmdirc/config/UserConfig.java

@@ -0,0 +1,10 @@
+package com.dmdirc.config;
+
+import javax.inject.Qualifier;
+
+/**
+ * Qualifier that identities the user settings config provider.
+ */
+@Qualifier
+public @interface UserConfig {
+}

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

@@ -149,8 +149,15 @@ public class ClientModule {
     @Provides
     @Singleton
     @GlobalConfig
+    public ColourManager getOldGlobalColourManager(@com.dmdirc.config.GlobalConfig final ColourManager colourManager) {
+        return colourManager;
+    }
+
+    @Provides
+    @Singleton
+    @com.dmdirc.config.GlobalConfig
     public ColourManager getGlobalColourManager(final ColourManagerFactory colourManagerFactory,
-            @GlobalConfig final  AggregateConfigProvider globalConfig) {
+            @com.dmdirc.config.GlobalConfig final AggregateConfigProvider globalConfig) {
         return colourManagerFactory.getColourManager(globalConfig);
     }
 

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

@@ -43,9 +43,6 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.Provides;
 
-import static com.dmdirc.ClientModule.AddonConfig;
-import static com.dmdirc.ClientModule.GlobalConfig;
-import static com.dmdirc.ClientModule.UserConfig;
 import static com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import static com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 
@@ -87,18 +84,36 @@ public class ConfigModule {
         return manager;
     }
 
+    @Provides
+    @com.dmdirc.ClientModule.GlobalConfig
+    public AggregateConfigProvider getOldGlobalConfig(final IdentityController controller) {
+        return controller.getGlobalConfiguration();
+    }
+
     @Provides
     @GlobalConfig
     public AggregateConfigProvider getGlobalConfig(final IdentityController controller) {
         return controller.getGlobalConfiguration();
     }
 
+    @Provides
+    @com.dmdirc.ClientModule.UserConfig
+    public ConfigProvider getOldUserConfig(final IdentityController controller) {
+        return controller.getUserSettings();
+    }
+
     @Provides
     @UserConfig
     public ConfigProvider getUserConfig(final IdentityController controller) {
         return controller.getUserSettings();
     }
 
+    @Provides
+    @com.dmdirc.ClientModule.AddonConfig
+    public ConfigProvider getOldAddonConfig(final IdentityController controller) {
+        return controller.getAddonSettings();
+    }
+
     @Provides
     @AddonConfig
     public ConfigProvider getAddonConfig(final IdentityController controller) {