More tidying/dependencies/etc.

Change-Id: I828f2ea9980123409a7d33efc787cb3b6d64d441
Reviewed-on: http://gerrit.dmdirc.com/3060
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.commands.Input;
 import com.dmdirc.addons.ui_swing.commands.PopInCommand;
 import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
-import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
@@ -57,9 +56,7 @@ import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.Version;
-import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -110,8 +107,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final IconManager iconManager;
     /** Plugin manager. */
     private final PluginManager pluginManager;
-    /** Theme manager to use. */
-    private final ThemeManager themeManager;
     /** Apple handler, deals with Mac specific code. */
     private final Apple apple;
     /** The colour manager to use to parse colours. */
@@ -141,7 +136,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final IdentityFactory identityFactory,
             final PluginManager pluginManager,
             final ServerManager serverManager,
-            final ThemeManager themeManager,
             final URLBuilder urlBuilder,
             final ColourManager colourManager,
             final EventBus eventBus) {
@@ -149,7 +143,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.identityManager = identityManager;
         this.identityFactory = identityFactory;
         this.pluginManager = pluginManager;
-        this.themeManager = themeManager;
         this.colourManager = colourManager;
         this.urlBuilder = urlBuilder;
 
@@ -197,11 +190,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return pluginManager;
     }
 
-    @Deprecated
-    public ThemeManager getThemeManager() {
-        return themeManager;
-    }
-
     @Deprecated
     public Apple getApple() {
         return apple;
@@ -463,7 +451,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             @Override
             public void run() {
                 getMainFrame().setVisible(true);
-                errorDialog = new ErrorListDialog(SwingController.this);
+                errorDialog = new ErrorListDialog(getMainFrame(), getIconManager());
             }
         });
 
@@ -852,14 +840,4 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getUrlHandler();
     }
 
-    @Deprecated
-    public DataLoaderWorkerFactory getDataLoaderWorkerFactory() {
-        return swingManager.getDataLoaderWorkerFactory();
-    }
-
-    @Deprecated
-    public CachingUpdateManager getCachingUpdateManager() {
-        return swingManager.getCachingUpdateManager();
-    }
-
 }

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
@@ -40,7 +39,6 @@ import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.updater.manager.CachingUpdateManager;
 
 import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
