Mass deprecation/deletion

Change-Id: I65a4cbe48f772dc7e400d585b1bfab15521fdd12
Depends-On: Ib499b44b594fa6dd85ac65fba5b95f16beb23c48
Reviewed-on: http://gerrit.dmdirc.com/1873
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -124,7 +124,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
         if (e.getActionCommand().equals("Show/hide")) {
             final SwingController controller = (SwingController) PluginManager
                     .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
-            controller.getMainWindow().setVisible(!controller.getMainWindow().isVisible());
+            controller.getMainFrame().setVisible(!controller.getMainFrame().isVisible());
         } else if (e.getActionCommand().equals("Quit")) {
             Main.quit();
         }
@@ -190,12 +190,12 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
         if (e.getButton() == MouseEvent.BUTTON1) {
             final SwingController controller = (SwingController) PluginManager
                     .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
-            if (controller.getMainWindow().isVisible()) {
-                controller.getMainWindow().setVisible(false);
+            if (controller.getMainFrame().isVisible()) {
+                controller.getMainFrame().setVisible(false);
             } else {
-                controller.getMainWindow().setVisible(true);
-                controller.getMainWindow().setState(Frame.NORMAL);
-                controller.getMainWindow().toFront();
+                controller.getMainFrame().setVisible(true);
+                controller.getMainFrame().setState(Frame.NORMAL);
+                controller.getMainFrame().toFront();
             }
         }
     }
@@ -249,7 +249,7 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
                 "autominimise")) {
             final SwingController controller = (SwingController) PluginManager
                     .getPluginManager().getPluginInfoByName("ui_swing").getPlugin();
-            controller.getMainWindow().setVisible(false);
+            controller.getMainFrame().setVisible(false);
         }
     }
 

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

@@ -28,22 +28,15 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.UpdaterDialog;
-import com.dmdirc.updater.Update;
 
 import java.net.URI;
