Even more UI Abstraction

git-svn-id: http://svn.dmdirc.com/trunk@1764 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/ui/ChannelFrame.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.Channel;
+import com.dmdirc.Main;
 import com.dmdirc.commandparser.ChannelCommand;
 import com.dmdirc.commandparser.ChannelCommandParser;
 import com.dmdirc.commandparser.Command;
@@ -209,7 +210,7 @@ public final class ChannelFrame extends InputFrame implements MouseListener,
         nickScrollPane.setViewportView(nickList);
         
         nickScrollPane.setMinimumSize(new Dimension(150, 10));
-        getTextPane().setPreferredSize(new Dimension(MainFrame.getMainFrame().getWidth(), 10));
+        getTextPane().setPreferredSize(new Dimension(Main.getUI().getMainWindow().getWidth(), 10));
         
         panel.add(getSearchBar(), BorderLayout.PAGE_START);
         panel.add(inputPanel, BorderLayout.PAGE_END);

src/com/dmdirc/ui/MainFrame.java

@@ -32,19 +32,20 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.components.Frame;
-import com.dmdirc.ui.components.StatusBar;
+import com.dmdirc.ui.components.SwingStatusBar;
 import com.dmdirc.ui.dialogs.ActionsManagerDialog;
 import com.dmdirc.ui.dialogs.NewServerDialog;
 import com.dmdirc.ui.dialogs.PluginDialog;
 import com.dmdirc.ui.dialogs.PreferencesDialog;
 import com.dmdirc.ui.dialogs.ProfileEditorDialog;
 import com.dmdirc.ui.dialogs.about.AboutDialog;
-import com.dmdirc.ui.framemanager.FrameManager;
-import com.dmdirc.ui.framemanager.FramemanagerPosition;
+import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.framemanager.MainFrameManager;
 import com.dmdirc.ui.framemanager.windowmenu.WindowMenuFrameManager;
 import com.dmdirc.ui.interfaces.Window;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -100,10 +101,6 @@ public final class MainFrame extends JFrame implements WindowListener,
      */
     private static final int FRAME_OPENING_OFFSET = 30;
     
-    /**
-     * Singleton instance of MainFrame.
-     */
-    private static MainFrame me;
     /**
      * Whether the internal frames are maximised or not.
      */
@@ -153,7 +150,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     private JMenuItem toggleStateMenuItem;
     
     /** status bar. */
-    private StatusBar statusBar;
+    private SwingStatusBar statusBar;
     
     /** Frame manager position. */
     private FramemanagerPosition position;
@@ -161,7 +158,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /**
      * Creates new form MainFrame.
      */
-    private MainFrame() {
+    protected MainFrame() {
         super();
         
         windowListFrameManager = new WindowMenuFrameManager();
@@ -223,25 +220,6 @@ public final class MainFrame extends JFrame implements WindowListener,
         checkWindowState();
     }
     
-    /**
-     * Returns the singleton instance of MainFrame.
-     * @return MainFrame instance
-     */
-    public static synchronized MainFrame getMainFrame() {
-        if (me == null) {
-            me = new MainFrame();
-        }
-        return me;
-    }
-    
-    /**
-     * Indicates whether the main frame has been initialised or not.
-     * @return True iff the main frame exists
-     */
-    public static boolean hasMainFrame() {
-        return me != null;
-    }
-    
     /**
      * Adds the specified window as a child of the main frame.
      *
@@ -443,8 +421,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     
     /**
      * Returns the status bar instance.
-     *
-     * @return StatusBar instance
+     * 
+     * @return SwingStatusBar instance
      */
     public StatusBar getStatusBar() {
         return statusBar;
@@ -499,7 +477,7 @@ public final class MainFrame extends JFrame implements WindowListener,
         frameManagerPanel = new JPanel();
         desktopPane = new JDesktopPane();
         desktopPane.setBackground(new Color(238, 238, 238));
-        statusBar = new StatusBar();
+        statusBar = new SwingStatusBar();
         
         initSplitPane(mainSplitPane);
         
@@ -792,7 +770,7 @@ public final class MainFrame extends JFrame implements WindowListener,
     /** Quits the client. */
     public void quit() {
         Config.setOption("ui", "frameManagerSize",
-                String.valueOf(MainFrame.getMainFrame().getFrameManagerSize()));
+                String.valueOf(this.getFrameManagerSize()));
         Main.quit();
     }
     
@@ -811,9 +789,9 @@ public final class MainFrame extends JFrame implements WindowListener,
         } else if (e.getActionCommand().equals("Actions")) {
             ActionsManagerDialog.showActionsManagerDialog();
         } else if (e.getActionCommand().equals("Minimise")) {
-            ((Frame) MainFrame.getMainFrame().getActiveFrame()).minimise();
+            ((Frame) Main.getUI().getMainWindow().getActiveFrame()).minimise();
         } else if (e.getActionCommand().equals("Close")) {
-            ((Frame) MainFrame.getMainFrame().getActiveFrame()).close();
+            ((Frame) Main.getUI().getMainWindow().getActiveFrame()).close();
         }
     }
 }

src/com/dmdirc/ui/SwingController.java