@@ -79,12 +77,6 @@ public class SwingManager {
     /** The key listener that supports dialogs. */
     private final DialogKeyListener dialogKeyListener;
 
-    /** Factory used to create data loader workers. */
-    private final DataLoaderWorkerFactory dataLoaderWorkerFactory;
-
-    /** The update manager to use. */
-    private final CachingUpdateManager cachingUpdateManager;
-
     /** Provider of first run executors. */
     private final Provider<FirstRunWizardExecutor> firstRunExecutor;
 
@@ -117,8 +109,6 @@ public class SwingManager {
      * @param ctrlTabManager The window manager that handles ctrl+tab behaviour.
      * @param urlHandler The URL handler to use.
      * @param dialogKeyListener The key listener that supports dialogs.
-     * @param dataLoaderWorkerFactory Factory used to create data loader workers.
-     * @param cachingUpdateManager Update manager to use.
      * @param firstRunExecutor A provider of first run executors.
      * @param prefsComponentFactory The factory to use to create prefs components.
      * @param prefsDialogProvider Provider of prefs dialogs.
@@ -139,8 +129,6 @@ public class SwingManager {
             final CtrlTabWindowManager ctrlTabManager,
             final URLHandler urlHandler,
             final DialogKeyListener dialogKeyListener,
-            final DataLoaderWorkerFactory dataLoaderWorkerFactory,
-            final CachingUpdateManager cachingUpdateManager,
             final Provider<FirstRunWizardExecutor> firstRunExecutor,
             final PrefsComponentFactory prefsComponentFactory,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
@@ -155,8 +143,6 @@ public class SwingManager {
         this.statusBarManager = statusBarManager;
         this.urlHandler = urlHandler;
         this.dialogKeyListener = dialogKeyListener;
-        this.dataLoaderWorkerFactory = dataLoaderWorkerFactory;
-        this.cachingUpdateManager = cachingUpdateManager;
         this.firstRunExecutor = firstRunExecutor;
         this.prefsComponentFactory = prefsComponentFactory;
         this.prefsDialogProvider = prefsDialogProvider;
@@ -205,16 +191,6 @@ public class SwingManager {
         return firstRunExecutor.get();
     }
 
-    @Deprecated
-    public DataLoaderWorkerFactory getDataLoaderWorkerFactory() {
-        return dataLoaderWorkerFactory;
-    }
-
-    @Deprecated
-    public CachingUpdateManager getCachingUpdateManager() {
-        return cachingUpdateManager;
-    }
-
     @Deprecated
     public PrefsComponentFactory getPrefsComponentFactory() {
         return prefsComponentFactory;

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.error;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
@@ -76,17 +76,18 @@ public final class ErrorListDialog extends StandardDialog implements
     /**
      * Creates a new instance of ErrorListDialog.
      *
-     * @param controller Swing controller
+     * @param mainFrame The parent window.
+     * @param iconManager The manager to use to load icons.
      */
-    public ErrorListDialog(final SwingController controller) {
-        super(controller.getMainFrame(), ModalityType.MODELESS);
+    public ErrorListDialog(final MainFrame mainFrame, final IconManager iconManager) {
+        super(mainFrame, ModalityType.MODELESS);
 
         setTitle("Error list");
         setMinimumSize(new Dimension(600, 550));
 
         tableModel = new ErrorTableModel();
 
-        initComponents(controller.getIconManager());
+        initComponents(iconManager);
         layoutComponents();
         initListeners();
 

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

@@ -22,16 +22,19 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
+import com.dmdirc.updater.manager.CachingUpdateManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -71,23 +74,38 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     private JButton checkNow;
     /** Update channel. */
     private JComboBox updateChannel;
-    /** Swing controller. */
-    private final SwingController controller;
     /** The prefs dialog that will be hosting the panel. */
     private final SwingPreferencesDialog prefsDialog;
+    /** The configuration to write settings changes to. */
+    private final ConfigProvider userConfig;
+    /** The configuration to read global settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** The manager to read update information from. */
+    private final CachingUpdateManager updateManager;
+    /** Controller to pass to the update checker. */
+    private final IdentityController identityController;
 
     /**
      * Instantiates a new update config panel.
      *
-     * @param controller Swing controller
      * @param prefsDialog The prefs dialog that will be hosting the panel.
+     * @param userConfig The configuration to write settings changes to.
+     * @param globalConfig The configuration to read global settings from.
+     * @param updateManager The manager to read update information from.
+     * @param identityController Controller to pass to the update checker.
      */
     @Inject
     public UpdateConfigPanel(
-            final SwingController controller,
-            final SwingPreferencesDialog prefsDialog) {
-        this.controller = controller;
+            final SwingPreferencesDialog prefsDialog,
+            @UserConfig final ConfigProvider userConfig,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final CachingUpdateManager updateManager,
+            final IdentityController identityController) {
         this.prefsDialog = prefsDialog;
+        this.userConfig = userConfig;
+        this.globalConfig = globalConfig;
+        this.updateManager = updateManager;
+        this.identityController = identityController;
 
         initComponents();
         addListeners();
@@ -97,18 +115,16 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void save() {
-        final ConfigProvider identity = controller.getGlobalIdentity();
-        identity.setOption("updater", "enable", enable.isSelected());
-
-        identity.setOption("updater", "channel", updateChannel
+        userConfig.setOption("updater", "enable", enable.isSelected());
+        userConfig.setOption("updater", "channel", updateChannel
                 .getSelectedItem().toString());
 
         for (int i = 0; i < tableModel.getRowCount(); i++) {
             final String componentName = tableModel.getComponent(i).getName();
             if ((Boolean) tableModel.getValueAt(i, 1)) {
-                identity.unsetOption("updater", "enable-" + componentName);
+                userConfig.unsetOption("updater", "enable-" + componentName);
             } else {
-                identity.setOption("updater", "enable-" + componentName, false);
+                userConfig.setOption("updater", "enable-" + componentName, false);
             }
         }
     }
@@ -117,23 +133,18 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * Initialises the components.
      */
     private void initComponents() {
-        final AggregateConfigProvider config = controller.getGlobalConfig();
         enable = new JCheckBox();
         scrollPane = new JScrollPane();
-        tableModel = new UpdateTableModel(
-                controller.getCachingUpdateManager(),
-                controller.getCachingUpdateManager().getComponents());
+        tableModel = new UpdateTableModel(updateManager, updateManager.getComponents());
         table = new PackingTable(tableModel, scrollPane);
         checkNow = new JButton("Check now");
-        checkNow.setEnabled(config.getOptionBool("updater", "enable"));
-        updateChannel = new JComboBox(new DefaultComboBoxModel(UpdateChannel.
-                values()));
+        checkNow.setEnabled(globalConfig.getOptionBool("updater", "enable"));
+        updateChannel = new JComboBox(new DefaultComboBoxModel(UpdateChannel.values()));
 
-        enable.setSelected(config.getOptionBool("updater", "enable"));
+        enable.setSelected(globalConfig.getOptionBool("updater", "enable"));
         UpdateChannel channel = UpdateChannel.NONE;
         try {
-            channel = UpdateChannel.valueOf(
-                    config.getOption("updater", "channel"));
+            channel = UpdateChannel.valueOf(globalConfig.getOption("updater", "channel"));
         } catch (IllegalArgumentException e) {
             Logger.userError(ErrorLevel.LOW, "Invalid setting for update "
                     + "channel, defaulting to none.");
@@ -147,8 +158,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      */
     private void addListeners() {
         checkNow.addActionListener(this);
-        controller.getGlobalConfig().addChangeListener("updater",
-                "enable", this);
+        globalConfig.addChangeListener("updater", "enable", this);
         enable.addActionListener(this);
     }
 
@@ -175,16 +185,13 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         if (enable == e.getSource()) {
             checkNow.setEnabled(enable.isSelected());
         } else {
-            UpdateChecker.checkNow(
-                    controller.getCachingUpdateManager(),
-                    controller.getIdentityManager());
+            UpdateChecker.checkNow(updateManager, identityController);
         }
     }
 
     /** {@inheritDoc} */
     @Override
-    public void configChanged(final String domain, final    String key) {
-        checkNow.setEnabled(controller.getGlobalConfig().getOptionBool(
-                "updater", "enable"));
+    public void configChanged(final String domain, final String key) {
+        checkNow.setEnabled(globalConfig.getOptionBool("updater", "enable"));
     }
 }