소스 검색

Add a qualifier to PluginInfo.

pull/287/head
Greg Holmes 9 년 전
부모
커밋
5dfa4b05df

+ 2
- 1
dcc/src/com/dmdirc/addons/dcc/DCCManager.java 파일 보기

57
 import com.dmdirc.interfaces.config.IdentityController;
57
 import com.dmdirc.interfaces.config.IdentityController;
58
 import com.dmdirc.logger.ErrorLevel;
58
 import com.dmdirc.logger.ErrorLevel;
59
 import com.dmdirc.parser.interfaces.Parser;
59
 import com.dmdirc.parser.interfaces.Parser;
60
+import com.dmdirc.plugins.PluginDomain;
60
 import com.dmdirc.plugins.PluginInfo;
61
 import com.dmdirc.plugins.PluginInfo;
61
 import com.dmdirc.ui.WindowManager;
62
 import com.dmdirc.ui.WindowManager;
62
 import com.dmdirc.ui.input.TabCompleterFactory;
63
 import com.dmdirc.ui.input.TabCompleterFactory;
118
     @Inject
119
     @Inject
119
     public DCCManager(
120
     public DCCManager(
120
             @MainWindow final Window mainWindow,
121
             @MainWindow final Window mainWindow,
121
-            final PluginInfo pluginInfo,
122
+            @PluginDomain(DCCPlugin.class) final PluginInfo pluginInfo,
122
             final IdentityController identityController,
123
             final IdentityController identityController,
123
             @GlobalConfig final AggregateConfigProvider globalConfig,
124
             @GlobalConfig final AggregateConfigProvider globalConfig,
124
             final CommandController commandController,
125
             final CommandController commandController,

+ 2
- 0
dcc/src/com/dmdirc/addons/dcc/DCCPluginModule.java 파일 보기

23
 package com.dmdirc.addons.dcc;
23
 package com.dmdirc.addons.dcc;
24
 
24
 
25
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
25
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
26
+import com.dmdirc.plugins.PluginDomain;
26
 import com.dmdirc.plugins.PluginInfo;
27
 import com.dmdirc.plugins.PluginInfo;
27
 
28
 
28
 import dagger.Module;
29
 import dagger.Module;
42
     }
43
     }
43
 
44
 
44
     @Provides
45
     @Provides
46
+    @PluginDomain(DCCPlugin.class)
45
     public PluginInfo getPluginInfo() {
47
     public PluginInfo getPluginInfo() {
46
         return pluginInfo;
48
         return pluginInfo;
47
     }
49
     }

+ 1
- 1
nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java 파일 보기

93
             @GlobalConfig final AggregateConfigProvider globalConfig,
93
             @GlobalConfig final AggregateConfigProvider globalConfig,
94
             final IconManager iconManager,
94
             final IconManager iconManager,
95
             @MainWindow final Provider<Window> mainWindowProvider,
95
             @MainWindow final Provider<Window> mainWindowProvider,
96
-            final PluginInfo pluginInfo,
96
+            @PluginDomain(NickColourPlugin.class) final PluginInfo pluginInfo,
97
             final DMDircMBassador eventBus) {
97
             final DMDircMBassador eventBus) {
98
         this.domain = domain;
98
         this.domain = domain;
99
         this.globalConfig = globalConfig;
99
         this.globalConfig = globalConfig;

+ 1
- 0
nickcolours/src/com/dmdirc/addons/nickcolours/NickColourModule.java 파일 보기

57
     }
57
     }
58
 
58
 
59
     @Provides
59
     @Provides
60
+    @PluginDomain(NickColourPlugin.class)
60
     public PluginInfo getPluginInfo() {
61
     public PluginInfo getPluginInfo() {
61
         return pluginInfo;
62
         return pluginInfo;
62
     }
63
     }

+ 2
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/SwingManager.java 파일 보기

122
             final TreeFrameManagerProvider treeProvider,
122
             final TreeFrameManagerProvider treeProvider,
123
             final Provider<SwingWindowManager> swingWindowManager,
123
             final Provider<SwingWindowManager> swingWindowManager,
124
             final SwingUIInitialiser uiInitialiser,
124
             final SwingUIInitialiser uiInitialiser,
125
-            final PluginInfo pluginInfo,
126
-            @PluginDomain(SwingController.class)final String domain) {
125
+            @PluginDomain(SwingController.class) final PluginInfo pluginInfo,
126
+            @PluginDomain(SwingController.class) final String domain) {
127
         this.windowFactory = windowFactory;
127
         this.windowFactory = windowFactory;
128
         this.windowManager = windowManager;
128
         this.windowManager = windowManager;
129
         this.menuBar = menuBar;
129
         this.menuBar = menuBar;

+ 1
- 0
ui_swing/src/com/dmdirc/addons/ui_swing/injection/SwingModule.java 파일 보기

217
     }
217
     }
218
 
218
 
219
     @Provides
219
     @Provides
220
+    @PluginDomain(SwingController.class)
220
     public PluginInfo getPluginInfo() {
221
     public PluginInfo getPluginInfo() {
221
         return pluginInfo;
222
         return pluginInfo;
222
     }
223
     }

+ 1
- 1
windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java 파일 보기

82
             @PluginDomain(WindowStatusPlugin.class) final String domain,
82
             @PluginDomain(WindowStatusPlugin.class) final String domain,
83
             final DMDircMBassador eventBus,
83
             final DMDircMBassador eventBus,
84
             final SwingEventBus swingEventBus,
84
             final SwingEventBus swingEventBus,
85
-            final PluginInfo pluginInfo) {
85
+            @PluginDomain(WindowStatusPlugin.class) final PluginInfo pluginInfo) {
86
         this.activeFrameManager = activeFrameManager;
86
         this.activeFrameManager = activeFrameManager;
87
         this.pluginInfo = pluginInfo;
87
         this.pluginInfo = pluginInfo;
88
         this.configBinder = config.getBinder().withDefaultDomain(domain);
88
         this.configBinder = config.getBinder().withDefaultDomain(domain);

+ 1
- 0
windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusModule.java 파일 보기

54
     }
54
     }
55
 
55
 
56
     @Provides
56
     @Provides
57
+    @PluginDomain(WindowStatusPlugin.class)
57
     public PluginInfo getPluginInfo() {
58
     public PluginInfo getPluginInfo() {
58
         return pluginInfo;
59
         return pluginInfo;
59
     }
60
     }

Loading…
취소
저장