More MainFrame->Window changes.

Change-Id: If813d8606803f91455a5462edacb5d691345acbe
Reviewed-on: http://gerrit.dmdirc.com/3459
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -24,9 +24,9 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.events.PluginRefreshEvent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
@@ -37,6 +37,7 @@ import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 
+import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -75,7 +76,7 @@ public class PluginPanel extends AddonPanel {
     @Inject
     public PluginPanel(
             final EventBus eventBus,
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             final PluginManager pluginManager,
             final DataLoaderWorkerFactory workerFactory,
             @GlobalConfig final IconManager iconManager,

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -24,15 +24,16 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
+import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -69,7 +70,7 @@ public class ThemePanel extends AddonPanel {
      */
     @Inject
     public ThemePanel(
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             final ThemeManager themeManager,
             final DataLoaderWorkerFactory workerFactory,
             @GlobalConfig final IconManager iconManager,

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
 import com.dmdirc.addons.ui_swing.actions.CutAction;
@@ -48,6 +47,7 @@ import com.google.common.eventbus.EventBus;
 import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -90,7 +90,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     /** Typing indicator label. */
     private TypingLabel typingLabel;
     /** Main frame. */
-    private final Provider<MainFrame> mainFrame;
+    private final Provider<Window> parentWindow;
     /** Plugin Manager. */
     private final PluginManager pluginManager;
     /** Paste dialog factory. */
@@ -117,7 +117,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
         this.config = owner.getConfigManager();
         this.colourManager = new ColourManager(config);
-        this.mainFrame = deps.mainFrame;
+        this.parentWindow = deps.mainWindow;
         this.pluginManager = deps.pluginManager;
         this.pasteDialogFactory = deps.pasteDialog;
         this.clipboard = deps.clipboard;
@@ -354,7 +354,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             if (pasteTrigger != null && getContainer().getNumLines(text)
                     > pasteTrigger) {
                 //show the multi line paste dialog
-                pasteDialogFactory.getPasteDialog(this, text, mainFrame.get()).
+                pasteDialogFactory.getPasteDialog(this, text, parentWindow.get()).
                         displayOrRequestFocus();
             } else {
                 //send the lines

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
@@ -38,6 +37,7 @@ import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.security.cert.CertificateException;
@@ -59,8 +59,8 @@ public final class ServerFrame extends InputTextFrame implements
 
     /** Serial version UID. */
     private static final long serialVersionUID = 9;
-    /** Main frame. */
-    private final Provider<MainFrame> mainFrame;
+    /** Main window provider. */
+    private final Provider<Window> mainWindow;
     /** Icon manager. */
     private final IconManager iconManager;
     /** Dialog provider to close SSD. */
@@ -86,7 +86,7 @@ public final class ServerFrame extends InputTextFrame implements
             final KeyedDialogProvider<Connection, ServerSettingsDialog> dialogProvider,
             @Unbound final Connection owner) {
         super(deps, inputFieldProvider, owner.getWindowModel());
-        this.mainFrame = deps.mainFrame;
+        this.mainWindow = deps.mainWindow;
         this.iconManager = deps.iconManager;
         this.dialogProvider = dialogProvider;
         this.connection = owner;
@@ -159,7 +159,7 @@ public final class ServerFrame extends InputTextFrame implements
     public void certificateProblemEncountered(final X509Certificate[] chain,
             final Collection<CertificateException> problems,
             final CertificateManager certificateManager) {
-        sslDialog = new SSLCertificateDialog(iconManager, mainFrame.get(),
+        sslDialog = new SSLCertificateDialog(iconManager, mainWindow.get(),
                 new SSLCertificateDialogModel(chain, problems, certificateManager));
         sslDialog.display();
     }

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
-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.ChannelCopyAction;
@@ -35,6 +34,7 @@ import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
 import com.dmdirc.addons.ui_swing.textpane.MouseEventType;
@@ -59,7 +59,6 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
@@ -67,6 +66,7 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.google.common.eventbus.EventBus;
 
 import java.awt.Point;
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -87,7 +87,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Implements a generic (internal) frame.
  */
-public abstract class TextFrame extends JPanel implements Window,
+public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.ui.Window,
         ConfigChangeListener, TextPaneListener, FrameCloseListener {
 
     /** A version number for this class. */
@@ -537,7 +537,7 @@ public abstract class TextFrame extends JPanel implements Window,
 
         final TextPaneFactory textPaneFactory;
         final SwingController controller;
-        final Provider<MainFrame> mainFrame;
+        final Provider<Window> mainWindow;
         final PopupManager popupManager;
         final EventBus eventBus;
         final AggregateConfigProvider globalConfig;
@@ -552,7 +552,7 @@ public abstract class TextFrame extends JPanel implements Window,
         public TextFrameDependencies(
                 final TextPaneFactory textPaneFactory,
                 final SwingController controller,
-                final Provider<MainFrame> mainFrame,
+                @MainWindow final Provider<Window> mainWindow,
                 final PopupManager popupManager,
                 final EventBus eventBus,
                 final PasteDialogFactory pasteDialog,
@@ -564,7 +564,7 @@ public abstract class TextFrame extends JPanel implements Window,
                 final CommandController commandController) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
-            this.mainFrame = mainFrame;
+            this.mainWindow = mainWindow;
             this.popupManager = popupManager;
             this.eventBus = eventBus;
             this.globalConfig = globalConfig;

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

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -62,7 +63,7 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
      */
     @Inject
     public AboutDialog(
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             final InfoPanel infoPanel,
             final CreditsPanel creditsPanel,
             final LicencesPanel licensesPanel,

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

@@ -30,15 +30,16 @@ import com.dmdirc.actions.ActionSubstitutorFactory;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 
 import java.awt.Dimension;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -103,7 +104,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
      */
     @Inject
     public AliasManagerDialog(
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             final ActionSubstitutorFactory substitutorFactory,
             final AliasWrapper aliasWrapper,
             final ActionFactory actionFactory,

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -22,10 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.channellist;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -47,9 +48,10 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
     private final JLabel total;
 
     @Inject
-    public ChannelListDialog(final MainFrame mainFrame,
+    public ChannelListDialog(
+            @MainWindow final Window mainWindow,
             final ActiveFrameManager activeFrameManager) {
-        super(mainFrame, ModalityType.MODELESS);
+        super(mainWindow, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
         list = new ChannelListPanel(

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -37,6 +36,7 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -108,7 +108,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final Channel channel,
-            final MainFrame parentWindow,
+            final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController) {
         super(parentWindow, ModalityType.MODELESS);

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

@@ -23,14 +23,15 @@
 package com.dmdirc.addons.ui_swing.dialogs.error;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.IconManager;
 
 import java.awt.Dimension;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -78,13 +79,14 @@ public final class ErrorListDialog extends StandardDialog implements
     /**
      * Creates a new instance of ErrorListDialog.
      *
-     * @param mainFrame   The parent window.
+     * @param parentWindow The parent window.
      * @param iconManager The manager to use to load icons.
      */
     @Inject
-    public ErrorListDialog(final MainFrame mainFrame,
+    public ErrorListDialog(
+            @MainWindow final Window parentWindow,
             @GlobalConfig final IconManager iconManager) {
-        super(mainFrame, ModalityType.MODELESS);
+        super(parentWindow, ModalityType.MODELESS);
 
         setTitle("Error list");
         setMinimumSize(new Dimension(600, 550));

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -31,12 +30,14 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForSettings;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
@@ -87,7 +88,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /**
      * Creates a new instance of SwingPreferencesDialog.
      *
-     * @param mainFrame             Main frame to parent dialogs on.
+     * @param parentWindow          Main window to parent dialogs on.
      * @param iconManager           Icon manager used to retrieve images
      * @param restartDialogProvider The provider to use for restart dialogs.
      * @param dialogModelProvider   The provider to use to get a dialog model.
@@ -95,11 +96,12 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      */
     @Inject
     public SwingPreferencesDialog(
-            final MainFrame mainFrame, @GlobalConfig final IconManager iconManager,
+            @MainWindow final Window parentWindow,
+            @GlobalConfig final IconManager iconManager,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
             final Provider<CategoryPanel> categoryPanelProvider) {
-        super(mainFrame, ModalityType.MODELESS);
+        super(parentWindow, ModalityType.MODELESS);
 
         this.iconManager = iconManager;
         this.restartDialogProvider = restartDialogProvider;

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

@@ -24,12 +24,12 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.renderers.URIHandlerCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.URISchemeCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.config.validators.URLProtocolValidator;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -103,7 +103,7 @@ public class URLConfigPanel extends JPanel implements
      */
     @Inject
     public URLConfigPanel(
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userConfig,
             @GlobalConfig final IconManager iconManager) {

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

@@ -24,16 +24,18 @@ package com.dmdirc.addons.ui_swing.dialogs.profiles;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.actions.wrappers.Profile;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.renderers.PropertyListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatableJTextField;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatableReorderableJList;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.IconManager;
 
+import java.awt.Window;
+
 import javax.inject.Inject;
 import javax.swing.Box;
 import javax.swing.JButton;
@@ -87,7 +89,7 @@ public class ProfileManagerDialog extends StandardDialog {
      */
     @Inject
     public ProfileManagerDialog(
-            final MainFrame mainFrame,
+            @MainWindow final Window mainFrame,
             final IdentityFactory identityFactory,
             final IdentityController identityController,
             @GlobalConfig final IconManager iconManager) {

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

@@ -24,7 +24,6 @@ package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
@@ -36,6 +35,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -73,17 +73,17 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
      * Creates a new instance of ServerSettingsDialog.
      *
      * @param preferencesManager Preferences manager to retrieve settings from
-     * @param compFactory    Preferences setting component factory
-     * @param performWrapper Wrapper for the perform tab.
+     * @param compFactory        Preferences setting component factory
+     * @param performWrapper     Wrapper for the perform tab.
      * @param connection         The server object that we're editing settings for
-     * @param parentWindow   Parent window
+     * @param parentWindow       Parent window
      */
     public ServerSettingsDialog(
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final Connection connection,
-            final MainFrame parentWindow) {
+            final Window parentWindow) {
         super(parentWindow, ModalityType.MODELESS);
         this.connection = connection;
         this.performWrapper = performWrapper;
@@ -104,7 +104,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
      * @param compFactory  Preferences setting component factory
      */
     private void initComponents(
-            final MainFrame parentWindow,
+            final Window parentWindow,
             final AggregateConfigProvider config,
             final PrefsComponentFactory compFactory) {
         orderButtons(new JButton(), new JButton());

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
@@ -32,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -40,6 +40,7 @@ import com.dmdirc.updater.manager.UpdateManagerStatus;
 import com.dmdirc.updater.manager.UpdateStatus;
 
 import java.awt.Dimension;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -89,7 +90,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
     @Inject
     public SwingUpdaterDialog(
             final CachingUpdateManager updateManager,
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider) {
         super(parentWindow, ModalityType.MODELESS);
 

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

@@ -24,10 +24,10 @@ package com.dmdirc.addons.ui_swing.dialogs.url;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
@@ -73,7 +73,7 @@ public class URLDialog extends StandardDialog implements ActionListener {
             @Unbound final URI url,
             @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider global,
             @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider config,
-            final MainFrame parentWindow,
+            @SuppressWarnings("qualifiers") @MainWindow final Window parentWindow,
             final URLHandler urlHandler) {
         super(parentWindow, ModalityType.MODELESS);
 

src/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -49,6 +49,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.ServiceManager;
 
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 
 import javax.inject.Provider;
@@ -133,7 +134,7 @@ public class DialogModule {
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
-            final MainFrame parentWindow) {
+            @MainWindow final Window parentWindow) {
         return new KeyedDialogProvider<Connection, ServerSettingsDialog>() {
             @Override
             protected ServerSettingsDialog getInstance(final Connection key) {
@@ -152,7 +153,7 @@ public class DialogModule {
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController) {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {

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

@@ -26,9 +26,9 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.CorePluginExtractor;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.addons.ui_swing.wizard.Step;
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
@@ -43,6 +43,7 @@ import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Dimension;
+import java.awt.Window;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -79,7 +80,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
      */
     @Inject
     public SwingFirstRunWizard(
-            final MainFrame parentWindow,
+            @MainWindow final Window parentWindow,
             @UserConfig final ConfigProvider config,
             @Directory(DirectoryType.ACTIONS) final String actionsDirectory,
             final CorePluginExtractor pluginExtractor,