Remove UI specific preferences methods from UIController.

Fixes CLIENT-274

Change-Id: I58feef90e9a80ef54549b84b6370fe0378e16996
Depends-On: Ic341d8fe573e6e2c0a8da07bd02e41110e7668e9
Reviewed-on: http://gerrit.dmdirc.com/2102
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -26,7 +26,6 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
-import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -42,24 +41,37 @@ import java.util.Map;
  */
 public class PreferencesDialogModel {
 
-    /** The UI controller to use for custom categories. */
-    private final UIController controller;
-
     /** A list of categories. */
     private final List<PreferencesCategory> categories
             = new ArrayList<PreferencesCategory>();
-
     /** A list of listeners. */
     private final ListenerList listeners = new ListenerList();
+    /** UI specific plugin panel. */
+    private final PreferencesInterface pluginPanel;
+    /** UI specific theme panel. */
+    private final PreferencesInterface themePanel;
+    /** UI specific updates panel. */
+    private final PreferencesInterface updatesPanel;
+    /** UI specific URL panel. */
+    private final PreferencesInterface urlHandlerPanel;
 
     /**
      * Creates a new instance of PreferencesDialogModel.
      *
-     * @param controller The UI controller to use to retrieve custom UIs for
-     * preferences panels.
+     * @param pluginPanel UI specific plugin panel
+     * @param themePanel UI specific theme panel
+     * @param updatesPanel UI specific updates panel
+     * @param urlHandlerPanel UI specific URL panel
      */
-    public PreferencesDialogModel(final UIController controller) {
-        this.controller = controller;
+    public PreferencesDialogModel(final PreferencesInterface pluginPanel,
+            final PreferencesInterface themePanel,
+            final PreferencesInterface updatesPanel,
+            final PreferencesInterface urlHandlerPanel) {
+        this.pluginPanel = pluginPanel;
+        this.themePanel = themePanel;
+        this.updatesPanel = updatesPanel;
+        this.urlHandlerPanel = urlHandlerPanel;
+
 
         addDefaultCategories();
 
@@ -485,7 +497,7 @@ public class PreferencesDialogModel {
      */
     private void addThemesCategory(final PreferencesCategory parent) {
         parent.addSubCategory(new PreferencesCategory("Themes", "",
-                "category-addons", controller.getThemesPrefsPanel()));
+                "category-addons", themePanel));
     }
 
     /**
@@ -493,7 +505,7 @@ public class PreferencesDialogModel {
      */
     private void addPluginsCategory() {
         addCategory(new PreferencesCategory("Plugins", "", "category-addons",
-                controller.getPluginPrefsPanel()));
+                pluginPanel));
     }
 
     /**
@@ -501,7 +513,7 @@ public class PreferencesDialogModel {
      */
     private void addUpdatesCategory() {
         addCategory(new PreferencesCategory("Updates", "", "category-updates",
-                controller.getUpdatesPrefsPanel()));
+                updatesPanel));
     }
 
     /**
@@ -510,7 +522,7 @@ public class PreferencesDialogModel {
     private void addUrlHandlerCategory() {
         addCategory(new PreferencesCategory("URL Handlers",
                 "Configure how DMDirc handles different types of URLs",
-                "category-urlhandlers", controller.getUrlHandlersPrefsPanel()));
+                "category-urlhandlers", urlHandlerPanel));
     }
 
     /**

src/com/dmdirc/ui/interfaces/UIController.java

@@ -25,7 +25,6 @@ package com.dmdirc.ui.interfaces;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.prefs.PreferencesInterface;
 
 import java.net.URI;
 
@@ -88,33 +87,4 @@ public interface UIController {
      * @param message Message to display
      */
     void showMessageDialog(final String title, final String message);
-
-    /**
-     * Retrieves the object used to display the plugin preferences panel.
-     *
-     * @return The plugin preferences panel
-     */
-    PreferencesInterface getPluginPrefsPanel();
-
-    /**
-     * Retrieves the object used to display the updates preferences panel.
-     *
-     * @return The updates preferences panel
-     */
-    PreferencesInterface getUpdatesPrefsPanel();
-
-    /**
-     * Retrieves the object used to display the URL handlers preferences panel.
-     *
-     * @return The url handlers preferences panel
-     */
-    PreferencesInterface getUrlHandlersPrefsPanel();
-
-    /**
-     * Retrieves the object used to display the themes preferences panel.
-     *
-     * @return The themes preferences panel
-     */
-    PreferencesInterface getThemesPrefsPanel();
-
 }

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

@@ -48,7 +48,7 @@ public class PreferencesManagerTest {
 
     @Test
     public void testDefaults() {
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         assertNotNull(pm.getCategory("General"));
         assertNotNull(pm.getCategory("Connection"));
         assertNotNull(pm.getCategory("Messages"));
@@ -62,7 +62,7 @@ public class PreferencesManagerTest {
     @Test
     public void testDismiss() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         pm.addCategory(category);
         pm.dismiss();
 
@@ -74,7 +74,7 @@ public class PreferencesManagerTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(false);
 
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         pm.addCategory(category);
         assertFalse(pm.save());
 
@@ -86,7 +86,7 @@ public class PreferencesManagerTest {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(true);
 
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         pm.addCategory(category);
         assertTrue(pm.save());
 
@@ -95,13 +95,13 @@ public class PreferencesManagerTest {
 
     @Test
     public void testGetCategory() {
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         assertNull(pm.getCategory("unittest123"));
     }
 
     @Test
     public void testGetCategories() {
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         assertNotNull(pm.getCategories());
         assertFalse(pm.getCategories().isEmpty());
 
@@ -112,7 +112,7 @@ public class PreferencesManagerTest {
 
     @Test
     public void testSaveListener() {
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         final PreferencesInterface tpi = mock(PreferencesInterface.class);
 
         pm.registerSaveListener(tpi);
@@ -127,7 +127,7 @@ public class PreferencesManagerTest {
         ActionManager.getActionManager().initialise();
         ActionManager.getActionManager().registerListener(tal, CoreActionType.CLIENT_PREFS_OPENED);
 
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
 
         verify(tal).processEvent(eq(CoreActionType.CLIENT_PREFS_OPENED),
                 (StringBuffer) same(null), same(pm));
@@ -140,7 +140,7 @@ public class PreferencesManagerTest {
         ActionManager.getActionManager().initialise();
         ActionManager.getActionManager().registerListener(tal, CoreActionType.CLIENT_PREFS_CLOSED);
 
-        final PreferencesDialogModel pm = new PreferencesDialogModel(controller);
+        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null, null, null);
         pm.close();
 
         verify(tal).processEvent(eq(CoreActionType.CLIENT_PREFS_CLOSED),