소스 검색

Migrate to new @UserConfig annotation.

pull/496/head
Chris Smith 7 년 전
부모
커밋
51ebb842be

+ 1
- 1
freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDManager.java 파일 보기

@@ -22,8 +22,8 @@
22 22
 
23 23
 package com.dmdirc.addons.freedesktop_notifications;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.config.GlobalConfig;
26
+import com.dmdirc.config.UserConfig;
27 27
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
28 28
 import com.dmdirc.config.prefs.PreferencesCategory;
29 29
 import com.dmdirc.config.prefs.PreferencesDialogModel;

+ 1
- 1
logging/src/main/java/com/dmdirc/addons/logging/LoggingModule.java 파일 보기

@@ -23,10 +23,10 @@
23 23
 package com.dmdirc.addons.logging;
24 24
 
25 25
 import com.dmdirc.ClientModule;
26
-import com.dmdirc.ClientModule.UserConfig;
27 26
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
28 27
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
29 28
 import com.dmdirc.config.GlobalConfig;
29
+import com.dmdirc.config.UserConfig;
30 30
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
31 31
 import com.dmdirc.interfaces.config.ConfigProvider;
32 32
 import com.dmdirc.plugins.PluginDomain;

+ 2
- 5
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java 파일 보기

@@ -22,29 +22,26 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.addonpanel;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
+import com.dmdirc.addons.ui_swing.components.IconManager;
27 27
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
28 28
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
29
+import com.dmdirc.config.UserConfig;
29 30
 import com.dmdirc.events.PluginRefreshEvent;
30 31
 import com.dmdirc.interfaces.EventBus;
31 32
 import com.dmdirc.interfaces.config.ConfigProvider;
32 33
 import com.dmdirc.plugins.PluginInfo;
33 34
 import com.dmdirc.plugins.PluginManager;
34
-import com.dmdirc.addons.ui_swing.components.IconManager;
35 35
 import com.dmdirc.updater.manager.CachingUpdateManager;
36
-
37 36
 import java.awt.Window;
38 37
 import java.util.ArrayList;
39 38
 import java.util.Collection;
40 39
 import java.util.Collections;
41 40
 import java.util.Comparator;
42 41
 import java.util.List;
43
-
44 42
 import javax.inject.Inject;
45 43
 import javax.swing.JTable;
46 44
 import javax.swing.table.DefaultTableModel;
47
-
48 45
 import net.engio.mbassy.listener.Handler;
49 46
 
50 47
 /**

+ 2
- 4
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java 파일 보기

@@ -22,22 +22,20 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.addonpanel;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
+import com.dmdirc.addons.ui_swing.components.IconManager;
27 27
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
28 28
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
29
+import com.dmdirc.config.UserConfig;
29 30
 import com.dmdirc.interfaces.EventBus;
30 31
 import com.dmdirc.interfaces.config.ConfigProvider;
31
-import com.dmdirc.addons.ui_swing.components.IconManager;
32 32
 import com.dmdirc.ui.themes.Theme;
33 33
 import com.dmdirc.ui.themes.ThemeManager;
34 34
 import com.dmdirc.updater.manager.CachingUpdateManager;
35
-
36 35
 import java.awt.Window;
37 36
 import java.util.ArrayList;
38 37
 import java.util.Collections;
39 38
 import java.util.List;
40
-
41 39
 import javax.inject.Inject;
42 40
 import javax.swing.JTable;
43 41
 import javax.swing.table.DefaultTableModel;

+ 1
- 1
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java 파일 보기

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
27 26
 import com.dmdirc.addons.ui_swing.components.IconManager;
28 27
 import com.dmdirc.addons.ui_swing.components.PackingTable;
@@ -30,6 +29,7 @@ import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
30 29
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
31 30
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
32 31
 import com.dmdirc.config.GlobalConfig;
32
+import com.dmdirc.config.UserConfig;
33 33
 import com.dmdirc.config.prefs.PreferencesInterface;
34 34
 import com.dmdirc.config.validators.URLProtocolValidator;
35 35
 import com.dmdirc.interfaces.config.AggregateConfigProvider;

+ 1
- 1
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java 파일 보기

@@ -22,10 +22,10 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
27 26
 import com.dmdirc.addons.ui_swing.components.PackingTable;
28 27
 import com.dmdirc.config.GlobalConfig;
28
+import com.dmdirc.config.UserConfig;
29 29
 import com.dmdirc.config.prefs.PreferencesInterface;
30 30
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
31 31
 import com.dmdirc.interfaces.config.ConfigChangeListener;

+ 1
- 2
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/url/URLDialogFactory.java 파일 보기

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.url;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
26 26
 import com.dmdirc.config.GlobalConfig;
27
+import com.dmdirc.config.UserConfig;
27 28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
28 29
 import com.dmdirc.interfaces.config.ConfigProvider;
29 30
 import com.dmdirc.ui.core.util.URLHandler;
@@ -31,8 +32,6 @@ import java.awt.Window;
31 32
 import java.net.URI;
32 33
 import javax.inject.Inject;
33 34
 
34
-import static com.dmdirc.ClientModule.UserConfig;
35
-
36 35
 /**
37 36
  * Factory for {@link URLDialogFactory}s
38 37
  */

