浏览代码

Remove pointless/incorrect dagger annotations

Change-Id: Ie5daf5da494cf70c49081351c1b01bdb7dbaeef5
Reviewed-on: http://gerrit.dmdirc.com/3886
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
changes/86/3886/2
Chris Smith 9 年前
父节点
当前提交
dba8ac3ee3

+ 2
- 5
ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java 查看文件

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
23
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
24
 
24
 
25
-import com.dmdirc.ClientModule.GlobalConfig;
26
 import com.dmdirc.DMDircMBassador;
25
 import com.dmdirc.DMDircMBassador;
27
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
 import com.dmdirc.addons.ui_swing.UIUtilities;
28
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
29
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
30
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
31
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
32
 import com.dmdirc.events.UserErrorEvent;
29
 import com.dmdirc.events.UserErrorEvent;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
30
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
34
 import com.dmdirc.logger.ErrorLevel;
31
 import com.dmdirc.logger.ErrorLevel;
104
      */
101
      */
105
     public DataLoaderWorker(
102
     public DataLoaderWorker(
106
             final Downloader downloader,
103
             final Downloader downloader,
107
-            @GlobalConfig final AggregateConfigProvider globalConfig,
104
+            final AggregateConfigProvider globalConfig,
108
             final URLBuilder urlBuilder,
105
             final URLBuilder urlBuilder,
109
             final InstallWorkerFactory workerFactory,
106
             final InstallWorkerFactory workerFactory,
110
             final UpdateManager updateManager,
107
             final UpdateManager updateManager,
111
-            @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
108
+            final String tempDirectory,
112
             final DMDircMBassador eventBus,
109
             final DMDircMBassador eventBus,
113
             final AddonTable table,
110
             final AddonTable table,
114
             final boolean download,
111
             final boolean download,

+ 3
- 5
ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java 查看文件

25
 import com.dmdirc.DMDircMBassador;
25
 import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.actions.ActionManager;
26
 import com.dmdirc.actions.ActionManager;
27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
29
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
30
 import com.dmdirc.plugins.PluginManager;
28
 import com.dmdirc.plugins.PluginManager;
31
 import com.dmdirc.util.io.Downloader;
29
 import com.dmdirc.util.io.Downloader;
32
 
30
 
56
 
54
 
57
     public InstallWorker(
55
     public InstallWorker(
58
             final Downloader downloader,
56
             final Downloader downloader,
59
-            @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
60
-            @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
61
-            @Directory(DirectoryType.THEMES) final String themeDirectory,
57
+            final String tempDirectory,
58
+            final String pluginDirectory,
59
+            final String themeDirectory,
62
             final PluginManager pluginManager,
60
             final PluginManager pluginManager,
63
             final DMDircMBassador eventBus,
61
             final DMDircMBassador eventBus,
64
             final AddonInfo info,
62
             final AddonInfo info,

+ 3
- 6
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java 查看文件

22
 
22
 
23
 package com.dmdirc.addons.ui_swing.dialogs.url;
23
 package com.dmdirc.addons.ui_swing.dialogs.url;
24
 
24
 
25
-import com.dmdirc.ClientModule.GlobalConfig;
26
-import com.dmdirc.ClientModule.UserConfig;
27
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
25
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
28
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
26
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
29
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
27
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
30
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
31
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
32
 import com.dmdirc.interfaces.config.ConfigProvider;
29
 import com.dmdirc.interfaces.config.ConfigProvider;
33
 import com.dmdirc.ui.core.util.URLHandler;
30
 import com.dmdirc.ui.core.util.URLHandler;
68
      */
65
      */
69
     public URLDialog(
66
     public URLDialog(
70
             final URI url,
67
             final URI url,
71
-            @GlobalConfig final AggregateConfigProvider global,
72
-            @UserConfig final ConfigProvider config,
73
-            @MainWindow final Window parentWindow,
68
+            final AggregateConfigProvider global,
69
+            final ConfigProvider config,
70
+            final Window parentWindow,
74
             final URLHandler urlHandler) {
71
             final URLHandler urlHandler) {
75
         super(parentWindow, ModalityType.MODELESS);
72
         super(parentWindow, ModalityType.MODELESS);
76
 
73
 

正在加载...
取消
保存