Switch all UI stuff to use SwingController.getMainFrame() in favour of

horrible casting Main.getUI() to SwingController

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -23,10 +23,8 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.Server;
-import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 
@@ -67,7 +65,7 @@ public class ServerInfoDialog extends StandardDialog {
      * @param parent The {@link JPanel} to use for positioning
      */
     public ServerInfoDialog(final LagDisplayPlugin ldp, final JPanel parent) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         this.parent = parent;
 

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.nickcolours;
 
-import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
 
@@ -32,7 +31,6 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
@@ -81,7 +79,7 @@ public class NickColourInputDialog extends StandardDialog
     public NickColourInputDialog(final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
         
         this.panel = panel;
         this.row = row;
@@ -94,7 +92,7 @@ public class NickColourInputDialog extends StandardDialog
         
         setTitle("Nick colour editor");
         
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(SwingController.getMainFrame());
         setVisible(true);
     }
     

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 import java.awt.Color;
 import java.awt.Point;
@@ -146,7 +145,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
      * @param y The y-axis position for the OSD window
      */
     public OsdWindow(final String text, final boolean config, final int x, final int y) {
-        super(((MainFrame) Main.getUI().getMainWindow()), false);
+        super(SwingController.getMainFrame(), false);
         
         this.config = config;
         

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

@@ -35,7 +35,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 import java.awt.AWTException;
 import java.awt.Frame;
@@ -165,8 +165,8 @@ public final class SystrayPlugin extends Plugin implements ActionListener,
                 Main.getUI().getMainWindow().setVisible(false);
             } else {
                 Main.getUI().getMainWindow().setVisible(true);
-                ((MainFrame) Main.getUI().getMainWindow()).setState(Frame.NORMAL);
-                ((MainFrame) Main.getUI().getMainWindow()).toFront();
+                SwingController.getMainFrame().setState(Frame.NORMAL);
+                SwingController.getMainFrame().toFront();
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/ColourPickerDialog.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 
 import java.awt.Window;
 import java.awt.event.ActionListener;
@@ -89,7 +88,7 @@ public final class ColourPickerDialog extends StandardDialog {
      */
     public ColourPickerDialog(final boolean showIRC, final boolean showHex,
             final Window window) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         colourChooser = new ColourPickerPanel(showIRC, showHex);
 

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

@@ -23,10 +23,9 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.Main;
 import com.dmdirc.ui.interfaces.SearchBar;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
 import com.dmdirc.addons.ui_swing.textpane.IRCDocument;
@@ -239,7 +238,7 @@ public final class SwingSearchBar extends JPanel implements ActionListener,
                 || textPane.getSelectedRange().getEndPos() != 0)
                 && ((up && result.getEndLine() > textPane.getSelectedRange().getEndLine())
                 || (!up && result.getStartLine() < textPane.getSelectedRange().getStartLine()))
-                && JOptionPane.showConfirmDialog((MainFrame) Main.getUI().getMainWindow(),
+                && JOptionPane.showConfirmDialog(SwingController.getMainFrame(),
                 "Do you want to continue searching from the " + (up ? "end" : "beginning"),
                 "No more results", JOptionPane.OK_CANCEL_OPTION,
                 JOptionPane.QUESTION_MESSAGE) != JOptionPane.OK_OPTION) {

src/com/dmdirc/addons/ui_swing/components/TextFrame.java

@@ -42,7 +42,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.actions.ChannelCopyAction;
 import com.dmdirc.addons.ui_swing.actions.CommandAction;
 import com.dmdirc.addons.ui_swing.actions.HyperlinkCopyAction;
@@ -182,9 +182,8 @@ public abstract class TextFrame extends JInternalFrame implements Window,
         setResizable(true);
         setIconifiable(true);
         setFocusable(true);
-        setPreferredSize(new Dimension(((MainFrame) Main.getUI().getMainWindow()).getWidth() /
-                2,
-                ((MainFrame) Main.getUI().getMainWindow()).getHeight() / 3));
+        setPreferredSize(new Dimension(SwingController.getMainFrame().getWidth() /
+                2, SwingController.getMainFrame().getHeight() / 3));
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 
         addPropertyChangeListener("maximum", this);

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -29,7 +29,7 @@ import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.validator.PortValidator;
 import com.dmdirc.config.prefs.validator.RegexStringValidator;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
@@ -109,7 +109,7 @@ public final class NewServerDialog extends StandardDialog implements ActionListe
     public static void showNewServerDialog(final Window parentWindow) {
         me = getNewServerDialog(parentWindow);
 
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 
 import java.awt.event.ActionEvent;
@@ -60,7 +59,7 @@ public final class AboutDialog extends StandardDialog implements
 
     /** Creates a new instance of AboutDialog. */
     private AboutDialog() {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
         initComponents();
     }
 
@@ -68,7 +67,7 @@ public final class AboutDialog extends StandardDialog implements
     public static void showAboutDialog() {
         me = getAboutDialog();
 
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -25,13 +25,12 @@ package com.dmdirc.addons.ui_swing.dialogs.aliases;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
 import com.dmdirc.actions.wrappers.Alias;
-import com.dmdirc.Main;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 
@@ -91,7 +90,7 @@ public final class AliasManagerDialog extends StandardDialog implements
 
     /** Creates a new instance of ErrorListDialog. */
     private AliasManagerDialog() {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         setTitle("DMDirc: Alias manager");
 
@@ -108,7 +107,7 @@ public final class AliasManagerDialog extends StandardDialog implements
     public static void showAliasManagerDialog() {
         me = getAliasManagerDialog();
 
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -23,10 +23,9 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
-import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
@@ -84,7 +83,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) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         channel = newChannel;
         identity = IdentityManager.getChannelConfig(channel.getServer().
@@ -103,7 +102,7 @@ public final class ChannelSettingsDialog extends StandardDialog implements Actio
         me = getChannelSettingsDialog(channel);
 
         me.pack();
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -24,12 +24,11 @@ package com.dmdirc.addons.ui_swing.dialogs.error;
 
 import com.dmdirc.addons.ui_swing.components.renderers.ErrorLevelIconCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.DateCellRenderer;
-import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorListener;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 
@@ -86,7 +85,7 @@ public final class ErrorListDialog extends StandardDialog implements
 
     /** Creates a new instance of ErrorListDialog. */
     private ErrorListDialog() {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         setTitle("DMDirc: Error list");
 
@@ -388,7 +387,7 @@ public final class ErrorListDialog extends StandardDialog implements
     /** {@inheritDoc} */
     @Override
     public boolean isReady() {
-        return Main.getUI().getStatusBar().isVisible();
+        return SwingController.getSwingStatusBar().isVisible();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -22,8 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
-import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
@@ -78,7 +77,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      * @param text text to show in the paste dialog
      */
     public PasteDialog(final InputTextFrame newParent, final String text) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         this.parent = newParent;
 
@@ -93,7 +92,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         getOkButton().setSelected(true);
 
         pack();
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(SwingController.getMainFrame());
     }
 
     /**
@@ -231,7 +230,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
 
                 @Override
                 public void run() {
-                    setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+                    setLocationRelativeTo(SwingController.getMainFrame());
                 }
             });
         } else if (getCancelButton().equals(actionEvent.getSource())) {

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

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.Main;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.config.prefs.PreferencesSetting;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -131,7 +130,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * Creates a new instance of SwingPreferencesDialog.
      */
     private SwingPreferencesDialog() {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         categories = new HashMap<PreferencesCategory, JPanel>();
         components = new HashMap<PreferencesSetting, JComponent>();
@@ -504,8 +503,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
         }
 
         if (restart) {
-            JOptionPane.showMessageDialog((MainFrame) Main.getUI().
-                    getMainWindow(),
+            JOptionPane.showMessageDialog(SwingController.getMainFrame(),
                                           "One or more of the changes you made " +
                                           "won't take effect until you restart the client.",
                                           "Restart needed",

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

@@ -24,11 +24,10 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.addons.ui_swing.components.renderers.URISchemeCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.URIHandlerCellRenderer;
-import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.prefs.validator.URLProtocolValidator;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
@@ -253,7 +252,7 @@ public class URLConfigPanel extends JPanel implements ListSelectionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            new StandardInputDialog((MainFrame) Main.getUI().getMainWindow(),
+            new StandardInputDialog(SwingController.getMainFrame(),
                     false, "DMDIRC: New URL handler",
                     "Please enter the name of the new protocol.",
                     new URLProtocolValidator()) {

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java

@@ -22,10 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
-import com.dmdirc.Main;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
@@ -113,7 +111,7 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
         me = getProfileManagerDialog(SwingController.getMainFrame());
 
         me.pack();
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }
@@ -127,7 +125,7 @@ public final class ProfileManagerDialog extends StandardDialog implements Action
         me = getProfileManagerDialog(parentWindow);
 
         me.pack();
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -23,12 +23,11 @@
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
 import com.dmdirc.IgnoreList;
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.RegexValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
@@ -175,7 +174,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     @SuppressWarnings("unchecked")
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
-            new StandardInputDialog((MainFrame) Main.getUI().getMainWindow(),
+            new StandardInputDialog(SwingController.getMainFrame(),
                     false, "New ignore list entry",
                     "Please enter the new ignore list entry",
                     viewToggle.isSelected() ? new ValidatorChain<String>(

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
-import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.config.Identity;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
@@ -72,7 +71,7 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
      * @param server The server object that we're editing settings for
      */
     private ServerSettingsDialog(final Server server) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         this.server = server;
 
@@ -92,7 +91,7 @@ public final class ServerSettingsDialog extends StandardDialog implements Action
         me = getServerSettingsDialog(server);
         
         me.pack();
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }

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

@@ -22,11 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
-import com.dmdirc.Main;
 import com.dmdirc.interfaces.UpdateCheckerListener;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
 import com.dmdirc.addons.ui_swing.components.TextLabel;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
@@ -81,7 +80,7 @@ public final class SwingUpdaterDialog extends StandardDialog implements
      * @param updates A list of updates that are available.
      */
     private SwingUpdaterDialog(final List<Update> updates) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         initComponents(updates);
         layoutComponents();
@@ -188,7 +187,7 @@ public final class SwingUpdaterDialog extends StandardDialog implements
     /** {@inheritDoc} */
     @Override
     public void display() {
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(SwingController.getMainFrame());
         setVisible(true);
         requestFocusInWindow();
     }

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -22,9 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.url;
 
-import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.components.TextLabel;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.util.URLHandler;
@@ -61,7 +60,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
      * @param url URL to open once added
      */
     private URLDialog(final URI url) {
-        super((MainFrame) Main.getUI().getMainWindow(), false);
+        super(SwingController.getMainFrame(), false);
 
         this.url = url;
 
@@ -82,7 +81,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
     public static void showURLDialog(final URI url) {
         me = getURLDialog(url);
 
-        me.setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        me.setLocationRelativeTo(SwingController.getMainFrame());
         me.setVisible(true);
         me.requestFocusInWindow();
     }
@@ -150,7 +149,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
     public void validate() {
         super.validate();
 
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(SwingController.getMainFrame());
     }
 
     /** {@inheritDoc} */