fixes issue 2906

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

@@ -509,7 +509,7 @@ public final class SwingController extends Plugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public PreferencesInterface getPluginPrefsPanel() {
-        return new PluginPanel();
+        return new PluginPanel(me);
     }
 
     /** {@inheritDoc} */

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

@@ -31,6 +31,7 @@ import com.dmdirc.util.ListenerList;
 
 import com.dmdirc.util.ReturnableThread;
 import java.awt.Color;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -63,13 +64,19 @@ public class SwingInputField extends JComponent implements InputField,
     private final JLabel errorIndicator;
     /** Listener list. */
     private final ListenerList listeners;
+    /** Parent Window. */
+    private final Window parentWindow;
 
     /**
      * Instantiates a new swing input field.
+     *
+     * @param parentWindow Parent window
      */
-    public SwingInputField() {
+    public SwingInputField(final Window parentWindow) {
         super();
 
+        this.parentWindow = parentWindow;
+
         listeners = new ListenerList();
 
         textField = new JTextField();
@@ -133,7 +140,7 @@ public class SwingInputField extends JComponent implements InputField,
             public void run() {
                 if (IdentityManager.getGlobalConfig().getOptionBool("general",
                         "showcolourdialog")) {
-                    colourPicker = new ColourPickerDialog(irc, hex);
+                    colourPicker = new ColourPickerDialog(irc, hex, parentWindow);
                     colourPicker.addActionListener(new ActionListener() {
 
                         @Override

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

@@ -23,10 +23,11 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.ConfigFile;
 import com.dmdirc.util.InvalidConfigFileException;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -96,12 +97,12 @@ public class BrowserWindow extends JDialog implements ActionListener {
 
     /**
      * Creates and displays a new browser window.
+     *
+     * @param parentWindow Parent window
      */
-    public BrowserWindow() {
-        super((MainFrame) Main.getUI().getMainWindow(), "DMDirc Addon Browser",
-                false);
-        setIconImage(((MainFrame) Main.getUI().getMainWindow()).getIcon().
-                getImage());
+    public BrowserWindow(final Window parentWindow) {
+        super(parentWindow, "DMDirc Addon Browser", ModalityType.MODELESS);
+        setIconImages(parentWindow.getIconImages());
         setResizable(false);
         setLayout(new MigLayout("fill, wmin 650, hmin 600"));
         scrollPane.getVerticalScrollBar().setUnitIncrement(15);
@@ -158,9 +159,9 @@ public class BrowserWindow extends JDialog implements ActionListener {
         }
 
         pack();
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(parentWindow);
         setVisible(true);
-        setLocationRelativeTo((MainFrame) Main.getUI().getMainWindow());
+        setLocationRelativeTo(parentWindow);
     }
 
     /**

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

@@ -6,11 +6,11 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.DownloadListener;
 import com.dmdirc.util.Downloader;
 
+import java.awt.Window;
 import java.io.File;
 import java.io.IOException;
 
@@ -33,11 +33,17 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
     private static final long serialVersionUID = 1;
     /** Downloader progress bar. */
     private final JProgressBar jpb = new JProgressBar(0, 100);
+    /** Parent window. */
+    private Window parentWindow;
 
-    /** Instantiates a new downloader window. */
-    public DownloaderWindow() {
-        super((MainFrame) Main.getUI().getMainWindow(), "DMDirc Addon Browser",
-                false);
+    /**
+     * Instantiates a new downloader window.
+     *
+     * @param parentWindow Parent window
+     */
+    public DownloaderWindow(final Window parentWindow) {
+        super(parentWindow, "DMDirc Addon Browser", ModalityType.MODELESS);
+        this.parentWindow = parentWindow;
         setTitle("Downloading addon information...");
         setLayout(new MigLayout("fill"));
         add(jpb, "grow");
@@ -56,7 +62,7 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
         try {
             Downloader.downloadPage("http://addons.dmdirc.com/feed", 
                     Main.getConfigDir() + File.separator + "addons.feed", this);
-            new BrowserWindow();
+            new BrowserWindow(parentWindow);
         } catch (IOException ex) {
             removeAll();
             add(new JLabel("Unable to download feed."));

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

@@ -132,7 +132,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * Initialises the components for this frame.
      */
     private void initComponents() {
-        setInputField(new SwingInputField());
+        setInputField(new SwingInputField(getController().getMainFrame()));
 
         getInputField().addKeyListener(this);
         getInputField().addMouseListener(this);

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

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collections;
@@ -69,11 +70,19 @@ public final class PluginPanel extends JPanel implements
     private int selectedPlugin;
     /** Blurb label. */
     private TextLabel blurbLabel;
+    /** Parent Window. */
+    private Window parentWindow;
 
-    /** Creates a new instance of PluginDialog. */
-    public PluginPanel() {
+    /**
+     * Creates a new instance of PluginDialog.
+     *
+     * @param parentWindow Parent window
+     */
+    public PluginPanel(final Window parentWindow) {
         super();
 
+        this.parentWindow = parentWindow;
+
         initComponents();
         addListeners();
         layoutComponents();
@@ -179,7 +188,7 @@ public final class PluginPanel extends JPanel implements
 
             pluginList.repaint();
         } else if (e.getSource() != toggleButton) {
-            new DownloaderWindow();
+            new DownloaderWindow(parentWindow);
         }
     }
 

src/com/dmdirc/ui/CoreUIUtils.java

@@ -32,6 +32,10 @@ import java.awt.Window;
  * Core UI Utilities.
  */
 public class CoreUIUtils {
+
+    /** Precent creation. */
+    private CoreUIUtils() {
+    }
     
     /**
      * Centre the specified window on the active monitor.