Remove PreferencesManager singleton.

Change-Id: I5fc194790dd1459d3dab546f306768d5b620626d
Reviewed-on: http://gerrit.dmdirc.com/3413
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -64,26 +64,30 @@ public class Settings extends JPanel implements ServerListListener {
     private final PrefsComponentFactory componentFactory;
     /** Factory to use to produce identities. */
     private final IdentityFactory identityFactory;
+    /** Preferences Manager to retrieve settings from. */
+    private final PreferencesManager preferencesManager;
 
     /**
      * Instantiates a new settings panel.
      *
-     * @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.
+     * @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.
+     * @param preferencesManager Preferences Manager to retrieve settings from.
      */
     @Inject
     public Settings(
             final ServerListModel model,
             @GlobalConfig final IconManager iconManager,
             final PrefsComponentFactory componentFactory,
-            final IdentityFactory identityFactory) {
-        super();
+            final IdentityFactory identityFactory,
+            final PreferencesManager preferencesManager) {
         this.model = model;
         this.iconManager = iconManager;
         this.componentFactory = componentFactory;
         this.identityFactory = identityFactory;
+        this.preferencesManager = preferencesManager;
         addListeners();
         border = UIManager.getBorder("TitledBorder.border");
         setBorder(BorderFactory.createTitledBorder(border, "Network Settings"));
@@ -167,8 +171,7 @@ public class Settings extends JPanel implements ServerListListener {
      */
     private void addSettings(final SettingsPanel settingsPanel,
             final AggregateConfigProvider manager, final ConfigProvider identity) {
-        settingsPanel.addOption(PreferencesManager.getPreferencesManager()
-                .getServerSettings(manager, identity));
+        settingsPanel.addOption(preferencesManager.getServerSettings(manager, identity));
     }
 
 }

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -56,6 +56,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     private final Server server;
     /** Perform wrapper for the perform panel. */
     private final PerformWrapper performWrapper;
+    /** Preferences manager to retrieve settings from. */
+    private final PreferencesManager preferencesManager;
     /** User modes panel. */
     private UserModesPane modesPanel;
     /** Ignore list panel. */
@@ -70,12 +72,14 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     /**
      * Creates a new instance of ServerSettingsDialog.
      *
+     * @param preferencesManager Preferences manager to retrieve settings from
      * @param compFactory    Preferences setting component factory
      * @param performWrapper Wrapper for the perform tab.
      * @param server         The server object that we're editing settings for
      * @param parentWindow   Parent window
      */
     public ServerSettingsDialog(
+            final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final Server server,
@@ -83,6 +87,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
         super(parentWindow, ModalityType.MODELESS);
         this.server = server;
         this.performWrapper = performWrapper;
+        this.preferencesManager = preferencesManager;
 
         setTitle("Server settings");
         setResizable(false);
@@ -145,8 +150,8 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
 
     /** Adds the settings to the panel. */
     private void addSettings() {
-        settingsPanel.addOption(PreferencesManager.getPreferencesManager()
-                .getServerSettings(server.getConfigManager(), server.getServerIdentity()));
+        settingsPanel.addOption(preferencesManager.getServerSettings(server.getConfigManager(),
+                server.getServerIdentity()));
     }
 
     /** Initialises listeners for this dialog. */

src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -130,13 +130,15 @@ public class DialogModule {
     @Provides
     @Singleton
     public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider(
+            final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final MainFrame parentWindow) {
         return new KeyedDialogProvider<Server, ServerSettingsDialog>() {
             @Override
             protected ServerSettingsDialog getInstance(final Server key) {
-                return new ServerSettingsDialog(compFactory, performWrapper, key, parentWindow);
+                return new ServerSettingsDialog(preferencesManager, compFactory, performWrapper,
+                        key, parentWindow);
             }
         };
     }