Rename PreferencesManager to PreferencesDialogModel

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

src/com/dmdirc/actions/metatypes/ClientEvents.java

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.config.ConfigManager;
 
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import javax.swing.KeyStroke;
 import javax.swing.text.StyledDocument;
 
@@ -52,7 +52,7 @@ public enum ClientEvents implements ActionMetaType {
     /** Client event with an origin and editable buffer. */
     CLIENT_EVENT_WITH_BUFFER(new String[]{"origin", "buffer"}, FrameContainer.class, StringBuffer.class),
     /** Client event with preferences manager. */
-    CLIENT_EVENT_WITH_PREFS(new String[]{"preferences manager"}, PreferencesManager.class),
+    CLIENT_EVENT_WITH_PREFS(new String[]{"preferences manager"}, PreferencesDialogModel.class),
     /** Client event with a styled doc. */
     CLIENT_EVENT_WITH_STYLE(new String[]{"styled document", "start offset", "length"}, StyledDocument.class, Integer.class, Integer.class),
     /** Unknown command event type. */

src/com/dmdirc/config/prefs/PreferencesManager.java → src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -42,7 +42,7 @@ import java.util.Map;
  *
  * @author chris
  */
-public class PreferencesManager {
+public class PreferencesDialogModel {
 
     /** The UI controller to use for custom categories. */
     private final UIController controller;
@@ -55,12 +55,12 @@ public class PreferencesManager {
     private final ListenerList listeners = new ListenerList();
 
     /**
-     * Creates a new instance of PreferencesManager.
+     * Creates a new instance of PreferencesDialogModel.
      *
      * @param controller The UI controller to use to retrieve custom UIs for
      * preferences panels.
      */
-    public PreferencesManager(final UIController controller) {
+    public PreferencesDialogModel(final UIController controller) {
         this.controller = controller;
 
         addDefaultCategories();

src/com/dmdirc/plugins/Plugin.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.util.validators.ValidationResponse;
 import java.io.File;
 
@@ -154,7 +154,7 @@ public abstract class Plugin implements Comparable<Plugin> {
      * @param manager The preferences manager that configuration options
      * need to be added to.
      */
-    public void showConfig(final PreferencesManager manager) {
+    public void showConfig(final PreferencesDialogModel manager) {
     }
 
     /**

src/com/dmdirc/plugins/PluginManager.java

@@ -27,7 +27,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -488,7 +488,7 @@ public class PluginManager implements ActionListener {
                 }
                 if (pi.isLoaded() || pi.isTempLoaded()) {
                     try {
-                        pi.getPlugin().showConfig((PreferencesManager) arguments[0]);
+                        pi.getPlugin().showConfig((PreferencesDialogModel) arguments[0]);
                     } catch (LinkageError le) {
                         Logger.userError(ErrorLevel.MEDIUM, "Error with plugin (" + pi.getNiceName() + "), unable to show config (" + le + ")", le);
                     } catch (Exception ex) {

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -50,7 +50,7 @@ public class PreferencesManagerTest {
 
     @Test
     public void testDefaults() {
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         assertNotNull(pm.getCategory("General"));
         assertNotNull(pm.getCategory("Connection"));
         assertNotNull(pm.getCategory("Messages"));
@@ -64,7 +64,7 @@ public class PreferencesManagerTest {
     @Test
     public void testDismiss() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         pm.addCategory(category);
         pm.dismiss();
 
@@ -76,7 +76,7 @@ public class PreferencesManagerTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(false);
 
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         pm.addCategory(category);
         assertFalse(pm.save());
 
@@ -88,7 +88,7 @@ public class PreferencesManagerTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(true);
 
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         pm.addCategory(category);
         assertTrue(pm.save());
 
@@ -97,13 +97,13 @@ public class PreferencesManagerTest {
 
     @Test
     public void testGetCategory() {
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         assertNull(pm.getCategory("unittest123"));
     }
 
     @Test
     public void testGetCategories() {
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         assertNotNull(pm.getCategories());
         assertFalse(pm.getCategories().isEmpty());
 
@@ -114,7 +114,7 @@ public class PreferencesManagerTest {
 
     @Test
     public void testSaveListener() {
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         final PreferencesInterface tpi = mock(PreferencesInterface.class);
 
         pm.registerSaveListener(tpi);
@@ -129,7 +129,7 @@ public class PreferencesManagerTest {
         ActionManager.init();
         ActionManager.addListener(tal, CoreActionType.CLIENT_PREFS_OPENED);
 
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
 
         verify(tal).processEvent(eq(CoreActionType.CLIENT_PREFS_OPENED),
                 (StringBuffer) same(null), same(pm));
@@ -142,7 +142,7 @@ public class PreferencesManagerTest {
         ActionManager.init();
         ActionManager.addListener(tal, CoreActionType.CLIENT_PREFS_CLOSED);
 
-        final PreferencesManager pm = new PreferencesManager(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
         pm.close();
 
         verify(tal).processEvent(eq(CoreActionType.CLIENT_PREFS_CLOSED),