Even more tidying.

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

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -82,6 +82,7 @@ public class ServerListDialog extends StandardDialog implements
      * @param performWrapper The wrapper to use for the perform tab
      * @param serverListModel The model to use for the dialog.
      * @param mainFrame The main frame that owns the dialog.
+     * @param settingsPanel The panel to use for settings.
      */
     @Inject
     public ServerListDialog(
@@ -89,7 +90,8 @@ public class ServerListDialog extends StandardDialog implements
             final URLHandler urlHandler,
             final PerformWrapper performWrapper,
             final ServerListModel serverListModel,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            final Settings settingsPanel) {
         super(mainFrame, ModalityType.MODELESS);
 
         setTitle("Server List");
@@ -112,7 +114,7 @@ public class ServerListDialog extends StandardDialog implements
                 null)));
         profileLayer = new JXLayer<>(new Profiles(model, controller), profileLock);
         performLayer = new JXLayer<>(new Perform(controller, performWrapper, model), performLock);
-        settingsLayer = new JXLayer<>(new Settings(controller, model), settingsLock);
+        settingsLayer = new JXLayer<>(settingsPanel, settingsLock);
         infoLayer = new JXLayer<>(new Info(model, urlHandler), infoLock);
         help = new Help();
         lockLayers();

src/com/dmdirc/addons/serverlistdialog/Settings.java