-import java.util.List;
 
 /**
  * Implements a dummy UI controller.
  */
 public final class DummyController extends Plugin implements UIController {
 
-    /** Main window. */
-    private final MainWindow mainWindow = new DummyMainWindow();
-
     /**
      * Creates a new instance of DummyController.
      */
@@ -51,18 +44,6 @@ public final class DummyController extends Plugin implements UIController {
         StatusBarManager.getStatusBarManager().registerStatusBar(new DummyStatusBar());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public MainWindow getMainWindow() {
-        return mainWindow;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public UpdaterDialog getUpdaterDialog(final List<Update> updates) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
@@ -81,12 +62,6 @@ public final class DummyController extends Plugin implements UIController {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void initUISettings() {
-        // Do nothing
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showURLDialog(final URI url) {
@@ -105,12 +80,6 @@ public final class DummyController extends Plugin implements UIController {
         System.out.println(message);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getUserInput(final String prompt) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showSSLCertificateDialog(final SSLCertificateDialogModel model) {

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

@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_dummy;
-
-import com.dmdirc.ui.interfaces.MainWindow;
-
-import javax.swing.ImageIcon;
-
-/**
- * Dummy main window, used for testing.
- */
-public final class DummyMainWindow implements MainWindow {
-
-    /** Are we visible? */
-    private boolean visible = true;
-
-    /** {@inheritDoc} */
-    @Override
-    public ImageIcon getIcon() {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void quit() {
-        // Do nothing
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getTitlePrefix() {
-        return "DMDirc: Dummy UI: ";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setVisible(final boolean visible) {
-        this.visible = visible;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isVisible() {
-        return visible;
-    }
-
-}

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

@@ -47,7 +47,6 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.QueuedLinkedHashSet;
 import com.dmdirc.util.ReturnableThread;
@@ -72,8 +71,8 @@ import net.miginfocom.swing.MigLayout;
  * The main application frame.
  */
 public final class MainFrame extends JFrame implements WindowListener,
-        MainWindow, ConfigChangeListener, SelectionListener,
-        SwingWindowListener, FrameInfoListener {
+        ConfigChangeListener, SelectionListener, SwingWindowListener,
+        FrameInfoListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -202,19 +201,6 @@ public final class MainFrame extends JFrame implements WindowListener,
         });
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public ImageIcon getIcon() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<ImageIcon>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(imageIcon);
-            }
-        });
-    }
-
     /**
      * Returns the window that is currently active.
      *
@@ -247,9 +233,12 @@ public final class MainFrame extends JFrame implements WindowListener,
         }
     }
 
-    /** {@inheritDoc}. */
-    @Override
-    public String getTitlePrefix() {
+    /**
+     * Gets the string which should be prefixed to this frame's title.
+     * 
+     * @return This frame's title prefix
+     */
+    private String getTitlePrefix() {
         return "DMDirc" + (showVersion ? " " + version : "");
     }
 
@@ -493,8 +482,9 @@ public final class MainFrame extends JFrame implements WindowListener,
         return splitPane;
     }
 
-    /** {@inheritDoc}. */
-    @Override
+    /**
+     * Exits with an "OK" status code.
+     */
     public void quit() {
         quit(0);
     }
@@ -537,11 +527,11 @@ public final class MainFrame extends JFrame implements WindowListener,
     public void doQuit(final int exitCode) {
         this.exitCode = exitCode;
 
-        new LoggingSwingWorker() {
+        new LoggingSwingWorker<Void, Void>() {
 
             /** {@inheritDoc} */
             @Override
-            protected Object doInBackground() {
+            protected Void doInBackground() {
                 ActionManager.getActionManager().triggerEvent(
                         CoreActionType.CLIENT_CLOSING, null);
                 ServerManager.getServerManager().closeAll(IdentityManager.

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
-import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 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;
@@ -39,7 +38,6 @@ 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.sslcertificate.SSLCertificateDialog;
-import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
@@ -51,7 +49,6 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
-import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -62,7 +59,6 @@ import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.updater.Update;
 import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Font;
@@ -146,12 +142,6 @@ public class SwingController extends Plugin implements UIController {
         return mainFrameCreated.get();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public MainFrame getMainWindow() {
-        return getMainFrame();
-    }
-
     /**
      * Returns a URL Handler which may be used when working with the Swing UI.
      *
@@ -190,21 +180,6 @@ public class SwingController extends Plugin implements UIController {
         return statusBar;
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public SwingUpdaterDialog getUpdaterDialog(final List<Update> updates) {
-        return UIUtilities.invokeAndWait(
-                new ReturnableThread<SwingUpdaterDialog>() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                setObject(SwingUpdaterDialog.getSwingUpdaterDialog(updates,
-                        me));
-            }
-        });
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
@@ -325,9 +300,10 @@ public class SwingController extends Plugin implements UIController {
         }
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void initUISettings() {
+    /**
+     * Initialises the global UI settings for the Swing UI.
+     */
+    private void initUISettings() {
         // This will do nothing on non OS X Systems
         if (Apple.isApple()) {
             final Apple apple = Apple.getApple();
@@ -428,37 +404,6 @@ public class SwingController extends Plugin implements UIController {
         errorDialog.display();
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getUserInput(final String prompt) {
-        final StandardInputDialog dialog = new StandardInputDialog(me,
-                ModalityType.MODELESS, "Input required", prompt,
-                new NotEmptyValidator()) {
-
-            /**
-             * A version number for this class. It should be changed whenever
-             * the class structure is changed (or anything else that would
-             * prevent serialized objects being unserialized with the new
-             * class).
-             */
-            private static final long serialVersionUID = 1;
-
-            /** {@inheritDoc} */
-            @Override
-            public boolean save() {
-                return true;
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            public void cancelled() {
-                //Do nothing.
-            }
-        };
-        dialog.displayBlocking();
-        return dialog.getText();
-    }
-
     /** {@inheritDoc} */
     @Override
     public PreferencesInterface getPluginPrefsPanel() {

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DownloaderWindow.java

@@ -9,6 +9,7 @@ import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.CoreUIUtils;
+import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.DownloadListener;
 import com.dmdirc.util.Downloader;
 
@@ -54,7 +55,7 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
         pack();
         setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
         CoreUIUtils.centreWindow(this);
-        setIconImage(controller.getMainFrame().getIcon().getImage());
+        setIconImage(IconManager.getIconManager().getImage("icon"));
         setVisible(true);
         
         new Thread(this, "Addon downloader thread").start();

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

@@ -88,9 +88,9 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * @param controller The controller which owns this preferences window.
      */
     private SwingPreferencesDialog(final SwingController controller) {
-        super(controller.getMainWindow(), ModalityType.MODELESS);
+        super(controller.getMainFrame(), ModalityType.MODELESS);
 
-        this.parentWindow = controller.getMainWindow();
+        this.parentWindow = controller.getMainFrame();
 
         initComponents();
 

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellR
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateStatusTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.updater.Update;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateCheckerListener;
@@ -53,7 +52,7 @@ import net.miginfocom.swing.MigLayout;
  * and walks them through the process of downloading the update.
  */
 public final class SwingUpdaterDialog extends StandardDialog implements
-        ActionListener, UpdaterDialog, UpdateCheckerListener {
+        ActionListener, UpdateCheckerListener {
 
     /**
      * A version number for this class. It should be changed whenever the class

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -104,7 +104,7 @@ public final class SwingFirstRunWizard implements WizardListener,
                 @Override
                 public void processEvent(final ActionType type,
                         final StringBuffer format, final Object... arguments) {
-                    ProfileManagerDialog.showProfileManagerDialog(controller.getMainWindow());
+                    ProfileManagerDialog.showProfileManagerDialog(controller.getMainFrame());
                 }
             }, CoreActionType.CLIENT_OPENED);
 

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

@@ -24,18 +24,13 @@ package com.dmdirc.addons.ui_web;
 
 import com.dmdirc.Channel;
 import com.dmdirc.Server;
-import com.dmdirc.addons.ui_web.uicomponents.WebMainWindow;
 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.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.ui.interfaces.MainWindow;
 import com.dmdirc.ui.interfaces.UIController;
-import com.dmdirc.ui.interfaces.UpdaterDialog;
-import com.dmdirc.updater.Update;
 
 import java.net.URI;
-import java.util.List;
 
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.security.Constraint;
@@ -112,19 +107,6 @@ public class WebInterfaceUI implements UIController {
         webServer.addHandler(newHandler);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public MainWindow getMainWindow() {
-        return new WebMainWindow();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public UpdaterDialog getUpdaterDialog(final List<Update> updates) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
@@ -143,12 +125,6 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void initUISettings() {
-        // Do nothing
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showURLDialog(final URI url) {
@@ -167,13 +143,6 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public String getUserInput(final String prompt) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     /** {@inheritDoc} */
     @Override
     public void showSSLCertificateDialog(final SSLCertificateDialogModel model) {

src/com/dmdirc/addons/ui_web/uicomponents/WebMainWindow.java

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_web.uicomponents;
-
-import com.dmdirc.ui.interfaces.MainWindow;
-
-import javax.swing.ImageIcon;
-
-/**
- *
- * @author chris
- */
-public class WebMainWindow implements MainWindow {
-
-    /** {@inheritDoc} */
-    @Override
-    public ImageIcon getIcon() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void quit() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getTitlePrefix() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setVisible(final boolean visible) {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean isVisible() {
-        //TODO FIXME
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-}