@@ -32,20 +32,24 @@ import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.components.SwingPreferencesPanel;
-import com.dmdirc.ui.components.StatusBar;
-import com.dmdirc.ui.framemanager.FrameManager;
+import com.dmdirc.ui.dialogs.SwingUpdaterDialog;
+import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.ChannelWindow;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
 import com.dmdirc.ui.interfaces.QueryWindow;
 import com.dmdirc.ui.interfaces.ServerWindow;
+import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.UIController;
+import com.dmdirc.ui.interfaces.UpdaterDialog;
+import com.dmdirc.updater.Update;
 
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Insets;
 import java.awt.Toolkit;
+import java.util.List;
 import javax.swing.BorderFactory;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
@@ -59,19 +63,27 @@ import javax.swing.plaf.FontUIResource;
  */
 public class SwingController implements UIController {
     
+    /**
+     * Singleton instance of MainFrame.
+     */
+    private static MainFrame me;
+    
     /** {@inheritDoc} */
-    public MainFrame getMainWindow() {
-        return MainFrame.getMainFrame();
+    public synchronized MainFrame getMainWindow() {
+        if (me == null) {
+            me = new MainFrame();
+        }
+        return me;
     }
     
     /** {@inheritDoc} */
     public StatusBar getStatusBar() {
-        return MainFrame.getMainFrame().getStatusBar();
+        return getMainWindow().getStatusBar();
     }
     
     /** {@inheritDoc} */
     public FrameManager getFrameManager() {
-        return MainFrame.getMainFrame().getFrameManager();
+        return getMainWindow().getFrameManager();
     }
     
     /** {@inheritDoc} */
@@ -101,6 +113,11 @@ public class SwingController implements UIController {
         return new SwingPreferencesPanel(parent, title);
     }
     
+    /** {@inheritDoc} */
+    public UpdaterDialog getUpdaterDialog(final List<Update> updates) {
+        return new SwingUpdaterDialog(updates);
+    }
+    
     /** {@inheritDoc} */
     public void initUISettings() {
         // For this to work it *HAS* to be before anything else UI related.

src/com/dmdirc/ui/components/ColourPickerDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.components;
 
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 
 import java.awt.event.ActionListener;
 
@@ -56,7 +56,7 @@ public final class ColourPickerDialog extends StandardDialog {
      * @param showHex show hex colours
      */
     public ColourPickerDialog(final boolean showIRC, final boolean showHex) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         colourChooser = new ColourPickerPanel(showIRC, showHex);
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

src/com/dmdirc/ui/components/Frame.java

@@ -25,11 +25,11 @@ package com.dmdirc.ui.components;
 import com.dmdirc.BrowserLauncher;
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.config.ConfigChangeListener;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.Styliser;
@@ -112,15 +112,15 @@ public abstract class Frame extends JInternalFrame implements Window,
         super();
         parent = owner;
         
-        setFrameIcon(MainFrame.getMainFrame().getIcon());
+        setFrameIcon(Main.getUI().getMainWindow().getIcon());
         
         initComponents();
         setMaximizable(true);
         setClosable(true);
         setResizable(true);
         setIconifiable(true);
-        setPreferredSize(new Dimension(MainFrame.getMainFrame().getWidth() / 2,
-                MainFrame.getMainFrame().getHeight() / 3));
+        setPreferredSize(new Dimension(Main.getUI().getMainWindow().getWidth() / 2,
+                Main.getUI().getMainWindow().getHeight() / 3));
         
         addPropertyChangeListener("maximum", this);
         addInternalFrameListener(this);
@@ -134,7 +134,7 @@ public abstract class Frame extends JInternalFrame implements Window,
         config.addChangeListener("ui", "backgroundcolour", this);
         
         final Boolean pref = Config.getOptionBool("ui", "maximisewindows");
-        if (pref || MainFrame.getMainFrame().getMaximised()) {
+        if (pref || Main.getUI().getMainWindow().getMaximised()) {
             hideTitlebar();
         }
     }
@@ -221,12 +221,12 @@ public abstract class Frame extends JInternalFrame implements Window,
     public final void propertyChange(final PropertyChangeEvent event) {
         if (event.getNewValue().equals(Boolean.TRUE)) {
             hideTitlebar();
-            MainFrame.getMainFrame().setMaximised(true);
+            Main.getUI().getMainWindow().setMaximised(true);
         } else {
             showTitlebar();
             
-            MainFrame.getMainFrame().setMaximised(false);
-            MainFrame.getMainFrame().setActiveFrame(this);
+            Main.getUI().getMainWindow().setMaximised(false);
+            Main.getUI().getMainWindow().setActiveFrame(this);
         }
     }
     
@@ -507,7 +507,7 @@ public abstract class Frame extends JInternalFrame implements Window,
     
     /** {@inheritDoc} */
     public void hyperlinkClicked(final String url) {
-        MainFrame.getMainFrame().getStatusBar().setMessage("Opening: " + url);
+        Main.getUI().getMainWindow().getStatusBar().setMessage("Opening: " + url);
         BrowserLauncher.openURL(url);
     }
     

src/com/dmdirc/ui/components/SearchBar.java

@@ -23,7 +23,7 @@
 package com.dmdirc.ui.components;
 
 import com.dmdirc.IconManager;
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.textpane.TextPane;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
@@ -297,7 +297,7 @@ public final class SearchBar extends JPanel implements ActionListener,
         }
         
         //want to continue?
-        if (JOptionPane.showConfirmDialog(MainFrame.getMainFrame(),
+        if (JOptionPane.showConfirmDialog(Main.getUI().getMainWindow(),
                 "Do you want to continue searching from the end?",
                 "Beginning reached", JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {
@@ -363,7 +363,7 @@ public final class SearchBar extends JPanel implements ActionListener,
         }
         
         //want to continue?
-        if (JOptionPane.showConfirmDialog(MainFrame.getMainFrame(),
+        if (JOptionPane.showConfirmDialog(Main.getUI().getMainWindow(),
                 "Do you want to continue searching from the beginning?",
                 "End reached", JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.QUESTION_MESSAGE) == JOptionPane.OK_OPTION) {

src/com/dmdirc/ui/components/SwingPreferencesPanel.java

@@ -23,12 +23,12 @@
 package com.dmdirc.ui.components;
 
 import com.dmdirc.Config;
+import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.PreferencesInterface;
 import com.dmdirc.ui.interfaces.PreferencesPanel;
 import com.dmdirc.ui.interfaces.PreferencesPanel.OptionType;
-import com.dmdirc.ui.MainFrame;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 import static com.dmdirc.ui.UIUtilities.layoutGrid;
@@ -66,7 +66,6 @@ import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.text.Position;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreePath;
@@ -144,7 +143,7 @@ public final class SwingPreferencesPanel extends StandardDialog implements
      */
     public SwingPreferencesPanel(final PreferencesInterface preferencesOwner,
             final String title) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         windowTitle = title;
         
@@ -533,7 +532,7 @@ public final class SwingPreferencesPanel extends StandardDialog implements
                     tabName, 0, Position.Bias.Forward));
         }
         pack();
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
         this.setVisible(true);
     }
     

src/com/dmdirc/ui/components/StatusBar.java → src/com/dmdirc/ui/components/SwingStatusBar.java

@@ -31,6 +31,7 @@ import com.dmdirc.ui.dialogs.error.ErrorListDialog;
 import com.dmdirc.ui.interfaces.StatusErrorNotifier;
 import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.interfaces.StatusBar;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -50,8 +51,8 @@ import javax.swing.SpringLayout;
 /**
  * Status bar, shows message and info on the gui.
  */
-public final class StatusBar extends JPanel implements MouseListener,
-        ErrorListener {
+public final class SwingStatusBar extends JPanel implements MouseListener,
+        ErrorListener, StatusBar {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -81,8 +82,10 @@ public final class StatusBar extends JPanel implements MouseListener,
     /** Timer to clear the message. */
     private transient TimerTask messageTimer;
     
-    /** Creates a new instance of StatusBar. */
-    public StatusBar() {
+    /**
+     * Creates a new instance of SwingStatusBar.
+     */
+    public SwingStatusBar() {
         super();
         final SpringLayout layout = new SpringLayout();
         
@@ -115,29 +118,14 @@ public final class StatusBar extends JPanel implements MouseListener,
         layoutBar();
     }
     
-    /**
-     * Sets the message in the status bar with a specified callback event
-     * using the default timeout.
-     *
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     */
+    /** {@inheritDoc} */
     public void setMessage(final String newMessage,
             final StatusMessageNotifier newNotifier) {
         final int timeout = Config.getOptionInt("statusBar", "messageDisplayLength", 5);
         setMessage(newMessage, newNotifier, timeout);
     }
     
-    /**
-     * Sets the message in the status bar with a specified callback event for
-     * a specified time.
-     *
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     * @param timeout message timeout in seconds
-     */
+    /** {@inheritDoc} */
     public synchronized void setMessage(final String newMessage,
             final StatusMessageNotifier newNotifier, final int timeout) {
         messageLabel.setText(newMessage);
@@ -156,29 +144,17 @@ public final class StatusBar extends JPanel implements MouseListener,
                 new Date(System.currentTimeMillis() + 250 + timeout * 1000L));
     }
     
-    /**
-     * sets the message in the status bar.
-     *
-     * @param newMessage Message to display
-     */
+    /** {@inheritDoc} */
     public void setMessage(final String newMessage) {
         setMessage(newMessage, null);
     }
     
-    /**
-     * Removes the message from the status bar.
-     */
+    /** {@inheritDoc} */
     public void clearMessage() {
         setMessage("Ready.");
     }
     
-    /**
-     * sets the icon in the status bar with a specified callback event.
-     *
-     * @param newIcon Icon to display
-     * @param newNotifier status error notifier to be notified for events on
-     * this error
-     */
+    /** {@inheritDoc} */
     public synchronized void setError(final Icon newIcon,
             final StatusErrorNotifier newNotifier) {
         //Add to list
@@ -200,18 +176,12 @@ public final class StatusBar extends JPanel implements MouseListener,
                 new Date(System.currentTimeMillis() + 250  + displayLength));
     }
     
-    /**
-     * sets the icon in the status bar.
-     *
-     * @param newIcon Icon to display
-     */
+    /** {@inheritDoc} */
     public void setError(final Icon newIcon) {
         setError(newIcon, null);
     }
     
-    /**
-     * Removes the error state from the status bar.
-     */
+    /** {@inheritDoc} */
     public void clearError() {
         setError(normalIcon);
     }
@@ -279,11 +249,7 @@ public final class StatusBar extends JPanel implements MouseListener,
         }
     }
     
-    /**
-     * Adds a component to the status bar.
-     *
-     * @param component component to add
-     */
+    /** {@inheritDoc} */
     public void addComponent(final Component component) {
         remove(iconLabel);
         add(component);
@@ -291,11 +257,7 @@ public final class StatusBar extends JPanel implements MouseListener,
         layoutBar();
     }
     
-    /**
-     * Removes a component to the status bar.
-     *
-     * @param component component to add
-     */
+    /** {@inheritDoc} */
     public void removeComponent(final Component component) {
         remove(component);
         layoutBar();

src/com/dmdirc/ui/dialogs/ActionsManagerDialog.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.dialogs;
 
+import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionManager;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.ActionsGroupPanel;
 import com.dmdirc.ui.components.StandardDialog;
 import com.dmdirc.ui.dialogs.actionseditor.ActionsEditorDialog;
@@ -87,14 +87,14 @@ public final class ActionsManagerDialog extends StandardDialog
     
     /** Creates a new instance of ActionsManagerDialog. */
     private ActionsManagerDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         initComponents();
         
         setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
         setTitle("Action Manager");
         setResizable(false);
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
         setVisible(true);
     }
     

src/com/dmdirc/ui/dialogs/NewServerDialog.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.dialogs;
 
 import com.dmdirc.Config;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.config.Identity;
@@ -122,7 +123,7 @@ public final class NewServerDialog extends StandardDialog {
      * Creates a new instance of the dialog.
      */
     private NewServerDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         initComponents();
         
@@ -147,7 +148,7 @@ public final class NewServerDialog extends StandardDialog {
         me.serverField.requestFocus();
         
         if (ServerManager.getServerManager().numServers() == 0
-                || MainFrame.getMainFrame().getActiveFrame() == null) {
+                || Main.getUI().getMainWindow().getActiveFrame() == null) {
             me.newServerWindowCheck.setSelected(true);
             me.newServerWindowCheck.setEnabled(false);
         } else {
@@ -156,7 +157,7 @@ public final class NewServerDialog extends StandardDialog {
         
         me.populateProfiles();
         
-        me.setLocationRelativeTo(MainFrame.getMainFrame());
+        me.setLocationRelativeTo(Main.getUI().getMainWindow());
         me.setVisible(true);
         me.requestFocus();
     }
@@ -201,11 +202,11 @@ public final class NewServerDialog extends StandardDialog {
                 // Open in a new window?
                 if (newServerWindowCheck.isSelected()
                 || ServerManager.getServerManager().numServers() == 0
-                        || MainFrame.getMainFrame().getActiveFrame() == null) {
+                        || Main.getUI().getMainWindow().getActiveFrame() == null) {
                     new Server(host, port, pass, sslCheck.isSelected(), profile);
                 } else {
                     final Window active =
-                            MainFrame.getMainFrame().getActiveFrame();
+                            Main.getUI().getMainWindow().getActiveFrame();
                     final Server server = ServerManager.getServerManager().
                             getServerFromFrame(active);
                     if (server == null) {

src/com/dmdirc/ui/dialogs/PasteDialog.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.dialogs;
 
+import com.dmdirc.Main;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.InputFrame;
 import com.dmdirc.ui.components.StandardDialog;
@@ -80,7 +81,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      * @param text text to show in the paste dialog
      */
     public PasteDialog(final InputFrame newParent, final String text) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         this.parent = newParent;
         
@@ -91,7 +92,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         getOkButton().requestFocus();
         getOkButton().setSelected(true);
         
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
     }
     
     /**
@@ -241,7 +242,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
                     + parent.getContainer().getNumLines(textField.getText())
                     + " lines.");
             pack();
-            setLocationRelativeTo(MainFrame.getMainFrame());
+            setLocationRelativeTo(Main.getUI().getMainWindow());
         } else if (getCancelButton().equals(actionEvent.getSource())) {
             this.dispose();
         }

src/com/dmdirc/ui/dialogs/PluginDialog.java

@@ -23,9 +23,9 @@
 package com.dmdirc.ui.dialogs;
 
 import com.dmdirc.BrowserLauncher;
+import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.PluginCellRenderer;
 import com.dmdirc.ui.components.StandardDialog;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
@@ -94,7 +94,7 @@ public final class PluginDialog extends StandardDialog implements
     
     /** Creates a new instance of PluginDialog. */
     private PluginDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         setResizable(false);
         initComponents();
         addListeners();
@@ -103,7 +103,7 @@ public final class PluginDialog extends StandardDialog implements
         pluginList.setSelectedIndex(0);
         selectedPlugin = 0;
         
-        this.setLocationRelativeTo(MainFrame.getMainFrame());
+        this.setLocationRelativeTo(Main.getUI().getMainWindow());
         this.setVisible(true);
     }
     

src/com/dmdirc/ui/dialogs/ProfileEditorDialog.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.dialogs;
 
+import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.StandardDialog;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
@@ -118,7 +118,7 @@ public final class ProfileEditorDialog extends StandardDialog implements
     
     /** Creates a new instance of ProfileEditorDialog. */
     private ProfileEditorDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         profiles = IdentityManager.getProfiles();
         
@@ -128,7 +128,7 @@ public final class ProfileEditorDialog extends StandardDialog implements
         
         addCallbacks();
         
-        this.setLocationRelativeTo(MainFrame.getMainFrame());
+        this.setLocationRelativeTo(Main.getUI().getMainWindow());
         this.setVisible(true);
     }
     

src/com/dmdirc/ui/dialogs/UpdaterDialog.java → src/com/dmdirc/ui/dialogs/SwingUpdaterDialog.java

@@ -22,11 +22,12 @@
 
 package com.dmdirc.ui.dialogs;
 
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 import com.dmdirc.ui.components.StandardDialog;
 import com.dmdirc.updater.Update;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
+import com.dmdirc.ui.interfaces.UpdaterDialog;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -47,7 +48,8 @@ import javax.swing.WindowConstants;
  * and walks them through the process of downloading the update.
  * @author chris
  */
-public final class UpdaterDialog extends StandardDialog implements ActionListener {
+public final class SwingUpdaterDialog extends StandardDialog implements
+        ActionListener, UpdaterDialog {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -57,17 +59,14 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
     private static final long serialVersionUID = 1;
     
     /** List of updates. */
-    private List<Update> updates;
-    
-    /** Update info header. */
-    private JLabel header;
+    private final List<Update> updates;
     
     /**
      * Creates a new instance of the updater dialog.
      * @param updates A list of updates that are available.
      */
-    public UpdaterDialog(final List<Update> updates) {
-        super(MainFrame.getMainFrame(), false);
+    public SwingUpdaterDialog(final List<Update> updates) {
+        super(Main.getUI().getMainWindow(), false);
         
         this.updates = updates;
         
@@ -77,8 +76,6 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         getCancelButton().addActionListener(this);
         
         setTitle("Update available");
-        setLocationRelativeTo(MainFrame.getMainFrame());
-        setVisible(true);
     }
     
     /** Initialises the components. */
@@ -87,10 +84,10 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         
         setLayout(new BorderLayout());
         
-        header = new JLabel("<html><big>Update Available</big><br><br>"
+        JLabel header = new JLabel("<html><big>Update Available</big><br><br>"
                 + "An update is available for one or more "
                 + "components of DMDirc:</html>");
-        header.setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, 
+        header.setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER,
                 LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
         add(header, BorderLayout.NORTH);
         
@@ -114,7 +111,7 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         
         final JScrollPane pane = new JScrollPane(table);
         pane.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_BORDER, LARGE_BORDER, 
+                BorderFactory.createEmptyBorder(SMALL_BORDER, LARGE_BORDER,
                 SMALL_BORDER, LARGE_BORDER),
                 BorderFactory.createEtchedBorder()));
         pane.setPreferredSize(new Dimension(400, 150));
@@ -122,7 +119,7 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         
         final JPanel buttonContainer = new JPanel();
         buttonContainer.setLayout(new BorderLayout());
-        buttonContainer.setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER, 
+        buttonContainer.setBorder(BorderFactory.createEmptyBorder(SMALL_BORDER,
                 LARGE_BORDER, LARGE_BORDER, LARGE_BORDER));
         
         final JButton lButton = new JButton();
@@ -131,7 +128,7 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         rButton.setPreferredSize(new Dimension(100, 30));
         buttonContainer.add(lButton, BorderLayout.WEST);
         buttonContainer.add(rButton, BorderLayout.EAST);
-                
+        
         orderButtons(lButton, rButton);
         //getOkButton().setText("Update");
         
@@ -139,16 +136,22 @@ public final class UpdaterDialog extends StandardDialog implements ActionListene
         
         pack();
     }
-
+    
+    /** {@inheritDoc} */
+    public void display() {
+        setLocationRelativeTo(Main.getUI().getMainWindow());
+        setVisible(true);
+    }
+    
     /** {@inheritDoc} */
     public void actionPerformed(final ActionEvent e) {
         /*if (e.getSource().equals(getOkButton())) {
             getOkButton().setEnabled(false);
-            
+         
             header.setText("<html><big>Updating...</big><br><br>"
                 + "DMDirc is updating the following components:</html>");
         } else if (e.getSource().equals(getCancelButton())) {*/
-            dispose();
+        dispose();
         //}
     }
 }

src/com/dmdirc/ui/dialogs/about/AboutDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.dialogs.about;
 
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 import com.dmdirc.ui.components.StandardDialog;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
@@ -55,9 +55,9 @@ public final class AboutDialog extends StandardDialog implements
     
     /** Creates a new instance of AboutDialog. */
     private AboutDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         initComponents();
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
         this.setVisible(true);
     }
     

src/com/dmdirc/ui/dialogs/actionseditor/ActionsEditorDialog.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.dialogs.actionseditor;
 
+import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionType;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.StandardDialog;
 import com.dmdirc.ui.dialogs.ActionsManagerDialog;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
@@ -74,7 +74,7 @@ public final class ActionsEditorDialog extends StandardDialog implements
      */
     private ActionsEditorDialog(final ActionsManagerDialog parent,
             final Action action) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         this.parent = parent;
         this.action = action;
@@ -85,7 +85,7 @@ public final class ActionsEditorDialog extends StandardDialog implements
         addListeners();
         layoutComponents();
         
-        this.setLocationRelativeTo(MainFrame.getMainFrame());
+        this.setLocationRelativeTo(Main.getUI().getMainWindow());
         
         this.setVisible(true);
     }

src/com/dmdirc/ui/dialogs/actionseditor/ConditionEditorDialog.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.ui.dialogs.actionseditor;
 
+import com.dmdirc.Main;
 import com.dmdirc.actions.ActionComparison;
 import com.dmdirc.actions.ActionComponent;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.ActionType;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.StandardDialog;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 import static com.dmdirc.ui.UIUtilities.layoutGrid;
@@ -101,7 +101,7 @@ public final class ConditionEditorDialog extends StandardDialog implements
      */
     private ConditionEditorDialog(final ConditionsTabPanel parent,
             final ActionType trigger, final ActionCondition condition) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         this.trigger = trigger;
         this.parent = parent;
@@ -126,7 +126,7 @@ public final class ConditionEditorDialog extends StandardDialog implements
         addListeners();
         layoutComponents();
         
-        this.setLocationRelativeTo(MainFrame.getMainFrame());
+        this.setLocationRelativeTo(Main.getUI().getMainWindow());
         
         this.setVisible(true);
     }

src/com/dmdirc/ui/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -23,9 +23,9 @@
 package com.dmdirc.ui.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
+import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.StandardDialog;
 import com.dmdirc.ui.components.expandingsettings.SettingsPanel;
 import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
@@ -88,7 +88,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements Actio
      * @param newChannel The channel object that we're editing settings for
      */
     private ChannelSettingsDialog(final Channel newChannel) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
 
         channel = newChannel;
         identity =
@@ -99,7 +99,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements Actio
         initListeners();
 
         pack();
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
     }
 
     /**

src/com/dmdirc/ui/dialogs/error/ErrorListDialog.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.ui.dialogs.error;
 
+import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorStatus;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.PackingTable;
 import com.dmdirc.ui.components.StandardDialog;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
@@ -95,7 +95,7 @@ public final class ErrorListDialog extends StandardDialog implements
     
     /** Creates a new instance of ErrorListDialog. */
     private ErrorListDialog() {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         setTitle("DMDirc: Error list");
         

src/com/dmdirc/ui/dialogs/error/FatalErrorDialog.java

@@ -23,9 +23,9 @@
 package com.dmdirc.ui.dialogs.error;
 
 import com.dmdirc.IconManager;
+import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorStatus;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.ui.MainFrame;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
@@ -239,7 +239,7 @@ public final class FatalErrorDialog extends JDialog implements ActionListener,
         setVisible(false);
         new Timer().schedule(new TimerTask() {
             public void run() {
-                MainFrame.getMainFrame().setVisible(false);
+                Main.getUI().getMainWindow().setVisible(false);
                 while (error.getStatus() != ErrorStatus.FINISHED) {
                     try {
                         Thread.sleep(1000);

src/com/dmdirc/ui/dialogs/serversetting/ServerSettingsDialog.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.dialogs.serversetting;
 
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.StandardDialog;
 import com.dmdirc.ui.components.expandingsettings.SettingsPanel;
 import com.dmdirc.ui.components.expandingsettings.SettingsPanel.OptionType;
@@ -72,7 +72,7 @@ public final class ServerSettingsDialog extends StandardDialog
      * @param server The server object that we're editing settings for
      */
     public ServerSettingsDialog(final Server server) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         this.server = server;
         
@@ -83,7 +83,7 @@ public final class ServerSettingsDialog extends StandardDialog
         initComponents();
         initListeners();
         pack();
-        setLocationRelativeTo(MainFrame.getMainFrame());
+        setLocationRelativeTo(Main.getUI().getMainWindow());
     }
     
     /** Initialises the main UI components. */

src/com/dmdirc/ui/dialogs/wizard/WizardDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.dialogs.wizard;
 
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;
@@ -87,7 +87,7 @@ public final class WizardDialog extends JDialog implements ActionListener,
      */
     public WizardDialog(final String title, final List<Step> steps,
             final Wizard wizard, final boolean modal) {
-        super(MainFrame.getMainFrame(), modal);
+        super(Main.getUI().getMainWindow(), modal);
         
         this.title = title;
         this.steps = new ArrayList<Step>(steps);
@@ -178,7 +178,7 @@ public final class WizardDialog extends JDialog implements ActionListener,
             setTitle(title);
             setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
             pack();
-            setLocationRelativeTo(MainFrame.getMainFrame());
+            setLocationRelativeTo(Main.getUI().getMainWindow());
             setResizable(false);
             setVisible(true);
         }

src/com/dmdirc/ui/framemanager/DummyFrameManager.java

@@ -24,9 +24,10 @@ package com.dmdirc.ui.framemanager;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.ui.interfaces.FrameManager;
 
 import java.awt.Color;
 
@@ -50,49 +51,49 @@ public final class DummyFrameManager implements FrameManager {
     
     /** {@inheritDoc} */
     public void addServer(final Server server) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: addServer: " + server);
     }
     
     /** {@inheritDoc} */
     public void delServer(final Server server) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: delServer: " + server);
     }
     
     /** {@inheritDoc} */
     public void addChannel(final Server server, final Channel channel) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: addChannel: " + channel + "@" + server);
     }
     
     /** {@inheritDoc} */
     public void delChannel(final Server server, final Channel channel) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: delChannel: " + channel + "@" + server);
     }
     
     /** {@inheritDoc} */
     public void addQuery(final Server server, final Query query) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: addQuery: " + query + "@" + server);
     }
     
     /** {@inheritDoc} */
     public void delQuery(final Server server, final Query query) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: delQuery: " + query + "@" + server);
     }
     
     /** {@inheritDoc} */
     public void addCustom(final Server server, final FrameContainer window) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: addCustom: " + window + "@" + server);
     }
     
     /** {@inheritDoc} */
     public void delCustom(final Server server, final FrameContainer window) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: delCustom: " + window + "@" + server);
     }
     
@@ -108,25 +109,25 @@ public final class DummyFrameManager implements FrameManager {
     
     /** {@inheritDoc} */
     public void showNotification(final FrameContainer source, final Color colour) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: Notifcation for " + source);
     }
     
     /** {@inheritDoc} */
     public void clearNotification(final FrameContainer source) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: Clear notification for " + source);
     }
     
     /** {@inheritDoc} */
     public void setSelected(final FrameContainer source) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: Now focused: " + source);
     }
 
     /** {@inheritDoc} */
     public void iconUpdated(final FrameContainer window) {
-        MainFrame.getMainFrame().getStatusBar()
+        Main.getUI().getMainWindow().getStatusBar()
                 .setMessage("DummyFrameManager: Icon changed: " + window);
     }
 }

