Don't annotate IconManager with @GlobalConfig

systray/src/com/dmdirc/addons/systray/SystrayManager.java

@@ -66,7 +66,7 @@ public class SystrayManager implements ActionListener, MouseListener {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SystrayPlugin.class) final String domain,
             final MainFrame mainFrame,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final DMDircMBassador eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;

ui_swing/src/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -89,7 +89,7 @@ public final class PrefsComponentFactory {
     @Inject
     public PrefsComponentFactory(
             final DMDircMBassador eventBus,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @GlobalConfig final ColourManager colourManager) {
         this.iconManager = iconManager;
         this.colourManager = colourManager;

ui_swing/src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -77,7 +77,7 @@ public class MDIBar extends JPanel implements ConfigChangeListener {
     @Inject
     public MDIBar(
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
             final SwingEventBus eventBus) {

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -80,7 +79,7 @@ public class PluginPanel extends AddonPanel {
             @MainWindow final Window parentWindow,
             final PluginManager pluginManager,
             final DataLoaderWorkerFactory workerFactory,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig) {
         super(parentWindow, workerFactory, eventBus);

ui_swing/src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -75,7 +74,7 @@ public class ThemePanel extends AddonPanel {
             @MainWindow final Window parentWindow,
             final ThemeManager themeManager,
             final DataLoaderWorkerFactory workerFactory,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig,
             final DMDircMBassador eventBus) {

ui_swing/src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -90,9 +90,9 @@ public class SwingInputField extends JComponent implements InputField,
     public SwingInputField(
             @MainWindow final Window mainWindow,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @GlobalConfig final ColourManager colourManager) {
-        // TODO: Add IconManagerFactory, use ColourManagerFactory and pass in the parent container
+        // TODO: Use ColourManagerFactory and pass in the parent container
         this.parentWindow = mainWindow;
         this.globalConfig = globalConfig;
         this.iconManager = iconManager;

ui_swing/src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.Channel;
-import com.dmdirc.ClientModule;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -76,7 +75,7 @@ public class ChannelMenu extends JMenu implements MenuListener {
             final ActiveFrameManager activeFrameManager,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
             final MainFrame mainFrame,
-            @ClientModule.GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final DialogProvider<ChannelListDialog> channelListDialogProvider) {
         super("Channel");
         this.mainFrame = mainFrame;

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.dialogs.errors.ErrorsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
@@ -87,7 +86,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
      */
     @Inject
     public ErrorPanel(
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @MainWindow final Window parentWindow,
             final Provider<SwingStatusBar> statusBar,
             final DialogProvider<ErrorsDialog> errorListDialogProvider,

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.dialogs.feedback.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
@@ -68,7 +67,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
      */
     @Inject
     public FeedbackNag(
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final DialogProvider<FeedbackDialog> feedbackDialogProvider,
             final DMDircMBassador eventBus) {
         this.feedbackDialogProvider = feedbackDialogProvider;

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
@@ -71,7 +70,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> {
     private Optional<Connection> activeConnection;
 
     @Inject
-    public InviteLabel(final DMDircMBassador eventBus, @GlobalConfig final IconManager iconManager,
+    public InviteLabel(final DMDircMBassador eventBus, final IconManager iconManager,
             final MainFrame mainFrame, final SwingEventBus swingEventBus) {
         super(new JLabel());
 

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -91,7 +91,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
     @Inject
     public MessageLabel(
             @GlobalConfig final AggregateConfigProvider config,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @MainWindow final Window parentWindow,
             final DMDircMBassador eventBus) {
         super(new MigLayout("fill, ins 0, gap 0  0"));

ui_swing/src/com/dmdirc/addons/ui_swing/components/statusbar/UpdaterLabel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
@@ -70,7 +69,7 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements UpdateM
      */
     @Inject
     public UpdaterLabel(
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @MainWindow final Window parentWindow,
             final CachingUpdateManager updateManager,
             final DialogProvider<SwingUpdaterDialog> updaterDialogProvider,

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.aliases;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -57,7 +56,7 @@ public class AliasManagerDialog extends StandardDialog {
 
     @Inject
     public AliasManagerDialog(@MainWindow final Window mainFrame, final AliasDialogModel model,
-            @GlobalConfig final IconManager iconManager, final DMDircMBassador eventBus) {
+            final IconManager iconManager, final DMDircMBassador eventBus) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         final AliasManagerLinker linker = new AliasManagerLinker(model, this, iconManager);
         setTitle("Alias Manager");

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/errors/ErrorsDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.errors;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.GenericTableModel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
@@ -73,7 +72,7 @@ public class ErrorsDialog extends StandardDialog {
      */
     @Inject
     public ErrorsDialog(@MainWindow final Window owner,
-            final ErrorsDialogModel model, @GlobalConfig final IconManager iconManager) {
+            final ErrorsDialogModel model, final IconManager iconManager) {
         super(owner, ModalityType.MODELESS);
         this.model = model;
         this.iconManager = iconManager;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/feedback/FeedbackDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.feedback;
 
-import com.dmdirc.ClientModule;
 import com.dmdirc.addons.ui_swing.components.NoBorderJCheckBox;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
@@ -52,7 +51,7 @@ public class FeedbackDialog extends StandardDialog {
     @Inject
     public FeedbackDialog(@MainWindow final Window mainFrame,
             final FeedbackDialogModel model,
-            @ClientModule.GlobalConfig final IconManager iconManager) {
+            final IconManager iconManager) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         final FeedbackModelLinker linker = new FeedbackModelLinker(this, model);
         linker.init();

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/newserver/NewServerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.newserver;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.NoBorderJCheckBox;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidationFactory;
@@ -54,7 +53,7 @@ public class NewServerDialog extends StandardDialog {
 
     @Inject
     public NewServerDialog(@MainWindow final Window mainFrame, final NewServerDialogModel model,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             final DialogProvider<ProfileManagerDialog> profileManagerDialog) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         final NewServerLinker linker = new NewServerLinker(model, this);

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

@@ -53,7 +53,7 @@ public class PasteDialogFactory {
 
     @Inject
     public PasteDialogFactory(
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @GlobalConfig final AggregateConfigProvider config,
             final ServiceManager serviceManager,
             final CommandController commandController,

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryPanel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -88,7 +87,7 @@ public class CategoryPanel extends JPanel {
     public CategoryPanel(
             final DMDircMBassador eventBus,
             final PrefsComponentFactory factory,
-            @GlobalConfig final IconManager iconManager) {
+            final IconManager iconManager) {
         this(eventBus, factory, iconManager, null);
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
@@ -98,7 +97,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     @Inject
     public SwingPreferencesDialog(
             @MainWindow final Window parentWindow,
-            @GlobalConfig final IconManager iconManager,
+            final IconManager iconManager,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
             final Provider<CategoryPanel> categoryPanelProvider,

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -104,7 +104,7 @@ public class URLConfigPanel extends JPanel implements
             @MainWindow final Window parentWindow,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userConfig,
-            @GlobalConfig final IconManager iconManager) {
+            final IconManager iconManager) {
 
         this.parentWindow = parentWindow;
         this.globalConfig = globalConfig;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profile;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -92,7 +91,7 @@ public class ProfileManagerDialog extends StandardDialog {
      */
     @Inject
     public ProfileManagerDialog(@MainWindow final Window mainFrame, final ProfilesDialogModel model,
-            @GlobalConfig final IconManager iconManager) {
+            final IconManager iconManager) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         setTitle("Profile Manager");
         this.model = model;

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -114,7 +114,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             @PluginDomain(SwingController.class) final String domain,
             final DMDircMBassador eventBus,
             final SwingEventBus swingEventBus,
-            @GlobalConfig final IconManager iconManager) {
+            final IconManager iconManager) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.nodes = new HashMap<>();

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
-import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.addons.ui_swing.dialogs.profile.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
@@ -67,7 +66,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     @Inject
     public SwingFirstRunWizard(@MainWindow final Window parentWindow,
             @UserConfig final ConfigProvider config,
-            final CorePluginExtractor pluginExtractor, @GlobalConfig final IconManager iconManager,
+            final CorePluginExtractor pluginExtractor, final IconManager iconManager,
             final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
         this.corePluginExtractor = pluginExtractor;
         this.config = config;