@@ -22,19 +22,23 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
-import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.ui.IconManager;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
@@ -55,19 +59,32 @@ public class Settings extends JPanel implements ServerListListener {
     private final Map<ServerGroupItem, SettingsPanel> panels = new HashMap<>();
     /** Platform border. */
     private final Border border;
-    /** Swing controller. */
-    private final SwingController controller;
+    /** Manager to use to retrieve icons. */
+    private final IconManager iconManager;
+    /** Factory to use to produce preference components. */
+    private final PrefsComponentFactory componentFactory;
+    /** Factory to use to produce identities. */
+    private final IdentityFactory identityFactory;
 
     /**
      * Instantiates a new settings panel.
      *
-     * @param controller Swing controller
      * @param model Backing model
+     * @param iconManager Manager to use to retrieve icons.
+     * @param componentFactory Factory to use to produce preference components.
+     * @param identityFactory Factory to use to produce identities.
      */
-    public Settings(final SwingController controller, final ServerListModel model) {
+    @Inject
+    public Settings(
+            final ServerListModel model,
+            @GlobalConfig final IconManager iconManager,
+            final PrefsComponentFactory componentFactory,
+            final IdentityFactory identityFactory) {
         super();
-        this.controller = controller;
         this.model = model;
+        this.iconManager = iconManager;
+        this.componentFactory = componentFactory;
+        this.identityFactory = identityFactory;
         addListeners();
         border = UIManager.getBorder("TitledBorder.border");
         setBorder(BorderFactory.createTitledBorder(border, "Network Settings"));
@@ -111,14 +128,12 @@ public class Settings extends JPanel implements ServerListListener {
     private SettingsPanel getSettingsPanel(final ServerGroupItem item) {
         if (!panels.containsKey(item)) {
             if (item instanceof ServerGroup) {
-                panels.put(item, new SettingsPanel(controller.getIconManager(), controller.getPrefsComponentFactory(), "", false));
+                panels.put(item, new SettingsPanel(iconManager, componentFactory, "", false));
                 addSettings(panels.get(item), new ConfigManager("irc", "",
                     item.getGroup().getNetwork(), item.getName()),
-                    controller.getIdentityFactory().createServerConfig(item.getName()));
-            } else if (item == null) {
-                panels.put(null, new SettingsPanel(controller.getIconManager(), controller.getPrefsComponentFactory(), "", false));
+                    identityFactory.createServerConfig(item.getName()));
             } else {
-                panels.put(item, new SettingsPanel(controller.getIconManager(), controller.getPrefsComponentFactory(), "", false));
+                panels.put(item, new SettingsPanel(iconManager, componentFactory, "", false));
             }
         }
         return panels.get(item);

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

@@ -180,11 +180,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return iconManager;
     }
 
-    @Deprecated
-    public PrefsComponentFactory getPrefsComponentFactory() {
-        return swingManager.getPrefsComponentFactory();
-    }
-
     @Deprecated
     public PluginManager getPluginManager() {
         return pluginManager;

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

@@ -80,9 +80,6 @@ public class SwingManager {
     /** Provider of first run executors. */
     private final Provider<FirstRunWizardExecutor> firstRunExecutor;
 
-    /** The factory to use to create prefs components. */
-    private final PrefsComponentFactory prefsComponentFactory;
-
     /** Provider of prefs dialogs. */
     private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
     /** Provider of server settings dialogs. */
@@ -110,7 +107,6 @@ public class SwingManager {
      * @param urlHandler The URL handler to use.
      * @param dialogKeyListener The key listener that supports dialogs.
      * @param firstRunExecutor A provider of first run executors.
-     * @param prefsComponentFactory The factory to use to create prefs components.
      * @param prefsDialogProvider Provider of prefs dialogs.
      * @param serverSettingsDialogProvider Provider of server settings dialogs.
      * @param channelSettingsDialogProvider Provider of channel settings dialogs.
@@ -130,7 +126,6 @@ public class SwingManager {
             final URLHandler urlHandler,
             final DialogKeyListener dialogKeyListener,
             final Provider<FirstRunWizardExecutor> firstRunExecutor,
-            final PrefsComponentFactory prefsComponentFactory,
             final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
             final KeyedDialogProvider<Server, ServerSettingsDialog> serverSettingsDialogProvider,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> channelSettingsDialogProvider,
@@ -144,7 +139,6 @@ public class SwingManager {
         this.urlHandler = urlHandler;
         this.dialogKeyListener = dialogKeyListener;
         this.firstRunExecutor = firstRunExecutor;
-        this.prefsComponentFactory = prefsComponentFactory;
         this.prefsDialogProvider = prefsDialogProvider;
         this.serverSettingsDialogProvider = serverSettingsDialogProvider;
         this.channelSettingsDialogProvider = channelSettingsDialogProvider;
@@ -191,11 +185,6 @@ public class SwingManager {
         return firstRunExecutor.get();
     }
 
-    @Deprecated
-    public PrefsComponentFactory getPrefsComponentFactory() {
-        return prefsComponentFactory;
-    }
-
     @Deprecated
     public DialogProvider<SwingPreferencesDialog> getPrefsDialogProvider() {
         return prefsDialogProvider;

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -86,7 +86,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      *
      * @param controller Swing controller
      * @param owner WritableFrameContainer owning this frame.
-     * @param controller Swing controller
      */
     public InputTextFrame(final SwingController controller,
             final WritableFrameContainer owner) {
@@ -286,8 +285,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
     /** Checks and pastes text. */
     public void doPaste() {
-        String clipboard = null;
-
         try {
             if (!Toolkit.getDefaultToolkit().getSystemClipboard().
                     isDataFlavorAvailable(DataFlavor.stringFlavor)) {
@@ -301,9 +298,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         try {
             //get the contents of the input field and combine it with the
             //clipboard
-            clipboard = (String) Toolkit.getDefaultToolkit().
-                    getSystemClipboard().getData(DataFlavor.stringFlavor);
-            doPaste(clipboard);
+            doPaste((String) Toolkit.getDefaultToolkit()
+                    .getSystemClipboard().getData(DataFlavor.stringFlavor));
         } catch (final IOException ex) {
             Logger.userError(ErrorLevel.LOW,
                     "Unable to get clipboard contents: " + ex.getMessage());

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -37,6 +38,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -84,8 +86,10 @@ public class CategoryPanel extends JPanel {
      * @param iconManager Icon manager
      * @param parent Parent window
      */
-    public CategoryPanel(final PrefsComponentFactory factory,
-            final IconManager iconManager,
+    @Inject
+    public CategoryPanel(
+            final PrefsComponentFactory factory,
+            @GlobalConfig final IconManager iconManager,
             final SwingPreferencesDialog parent) {
         this(factory, parent, iconManager, null);
     }

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

@@ -80,24 +80,28 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     private final SwingController controller;
     /** The provider to use for restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
+    /** The provider to use to produce a category panel. */
+    private final Provider<CategoryPanel> categoryPanelProvider;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
      *
      * @param controller The controller which owns this preferences window.
      * @param restartDialogProvider The provider to use for restart dialogs.
-     * @param actionsManager Actions manager to use.
      * @param dialogModelProvider The provider to use to get a dialog model.
+     * @param categoryPanelProvider The provider to use to produce a category panel.
      */
     @Inject
     public SwingPreferencesDialog(
             final SwingController controller,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
-            final Provider<PreferencesDialogModel> dialogModelProvider) {
+            final Provider<PreferencesDialogModel> dialogModelProvider,
+            final Provider<CategoryPanel> categoryPanelProvider) {
         super(controller.getMainFrame(), ModalityType.MODELESS);
 
         this.controller = controller;
         this.restartDialogProvider = restartDialogProvider;
+        this.categoryPanelProvider = categoryPanelProvider;
 
         initComponents();
 
@@ -155,8 +159,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * Initialises GUI components.
      */
     private void initComponents() {
-        mainPanel = new CategoryPanel(controller.getPrefsComponentFactory(),
-                controller.getIconManager(), this);
+        mainPanel = categoryPanelProvider.get();
 
         tabList = new JList(new DefaultListModel());
         tabList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);