src/com/dmdirc/ui/framemanager/MainFrameManager.java

@@ -30,6 +30,7 @@ import com.dmdirc.Server;
 import com.dmdirc.ui.framemanager.buttonbar.ButtonBar;
 import com.dmdirc.ui.framemanager.tree.TreeFrameManager;
 import com.dmdirc.ui.framemanager.windowmenu.WindowMenuFrameManager;
+import com.dmdirc.ui.interfaces.FrameManager;
 
 import java.awt.Color;
 import java.io.IOException;

src/com/dmdirc/ui/framemanager/buttonbar/ButtonBar.java

@@ -25,12 +25,12 @@ package com.dmdirc.ui.framemanager.buttonbar;
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.UIUtilities;
-import com.dmdirc.ui.framemanager.FrameManager;
-import com.dmdirc.ui.framemanager.FramemanagerPosition;
+import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.interfaces.FramemanagerPosition;
 import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.BorderLayout;
@@ -291,7 +291,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param e The action event associated with this action
      */
     public void actionPerformed(final ActionEvent e) {
-        final Window active = MainFrame.getMainFrame().getActiveFrame();
+        final Window active = Main.getUI().getMainWindow().getActiveFrame();
         
         for (Map.Entry<FrameContainer, JToggleButton> entry : buttons.entrySet()) {
             if (entry.getValue().equals(e.getSource())) {

src/com/dmdirc/ui/framemanager/tree/TreeFrameManager.java

@@ -29,7 +29,7 @@ import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.framemanager.FrameManager;
+import com.dmdirc.ui.interfaces.FrameManager;
 import static com.dmdirc.ui.UIUtilities.SMALL_BORDER;
 
 import java.awt.BorderLayout;

src/com/dmdirc/ui/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -24,11 +24,12 @@ package com.dmdirc.ui.framemanager.windowmenu;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.FrameContainerComparator;
-import com.dmdirc.ui.framemanager.FrameManager;
+import com.dmdirc.ui.interfaces.FrameManager;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -160,7 +161,7 @@ public final class WindowMenuFrameManager implements FrameManager,
         mi.addActionListener(this);
         menuItemMap.put(window, mi);
         newMap.putAll(menuItemMap);
-        MainFrame.getMainFrame().populateWindowMenu(newMap);
+        Main.getUI().getMainWindow().populateWindowMenu(newMap);
     }
     
     /**
@@ -173,7 +174,7 @@ public final class WindowMenuFrameManager implements FrameManager,
                 new TreeMap<FrameContainer, JMenuItem>(new FrameContainerComparator());
         menuItemMap.remove(window);
         newMap.putAll(menuItemMap);
-        MainFrame.getMainFrame().populateWindowMenu(newMap);
+        Main.getUI().getMainWindow().populateWindowMenu(newMap);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/framemanager/FrameManager.java → src/com/dmdirc/ui/interfaces/FrameManager.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager;
+package com.dmdirc.ui.interfaces;
 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;

src/com/dmdirc/ui/framemanager/FramemanagerPosition.java → src/com/dmdirc/ui/interfaces/FramemanagerPosition.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.ui.framemanager;
+package com.dmdirc.ui.interfaces;
 
 import java.util.Locale;
 

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

@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2006-2007 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.ui.interfaces;
+
+import java.awt.Component;
+import javax.swing.Icon;
+
+/**
+ * Status bar interface.
+ */
+public interface StatusBar {
+    
+    /**
+     * sets the message in the status bar.
+     *
+     * @param newMessage Message to display
+     */
+    void setMessage(final String newMessage);
+    
+    /**
+     * Sets the message in the status bar with a specified callback event
+     * using the default timeout.
+     *
+     * @param newMessage Message to display
+     * @param newNotifier status message notifier to be notified for events on
+     * this message
+     */
+    void setMessage(final String newMessage, 
+            final StatusMessageNotifier newNotifier);
+    
+    /**
+     * Sets the message in the status bar with a specified callback event for
+     * a specified time.
+     *
+     * @param newMessage Message to display
+     * @param newNotifier status message notifier to be notified for events on
+     * this message
+     * @param timeout message timeout in seconds
+     */
+    void setMessage(final String newMessage,
+            final StatusMessageNotifier newNotifier, final int timeout);
+    
+    /**
+     * Removes the message from the status bar.
+     */
+    void clearMessage();
+    
+    /**
+     * sets the icon in the status bar.
+     *
+     * @param newIcon Icon to display
+     */
+    void setError(final Icon newIcon);
+    
+    /**
+     * sets the icon in the status bar with a specified callback event.
+     *
+     * @param newIcon Icon to display
+     * @param newNotifier status error notifier to be notified for events on
+     * this error
+     */
+    void setError(final Icon newIcon,
+            final StatusErrorNotifier newNotifier);
+    
+    /**
+     * Removes the error state from the status bar.
+     */
+    void clearError();
+    
+    /**
+     * Adds a component to the status bar.
+     *
+     * @param component component to add
+     */
+    void addComponent(final Component component);
+    
+    /**
+     * Removes a component to the status bar.
+     *
+     * @param component component to add
+     */
+    void removeComponent(final Component component);
+    
+}

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

@@ -28,8 +28,8 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.ui.MainFrame;
-import com.dmdirc.ui.components.StatusBar;
-import com.dmdirc.ui.framemanager.FrameManager;
+import com.dmdirc.updater.Update;
+import java.util.List;
 
 /**
  * Defines the methods that should be implemented by UI controllers. Controllers
@@ -103,6 +103,15 @@ public interface UIController {
      */
     PreferencesPanel getPreferencesPanel(PreferencesInterface parent, String title);
     
+    /**
+     * Returns an updater dialog for the specified updates.
+     * 
+     * @param updates Updates available
+     *
+     * @return UpdaterDialog
+     */
+    UpdaterDialog getUpdaterDialog(List<Update> updates);
+    
     /**
      * Initialises any settings required by this UI (this is always called
      * before any aspect of the UI is instansiated).

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2007 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.ui.interfaces;
+
+/**
+ * Updater dialog
+ */
+public interface UpdaterDialog {
+    
+    /** Displays the dialog. */
+    void display();
+}

src/com/dmdirc/updater/UpdateChecker.java

@@ -27,8 +27,6 @@ import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.MainFrame;
-import com.dmdirc.ui.dialogs.UpdaterDialog;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -72,7 +70,7 @@ public final class UpdateChecker implements Runnable, MouseListener {
     
     /** {@inheritDoc} */
     public void run() {
-        MainFrame.getMainFrame().getStatusBar().setMessage("Checking for updates...");
+        Main.getUI().getMainWindow().getStatusBar().setMessage("Checking for updates...");
         
         updates.clear();
         
@@ -122,7 +120,7 @@ public final class UpdateChecker implements Runnable, MouseListener {
      */
     private void checkLine(final String line) {
         if (line.startsWith("uptodate")) {
-            MainFrame.getMainFrame().getStatusBar().setMessage("No updates available");
+            Main.getUI().getMainWindow().getStatusBar().setMessage("No updates available");
         } else if (line.startsWith("outofdate")) {
             doUpdateAvailable(line);
         } else {
@@ -144,7 +142,7 @@ public final class UpdateChecker implements Runnable, MouseListener {
             label.addMouseListener(this);
             label.setBorder(BorderFactory.createEtchedBorder());
             label.setIcon(IconManager.getIconManager().getIcon("update"));
-            MainFrame.getMainFrame().getStatusBar().addComponent(label);
+            Main.getUI().getMainWindow().getStatusBar().addComponent(label);
         }
     }
     
@@ -165,7 +163,7 @@ public final class UpdateChecker implements Runnable, MouseListener {
         /*
         final List<Update> temp = new ArrayList<Update>();
         temp.add(new Update("outofdate teststuff 20073005 20060101 http://www.example.com/"));
-        new UpdaterDialog(temp);
+        new SwingUpdaterDialog(temp);
          */
         
         new Timer().schedule(new TimerTask() {
@@ -177,7 +175,7 @@ public final class UpdateChecker implements Runnable, MouseListener {
     
     /** {@inheritDoc} */
     public void mouseClicked(final MouseEvent e) {
-        new UpdaterDialog(updates);
+        Main.getUI().getUpdaterDialog(updates).display();
     }
     
     /** {@inheritDoc} */