Plugin support for PreferencesManager rename

Change-Id: Ia126a15b60e54c08c1e780676fe363821e9b7518
Depends-On: Ied76e21fbf72039d47ec2b35b236149c13941645
Reviewed-on: http://gerrit.dmdirc.com/1592
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/addonbrowser/BrowserPlugin.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.addonbrowser;
 
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.plugins.Plugin;
 
 /**
@@ -45,7 +45,7 @@ public class BrowserPlugin extends Plugin {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "Addon Browser",
                 "This addon is now part of the Swing UI and is no longer " +

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -38,7 +38,7 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -549,7 +549,7 @@ public final class DCCPlugin extends Plugin implements ActionListener {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "DCC", "", "category-dcc");
         final PreferencesCategory firewall = new PluginPreferencesCategory(getPluginInfo(), "Firewall", "");
         final PreferencesCategory sending = new PluginPreferencesCategory(getPluginInfo(), "Sending", "");

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.installer.StreamReader;
@@ -185,7 +185,7 @@ public final class FreeDesktopNotificationsPlugin extends Plugin implements Conf
     
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "FreeDesktop Notifications", "General configuration for FreeDesktop Notifications plugin.");
         
         general.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "general.timeout", "Timeout", "Length of time in seconds before the notification popup closes."));

src/com/dmdirc/addons/identd/IdentdPlugin.java

@@ -29,7 +29,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.PortValidator;
@@ -111,7 +111,7 @@ public class IdentdPlugin extends Plugin implements ActionListener {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(getPluginInfo(), "Identd",
                 "General Identd Plugin config ('Lower' options take priority " +
                 "over those above them)");

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -33,7 +33,7 @@ import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -264,7 +264,7 @@ public final class LagDisplayPlugin extends Plugin implements ActionListener, Co
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory cat = new PluginPreferencesCategory(
                 getPluginInfo(), "Lag display plugin", "");
         cat.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -34,7 +34,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -226,7 +226,7 @@ public class LoggingPlugin extends Plugin implements ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
                 getPluginInfo(), "Logging", "General configuration for Logging plugin.");
         final PreferencesCategory backbuffer = new PluginPreferencesCategory(

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.Plugin;
@@ -203,7 +203,7 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
                 getPluginInfo(), "VLC Media Source",
                 "", "category-vlc");

src/com/dmdirc/addons/nickcolours/NickColourPlugin.java

@@ -32,7 +32,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -250,7 +250,7 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
                 getPluginInfo(), "Nick Colours",
                 "General configuration for NickColour plugin.");

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
@@ -86,7 +86,7 @@ public class NotificationsPlugin extends Plugin implements ActionListener {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final NotificationConfig configPanel = UIUtilities.invokeAndWait(
                 new ReturnableThread<NotificationConfig>() {
 

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -30,7 +30,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
@@ -102,7 +102,7 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final ConfigPanel configPanel = UIUtilities.invokeAndWait(
                 new ReturnableThread<ConfigPanel>() {
 

src/com/dmdirc/addons/osd/OsdPlugin.java

@@ -28,7 +28,7 @@ import com.dmdirc.config.prefs.CategoryChangeListener;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
@@ -91,7 +91,7 @@ public final class OsdPlugin extends Plugin implements CategoryChangeListener,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         x = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationX");
         y = IdentityManager.getGlobalConfig().getOptionInt(getDomain(), "locationY");
         

src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java

@@ -26,7 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.parser_twitter.actions.TwitterActionComponents;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.parser.common.MyInfo;
@@ -85,7 +85,7 @@ public class TwitterPlugin extends Plugin {
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(getPluginInfo(), "Twitter Plugin", "Settings related to the twitter plugin", "category-twitter");
         final PreferencesCategory advanced = new PluginPreferencesCategory(getPluginInfo(), "Advanced", "Advanced Settings related to the twitter plugin", "category-twitter");
 

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -32,7 +32,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -266,7 +266,7 @@ public class RelayBotPlugin extends Plugin implements ActionListener, ConfigChan
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory general = new PluginPreferencesCategory(
                 getPluginInfo(), "Relay Bot",
                 "General configuration for the Relay bot plugin.");

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

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.ValidationResponse;
@@ -165,7 +165,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "System Tray",
                 "General configuration settings");

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

@@ -55,7 +55,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.util.validators.NotEmptyValidator;
@@ -752,7 +752,7 @@ public class SwingController extends Plugin implements Serializable,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         manager.getCategory("GUI").addSubCategory(createGeneralCategory());
 
     }

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

@@ -31,7 +31,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -74,9 +74,9 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Previously selected category. */
     private PreferencesCategory selected;
     /** Preferences Manager. */
-    private PreferencesManager manager;
+    private PreferencesDialogModel manager;
     /** Manager loading swing worker. */
-    private LoggingSwingWorker<PreferencesManager, Void> worker;
+    private LoggingSwingWorker<PreferencesDialogModel, Void> worker;
     /** Parent window. */
     private MainFrame parentWindow;
     /** Panel size. */
@@ -94,15 +94,15 @@ public final class SwingPreferencesDialog extends StandardDialog implements
 
         initComponents();
 
-        worker = new LoggingSwingWorker<PreferencesManager, Void>() {
+        worker = new LoggingSwingWorker<PreferencesDialogModel, Void>() {
 
             /** {@inheritDoc} */
             @Override
-            protected PreferencesManager doInBackground() {
+            protected PreferencesDialogModel doInBackground() {
                 mainPanel.setWaiting(true);
-                PreferencesManager prefsManager = null;
+                PreferencesDialogModel prefsManager = null;
                 try {
-                    prefsManager = new PreferencesManager(controller);
+                    prefsManager = new PreferencesDialogModel(controller);
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
                     Logger.appError(ErrorLevel.HIGH, "Unable to load the" +
@@ -116,7 +116,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             protected void done() {
                 if (!isCancelled()) {
                     try {
-                        final PreferencesManager prefsManager = get();
+                        final PreferencesDialogModel prefsManager = get();
                         if (prefsManager != null) {
                             setPrefsManager(prefsManager);
                         }
@@ -131,7 +131,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         worker.executeInExecutor();
     }
 
-    private void setPrefsManager(final PreferencesManager manager) {
+    private void setPrefsManager(final PreferencesDialogModel manager) {
         this.manager = manager;
 
         ((DefaultListModel) tabList.getModel()).clear();

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -34,7 +34,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
@@ -217,7 +217,7 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
 
     /** {@inheritDoc} */
     @Override
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
         final PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "Window status", "");