Browse Source

Migrate to new @AddonConfig annotation.

pull/719/head
Chris Smith 7 years ago
parent
commit
ba7cba7719

+ 3
- 12
src/main/java/com/dmdirc/ClientModule.java View File

48
 import com.dmdirc.updater.UpdaterModule;
48
 import com.dmdirc.updater.UpdaterModule;
49
 import com.dmdirc.util.LoggingExecutorService;
49
 import com.dmdirc.util.LoggingExecutorService;
50
 import com.dmdirc.util.io.Downloader;
50
 import com.dmdirc.util.io.Downloader;
51
-
51
+import dagger.Module;
52
+import dagger.ObjectGraph;
53
+import dagger.Provides;
52
 import java.util.concurrent.ExecutorService;
54
 import java.util.concurrent.ExecutorService;
53
-
54
 import javax.inject.Named;
55
 import javax.inject.Named;
55
 import javax.inject.Provider;
56
 import javax.inject.Provider;
56
-import javax.inject.Qualifier;
57
 import javax.inject.Singleton;
57
 import javax.inject.Singleton;
58
 
58
 
59
-import dagger.Module;
60
-import dagger.ObjectGraph;
61
-import dagger.Provides;
62
-
63
 /**
59
 /**
64
  * Provides dependencies for the client.
60
  * Provides dependencies for the client.
65
  */
61
  */
80
         library = true)
76
         library = true)
81
 public class ClientModule {
77
 public class ClientModule {
82
 
78
 
83
-    /** Qualifier that identities the addon defaults config provider. */
84
-    @Qualifier
85
-    public @interface AddonConfig {
86
-    }
87
-
88
     /** The object graph to inject where necessary. */
79
     /** The object graph to inject where necessary. */
89
     private ObjectGraph objectGraph;
80
     private ObjectGraph objectGraph;
90
 
81
 

+ 0
- 6
src/main/java/com/dmdirc/config/ConfigModule.java View File

96
         return controller.getUserSettings();
96
         return controller.getUserSettings();
97
     }
97
     }
98
 
98
 
99
-    @Provides
100
-    @com.dmdirc.ClientModule.AddonConfig
101
-    public ConfigProvider getOldAddonConfig(final IdentityController controller) {
102
-        return controller.getAddonSettings();
103
-    }
104
-
105
     @Provides
99
     @Provides
106
     @AddonConfig
100
     @AddonConfig
107
     public ConfigProvider getAddonConfig(final IdentityController controller) {
101
     public ConfigProvider getAddonConfig(final IdentityController controller) {

Loading…
Cancel
Save