Browse Source

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 years ago
parent
commit
dba8ac3ee3

+ 2
- 5
ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java View File

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

+ 3
- 5
ui_swing/src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java View File

@@ -25,8 +25,6 @@ package com.dmdirc.addons.ui_swing.components.addonbrowser;
25 25
 import com.dmdirc.DMDircMBassador;
26 26
 import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28
-import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
29
-import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
30 28
 import com.dmdirc.plugins.PluginManager;
31 29
 import com.dmdirc.util.io.Downloader;
32 30
 
@@ -56,9 +54,9 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
56 54
 
57 55
     public InstallWorker(
58 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 60
             final PluginManager pluginManager,
63 61
             final DMDircMBassador eventBus,
64 62
             final AddonInfo info,

+ 3
- 6
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java View File

@@ -22,12 +22,9 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.url;
24 24
 
25
-import com.dmdirc.ClientModule.GlobalConfig;
26
-import com.dmdirc.ClientModule.UserConfig;
27 25
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
28 26
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
29 27
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
30
-import com.dmdirc.addons.ui_swing.injection.MainWindow;
31 28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
32 29
 import com.dmdirc.interfaces.config.ConfigProvider;
33 30
 import com.dmdirc.ui.core.util.URLHandler;
@@ -68,9 +65,9 @@ public class URLDialog extends StandardDialog implements ActionListener {
68 65
      */
69 66
     public URLDialog(
70 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 71
             final URLHandler urlHandler) {
75 72
         super(parentWindow, ModalityType.MODELESS);
76 73
 

Loading…
Cancel
Save