+ 3
- 6
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/DialogModule.java 파일 보기

@@ -22,7 +22,6 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.injection;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
26 25
 import com.dmdirc.addons.ui_swing.MainFrame;
27 26
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
28 27
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
@@ -41,6 +40,7 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
41 40
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
42 41
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
43 42
 import com.dmdirc.commandparser.auto.AutoCommandManager;
43
+import com.dmdirc.config.UserConfig;
44 44
 import com.dmdirc.config.prefs.PreferencesManager;
45 45
 import com.dmdirc.interfaces.CommandController;
46 46
 import com.dmdirc.interfaces.Connection;
@@ -66,17 +66,14 @@ import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
66 66
 import com.dmdirc.ui.core.profiles.CoreProfilesDialogModel;
67 67
 import com.dmdirc.ui.input.TabCompleterUtils;
68 68
 import com.dmdirc.ui.messages.ColourManagerFactory;
69
-
69
+import dagger.Module;
70
+import dagger.Provides;
70 71
 import java.awt.Window;
71 72
 import java.awt.datatransfer.Clipboard;
72
-
73 73
 import javax.inject.Provider;
74 74
 import javax.inject.Qualifier;
75 75
 import javax.inject.Singleton;
76 76
 
77
-import dagger.Module;
78
-import dagger.Provides;
79
-
80 77
 /**
81 78
  * Facilitates injection of dialogs.
82 79
  */

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

@@ -23,7 +23,6 @@
23 23
 package com.dmdirc.addons.ui_swing.injection;
24 24
 
25 25
 import com.dmdirc.ClientModule;
26
-import com.dmdirc.ClientModule.UserConfig;
27 26
 import com.dmdirc.addons.ui_swing.Apple;
28 27
 import com.dmdirc.addons.ui_swing.MainFrame;
29 28
 import com.dmdirc.addons.ui_swing.NoopClipboard;
@@ -53,6 +52,7 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
53 52
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
54 53
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
55 54
 import com.dmdirc.config.GlobalConfig;
55
+import com.dmdirc.config.UserConfig;
56 56
 import com.dmdirc.config.prefs.PreferencesDialogModel;
57 57
 import com.dmdirc.interfaces.ConnectionManager;
58 58
 import com.dmdirc.interfaces.EventBus;

+ 2
- 4
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java 파일 보기

@@ -22,22 +22,20 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
24 24
 
25
-import com.dmdirc.ClientModule.UserConfig;
25
+import com.dmdirc.addons.ui_swing.components.IconManager;
26 26
 import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
27 27
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
28 28
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
29 29
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
30 30
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
31
+import com.dmdirc.config.UserConfig;
31 32
 import com.dmdirc.interfaces.config.ConfigProvider;
32 33
 import com.dmdirc.interfaces.ui.FirstRunWizard;
33 34
 import com.dmdirc.plugins.CorePluginExtractor;
34
-import com.dmdirc.addons.ui_swing.components.IconManager;
35
-
36 35
 import java.awt.Dialog.ModalityType;
37 36
 import java.awt.Dimension;
38 37
 import java.awt.Window;
39 38
 import java.util.ArrayList;
40
-
41 39
 import javax.inject.Inject;
42 40
 import javax.inject.Singleton;
43 41
 

Loading…
취소
저장