Remove UI specific methods from UIController.

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

src/com/dmdirc/addons/ui_dummy/DummyController.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_dummy;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.interfaces.UIController;
@@ -82,30 +81,6 @@ public final class DummyController extends BasePlugin implements UIController {
         System.out.println(message);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getPluginPrefsPanel() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUpdatesPrefsPanel() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUrlHandlersPrefsPanel() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getThemesPrefsPanel() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /**
      * Returns an instance of DummyController. This method is exported for use
      * in other plugins.

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

@@ -26,9 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.commands.*; //NOPMD
-import com.dmdirc.addons.ui_swing.components.addonpanel.AddonPanel;
-import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
-import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
@@ -37,8 +34,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardMessageDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
-import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
@@ -47,7 +42,6 @@ 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.PreferencesInterface;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
@@ -406,61 +400,6 @@ public class SwingController extends BasePlugin implements UIController {
         errorDialog.display();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getPluginPrefsPanel() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<AddonPanel>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(new PluginPanel(me, SwingController.this));
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUpdatesPrefsPanel() {
-        return UIUtilities.invokeAndWait(
-                new ReturnableThread<PreferencesInterface>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(new UpdateConfigPanel(SwingController.this));
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUrlHandlersPrefsPanel() {
-        return UIUtilities.invokeAndWait(
-                new ReturnableThread<PreferencesInterface>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(new URLConfigPanel(me));
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getThemesPrefsPanel() {
-        return UIUtilities.invokeAndWait(
-                new ReturnableThread<PreferencesInterface>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(new ThemePanel(me, SwingController.this));
-            }
-        });
-    }
-
     /**
      * Returns the current look and feel.
      *

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

@@ -27,6 +27,8 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
+import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.config.IdentityManager;
@@ -102,7 +104,11 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 mainPanel.setWaiting(true);
                 PreferencesDialogModel prefsManager = null;
                 try {
-                    prefsManager = new PreferencesDialogModel(controller);
+                    prefsManager = new PreferencesDialogModel(
+                            new PluginPanel(parentWindow, controller),
+                            new ThemePanel(parentWindow, controller),
+                            new UpdateConfigPanel(controller),
+                            new URLConfigPanel(parentWindow));
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
                     Logger.appError(ErrorLevel.HIGH, "Unable to load the" +

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
-import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
@@ -159,34 +158,6 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getPluginPrefsPanel() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUpdatesPrefsPanel() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getUrlHandlersPrefsPanel() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public PreferencesInterface getThemesPrefsPanel() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void requestWindowFocus(final Window window) {