EDT EDT EDT EDT EDT DEAR GOD THE EDT.

Change-Id: I82a1ed787e47777cfafe5073df47cebe37b1f943
Reviewed-on: http://gerrit.dmdirc.com/876
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.mediasource_vlc;
 
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceState;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -32,6 +33,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.util.Downloader;
+import com.dmdirc.util.ReturnableThread;
 
 import java.io.File;
 import java.io.IOException;
@@ -207,7 +209,15 @@ public class VlcMediaSourcePlugin extends Plugin implements MediaSource {
                 "", "category-vlc");
         final PreferencesCategory instr = new PluginPreferencesCategory(
                 getPluginInfo(), "Instructions",
-                "", new InstructionsPanel());
+                "", UIUtilities.invokeAndWait(
+                new ReturnableThread<InstructionsPanel>() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                setObject(new InstructionsPanel());
+            }
+        }));
         
         general.addSetting(new PreferencesSetting(PreferencesType.TEXT, 
                 getDomain(), "host", "Hostname and port",

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

@@ -27,6 +27,7 @@ import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -40,6 +41,7 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -53,85 +55,94 @@ import java.util.Map;
  */
 public final class NickColourPlugin extends Plugin implements ActionListener,
         ConfigChangeListener {
-    
+
     /** "Random" colours to use to colour nicknames. */
-    private String[] randColours = new String[] {
+    private String[] randColours = new String[]{
         "E90E7F", "8E55E9", "B30E0E", "18B33C",
-        "58ADB3", "9E54B3", "B39875", "3176B3",
-    };
+        "58ADB3", "9E54B3", "B39875", "3176B3",};
     private boolean useowncolour;
     private String owncolour;
     private boolean userandomcolour;
     private boolean settext;
     private boolean setnicklist;
-    
+
     /** Creates a new instance of NickColourPlugin. */
     public NickColourPlugin() {
         super();
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {
         if (type.equals(CoreActionType.CHANNEL_GOTNAMES)) {
-            final ChannelInfo chanInfo = ((Channel) arguments[0]).getChannelInfo();
-            final String network = ((Channel) arguments[0]).getServer().getNetwork();
-            
+            final ChannelInfo chanInfo =
+                    ((Channel) arguments[0]).getChannelInfo();
+            final String network = ((Channel) arguments[0]).getServer().
+                    getNetwork();
+
             for (ChannelClientInfo client : chanInfo.getChannelClients()) {
                 colourClient(network, client);
             }
         } else if (type.equals(CoreActionType.CHANNEL_JOIN)) {
-            final String network = ((Channel) arguments[0]).getServer().getNetwork();
-            
+            final String network = ((Channel) arguments[0]).getServer().
+                    getNetwork();
+
             colourClient(network, (ChannelClientInfo) arguments[1]);
         }
     }
-    
+
     /**
      * Colours the specified client according to the user's config.
      *
      * @param network The network to use for the colouring
      * @param client The client to be coloured
      */
-    private void colourClient(final String network, final ChannelClientInfo client) {
+    private void colourClient(final String network,
+            final ChannelClientInfo client) {
         final Map map = client.getMap();
-        final ClientInfo myself = client.getClient().getParser().getLocalClient();
+        final ClientInfo myself =
+                client.getClient().getParser().getLocalClient();
         final String nickOption1 = "color:"
-                + client.getClient().getParser().getStringConverter().toLowerCase(network + ":" + client.getClient().getNickname());
+                + client.getClient().getParser().getStringConverter().
+                toLowerCase(network + ":" + client.getClient().getNickname());
         final String nickOption2 = "color:"
-                + client.getClient().getParser().getStringConverter().toLowerCase("*:" + client.getClient().getNickname());
-        
+                + client.getClient().getParser().getStringConverter().
+                toLowerCase("*:" + client.getClient().getNickname());
+
         if (useowncolour && client.getClient().equals(myself)) {
             final Color color = ColourManager.parseColour(owncolour);
             putColour(map, color, color);
-        }  else if (userandomcolour) {
-            putColour(map, getColour(client.getClient().getNickname()), getColour(client.getClient().getNickname()));
+        } else if (userandomcolour) {
+            putColour(map, getColour(client.getClient().getNickname()), getColour(client.
+                    getClient().getNickname()));
         }
-        
+
         String[] parts = null;
-                
-        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), nickOption1)) {
+
+        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(),
+                nickOption1)) {
             parts = getParts(nickOption1);
-        } else if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), nickOption2)) {
+        } else if (IdentityManager.getGlobalConfig().hasOptionString(
+                getDomain(), nickOption2)) {
             parts = getParts(nickOption2);
         }
-        
+
         if (parts != null) {
             Color textColor = null;
             Color nickColor = null;
-            
+
             if (parts[0] != null) {
                 textColor = ColourManager.parseColour(parts[0], null);
             }
             if (parts[1] != null) {
                 nickColor = ColourManager.parseColour(parts[1], null);
             }
-            
+
             putColour(map, textColor, nickColor);
         }
     }
-    
+
     /**
      * Puts the specified colour into the given map. The keys are determined
      * by config settings.
@@ -141,16 +152,17 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      * @param nickColour Nick colour to be inserted
      */
     @SuppressWarnings("unchecked")
-    private void putColour(final Map map, final Color textColour, final Color nickColour) {
+    private void putColour(final Map map, final Color textColour,
+            final Color nickColour) {
         if (settext && textColour != null) {
             map.put(ChannelClientProperty.TEXT_FOREGROUND, textColour);
         }
-        
+
         if (setnicklist && nickColour != null) {
             map.put(ChannelClientProperty.NICKLIST_FOREGROUND, nickColour);
         }
     }
-    
+
     /**
      * Retrieves a pseudo-random colour for the specified nickname.
      *
@@ -159,16 +171,16 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      */
     private Color getColour(final String nick) {
         int count = 0;
-        
+
         for (int i = 0; i < nick.length(); i++) {
             count += nick.charAt(i);
         }
-        
+
         count = count % randColours.length;
-        
+
         return ColourManager.parseColour(randColours[count]);
     }
-    
+
     /**
      * Reads the nick colour data from the config.
      *
@@ -176,30 +188,31 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      */
     public Object[][] getData() {
         final List<Object[]> data = new ArrayList<Object[]>();
-        
-        for (String key : IdentityManager.getGlobalConfig().getOptions(getDomain()).keySet()) {
+
+        for (String key : IdentityManager.getGlobalConfig().getOptions(
+                getDomain()).keySet()) {
             if (key.startsWith("color:")) {
                 final String network = key.substring(6, key.indexOf(':', 6));
                 final String user = key.substring(1 + key.indexOf(':', 6));
                 final String[] parts = getParts(key);
-                
-                
+
+
                 data.add(new Object[]{network, user, parts[0], parts[1]});
             }
         }
-        
+
         final Object[][] res = new Object[data.size()][4];
-        
+
         int i = 0;
         for (Object[] row : data) {
             res[i] = row;
-            
+
             i++;
         }
-        
+
         return res;
     }
-    
+
     /**
      * Retrieves the config option with the specified key, and returns an
      * array of the colours that should be used for it.
@@ -208,17 +221,18 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
      * @return The colours specified by the given key
      */
     private String[] getParts(final String key) {
-        String[] parts = IdentityManager.getGlobalConfig().getOption(getDomain(), key).split(":");
-        
+        String[] parts = IdentityManager.getGlobalConfig().getOption(getDomain(),
+                key).split(":");
+
         if (parts.length == 0) {
             parts = new String[]{null, null};
         } else if (parts.length == 1) {
             parts = new String[]{parts[0], null};
         }
-        
+
         return parts;
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {
@@ -226,13 +240,13 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
         ActionManager.addListener(this, CoreActionType.CHANNEL_GOTNAMES,
                 CoreActionType.CHANNEL_JOIN);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
         ActionManager.removeListener(this);
     }
-    
+
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
@@ -241,14 +255,22 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
                 "General configuration for NickColour plugin.");
         final PreferencesCategory colours = new PluginPreferencesCategory(
                 getPluginInfo(), "Colours",
-                "Set colours for specific nicknames.", new NickColourPanel(this));
-        
+                "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
+                new ReturnableThread<NickColourPanel>() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        setObject(new NickColourPanel(NickColourPlugin.this));
+                    }
+                }));
+
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "shownickcoloursintext", "Show colours in text" +
-                "area", "Colour nicknames in main text area?"));
+                "ui", "shownickcoloursintext", "Show colours in text" + "area",
+                "Colour nicknames in main text area?"));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
-                "ui", "shownickcoloursinnicklist", "Show colours in" +
-                " nick list", "Colour nicknames in channel nick lists?"));
+                "ui", "shownickcoloursinnicklist", "Show colours in"
+                + " nick list", "Colour nicknames in channel nick lists?"));
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "settext", "Set colours in textarea",
                 "Should the plugin set the textarea colour of nicks?"));
@@ -261,22 +283,30 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
         general.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN,
                 getDomain(), "useowncolour", "Use colour for own nick",
                 "Always use the same colour for our own nickname?"));
-        general.addSetting(new PreferencesSetting(PreferencesType.COLOUR,
+        general.addSetting(
+                new PreferencesSetting(PreferencesType.COLOUR,
                 getDomain(), "owncolour", "Colour to use for own nick",
-                "Colour used for our own nickname, if above setting is enabled."));        
+                "Colour used for our own nickname, if above setting is enabled."));
 
         general.addSubCategory(colours);
         manager.getCategory("Plugins").addSubCategory(general);
     }
 
     private void setCachedSettings() {
-        useowncolour = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "useowncolour");
-        owncolour = IdentityManager.getGlobalConfig().getOption(getDomain(), "owncolour");
-        userandomcolour = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "userandomcolour");
-        settext = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "settext");
-        setnicklist = IdentityManager.getGlobalConfig().getOptionBool(getDomain(), "setnicklist");
-        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(), "randomcolours")) {
-            randColours = IdentityManager.getGlobalConfig().getOptionList(getDomain(), "randomcolours").toArray(new String[0]);
+        useowncolour = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "useowncolour");
+        owncolour = IdentityManager.getGlobalConfig().getOption(getDomain(),
+                "owncolour");
+        userandomcolour = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "userandomcolour");
+        settext = IdentityManager.getGlobalConfig().getOptionBool(getDomain(),
+                "settext");
+        setnicklist = IdentityManager.getGlobalConfig().getOptionBool(
+                getDomain(), "setnicklist");
+        if (IdentityManager.getGlobalConfig().hasOptionString(getDomain(),
+                "randomcolours")) {
+            randColours = IdentityManager.getGlobalConfig().getOptionList(
+                    getDomain(), "randomcolours").toArray(new String[0]);
         }
     }
 
@@ -285,5 +315,4 @@ public final class NickColourPlugin extends Plugin implements ActionListener,
     public void configChanged(final String domain, final String key) {
         setCachedSettings();
     }
-    
 }

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.nowplaying;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ListReorderButtonPanel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
@@ -30,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.util.ReturnableThread;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.Arrays;
@@ -148,20 +150,29 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
     private void updatePreview() {
         updateTimer.cancel();
 
-        MediaSource source = plugin.getBestSource();
+        final MediaSource source;
 
-        if (source == null) {
+        if (plugin.getBestSource() == null) {
             source = new DummyMediaSource();
+        } else {
+            source = plugin.getBestSource();
         }
 
-        preview.setText("Preview:\n" + plugin.doSubstitution(textfield.getText(),
-                source));
-        preview.repaint();
+        final String text = plugin.doSubstitution(
+                        UIUtilities.invokeAndWait(new ReturnableThread<String>() {
 
+                    @Override
+                    public void run() {
+                        setObject(textfield.getText());
+                    }
+                }), source);
         SwingUtilities.invokeLater(new Runnable() {
 
+            /** {@inheritDoc} */
             @Override
             public void run() {
+                preview.setText("Preview:\n" + text);
+                preview.repaint();
                 previewPanel.revalidate();
                 revalidate();
             }

src/com/dmdirc/addons/nowplaying/NowPlayingPlugin.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.nowplaying;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -34,6 +35,7 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -100,7 +102,14 @@ public class NowPlayingPlugin extends Plugin implements ActionListener  {
     /** {@inheritDoc} */
     @Override
     public void showConfig(final PreferencesManager manager) {
-        final ConfigPanel configPanel = new ConfigPanel(this, order);
+        final ConfigPanel configPanel = UIUtilities.invokeAndWait(
+                new ReturnableThread<ConfigPanel>() {
+
+            @Override
+            public void run() {
+                setObject(new ConfigPanel(NowPlayingPlugin.this, order));
+            }
+        });
         
         final PreferencesCategory category = new PluginPreferencesCategory(
                 getPluginInfo(), "Now Playing",

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

@@ -87,7 +87,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             localTarget.getInputMap(JComponent.WHEN_FOCUSED).
                     put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0), "upArrow");
         } else {
-            localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
+            localTarget.getInputMap(
+                    JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                     put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0), "upArrow");
         }
     }
@@ -120,7 +121,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             localTarget.getInputMap(JComponent.WHEN_FOCUSED).
                     put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), "downArrow");
         } else {
-            localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
+            localTarget.getInputMap(
+                    JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
                     put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), "downArrow");
         }
     }
@@ -226,17 +228,25 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             public void actionPerformed(final ActionEvent e) {
                 final String line = target.getText();
                 target.setText("");
-                new LoggingSwingWorker() {
+                UIUtilities.invokeLater(new Runnable() {
 
                     /** {@inheritDoc} */
                     @Override
-                    protected Object doInBackground() throws Exception {
+                    public void run() {
                         if (((JTextField) e.getSource()).isEditable()) {
-                            enterPressed(line);
+                            new LoggingSwingWorker() {
+
+                                /** {@inheritDoc} */
+                                @Override
+                                protected Object doInBackground() throws
+                                        Exception {
+                                    enterPressed(line);
+                                    return null;
+                                }
+                            }.execute();
                         }
-                        return null;
                     }
-                    }.execute();
+                });
             }
         });
         localTarget.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).
@@ -256,7 +266,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      */
     @Override
     public void keyTyped(final KeyEvent e) {
-    //Ignore
+        //Ignore
     }
 
     /** 
@@ -266,8 +276,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      */
     @Override
     public void keyPressed(final KeyEvent e) {
-        if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode() !=
-                KeyEvent.VK_UP && e.getKeyCode() != KeyEvent.VK_DOWN) {
+        if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode()
+                != KeyEvent.VK_UP && e.getKeyCode() != KeyEvent.VK_DOWN) {
             final String line = target.getText();
             if (UIUtilities.isCtrlDown(e) && e.getKeyCode() == KeyEvent.VK_ENTER
                     && (flags & HANDLE_RETURN) == HANDLE_RETURN) {
@@ -292,6 +302,6 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      */
     @Override
     public void keyReleased(final KeyEvent e) {
-    //Ignore
+        //Ignore
     }
 }

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

@@ -198,25 +198,35 @@ public class TopicBar extends JComponent implements ActionListener,
     /** {@inheritDoc} */
     @Override
     public void topicChanged(final Channel channel, final Topic topic) {
-        if (topicText.isEditable()) {
-            return;
-        }
-        topicText.setText("");
-        if (channel.getCurrentTopic() != null) {
-            channel.getStyliser().addStyledString((StyledDocument) topicText.
-                    getDocument(),
-                    new String[]{Styliser.CODE_HEXCOLOUR + ColourManager.getHex(
-                        foregroundColour) + channel.getCurrentTopic().getTopic(),},
-                    as);
-        }
-        if (channel.getConfigManager().getOptionBool(controller.getDomain(),
-                "hideEmptyTopicBar")) {
-            setVisible(topicText.getDocument().getLength() != 0);
-        }
-        topicText.setCaretPosition(0);
-        validateTopic();
-        setVisible(false);
-        setVisible(true);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                if (topicText.isEditable()) {
+                    return;
+                }
+                topicText.setText("");
+                if (channel.getCurrentTopic() != null) {
+                    channel.getStyliser().addStyledString((StyledDocument) topicText.
+                            getDocument(),
+                            new String[]{Styliser.CODE_HEXCOLOUR + ColourManager.
+                                getHex(
+                                foregroundColour) + channel.getCurrentTopic().
+                                getTopic(),},
+                            as);
+                }
+                if (channel.getConfigManager().getOptionBool(controller.
+                        getDomain(),
+                        "hideEmptyTopicBar")) {
+                    setVisible(topicText.getDocument().getLength() != 0);
+                }
+                topicText.setCaretPosition(0);
+                validateTopic();
+                setVisible(false);
+                setVisible(true);
+            }
+        });
     }
 
     /**

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

@@ -6,6 +6,7 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.Main;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.util.DownloadListener;
 import com.dmdirc.util.Downloader;
@@ -62,7 +63,14 @@ 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(parentWindow);
+            UIUtilities.invokeLater(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    new BrowserWindow(parentWindow);
+                }
+            });
         } catch (IOException ex) {
             removeAll();
             add(new JLabel("Unable to download feed."));
@@ -73,14 +81,28 @@ public class DownloaderWindow extends JDialog implements Runnable, DownloadListe
     
     /** {@inheritDoc} */
     @Override
-    public void downloadProgress(float percent) {
-        jpb.setValue((int) percent);
+    public void downloadProgress(final float percent) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                jpb.setValue((int) percent);
+            }
+        });
     }
 
     /** {@inheritDoc} */
     @Override
     public void setIndeterminate(final boolean indeterminate) {
-        jpb.setIndeterminate(indeterminate);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                jpb.setIndeterminate(indeterminate);
+            }
+        });
     }
 
 }

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

@@ -279,7 +279,14 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     }
 
     private void saveSplitPanePosition() {
-        identity.setOption("ui", "channelSplitPanePosition", nicklist.getWidth());
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                identity.setOption("ui", "channelSplitPanePosition", nicklist.getWidth());
+            }
+        });
     }
 
     /** {@inheritDoc} */

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.WritableFrameContainer;
@@ -94,7 +95,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @param owner WritableFrameContainer owning this frame.
      * @param controller Swing controller
      */
-    public InputTextFrame(final WritableFrameContainer owner, final SwingController controller) {
+    public InputTextFrame(final WritableFrameContainer owner,
+            final SwingController controller) {
         super(owner, controller);
 
         initComponents();
@@ -130,7 +132,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             public void run() {
                 InputTextFrame.super.open();
                 if (useAwayIndicator && getContainer().
-                    getServer() != null) {
+                        getServer() != null) {
                     awayLabel.setVisible(getContainer().getServer().isAway());
                 }
 
@@ -183,9 +185,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
         getInputField().getActionMap().put("paste",
                 new InputTextFramePasteAction(this));
-        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke("shift INSERT"),
+        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(
+                "shift INSERT"),
                 "paste");
-        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke("ctrl V"),
+        getInputField().getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(
+                "ctrl V"),
                 "paste");
     }
 
@@ -253,16 +257,23 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      */
     @Override
     public void setAwayIndicator(final boolean awayState) {
-        final boolean awayIndicator = getConfigManager().
-                getOptionBool("ui", "awayindicator");
-        if (awayIndicator || !awayState) {
-            if (awayState) {
-                inputPanel.add(awayLabel, BorderLayout.LINE_START);
-                awayLabel.setVisible(true);
-            } else {
-                awayLabel.setVisible(false);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final boolean awayIndicator = getConfigManager().
+                        getOptionBool("ui", "awayindicator");
+                if (awayIndicator || !awayState) {
+                    if (awayState) {
+                        inputPanel.add(awayLabel, BorderLayout.LINE_START);
+                        awayLabel.setVisible(true);
+                    } else {
+                        awayLabel.setVisible(false);
+                    }
+                }
             }
-        }
+        });
     }
 
     /**
@@ -307,8 +318,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             if (point != null) {
                 initPopupMenu();
                 inputFieldPopup.show(this, (int) point.getX(),
-                        (int) point.getY() + getTextPane().getHeight() +
-                        (int) PlatformDefaults.getUnitValueX("related").getValue());
+                        (int) point.getY() + getTextPane().getHeight() + (int) PlatformDefaults.
+                        getUnitValueX("related").getValue());
             }
         }
         super.processMouseEvent(e);
@@ -334,8 +345,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                     getSystemClipboard().getData(DataFlavor.stringFlavor);
             doPaste(clipboard);
         } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " +
-                    ex.getMessage());
+            Logger.userError(ErrorLevel.LOW, "Unable to get clipboard contents: " + ex.
+                    getMessage());
         } catch (UnsupportedFlavorException ex) {
             Logger.userError(ErrorLevel.LOW, "Unsupported clipboard type", ex);
         }
@@ -350,17 +361,21 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     protected void doPaste(final String clipboard) {
         String[] clipboardLines;
         //check theres something to paste
-        if (clipboard != null && (clipboardLines = getSplitLine(clipboard)).length > 1) {
+        if (clipboard != null && (clipboardLines = getSplitLine(clipboard)).length
+                > 1) {
             final int caretPosition = getInputField().getCaretPosition();
             final String inputFieldText = getInputField().getText();
-            final String text = inputFieldText.substring(0, caretPosition) + clipboard + inputFieldText.substring(caretPosition);
+            final String text = inputFieldText.substring(0, caretPosition)
+                    + clipboard + inputFieldText.substring(caretPosition);
             //check the limit
             final Integer pasteTrigger = getConfigManager().getOptionInt("ui",
                     "pasteProtectionLimit");
             //check whether the number of lines is over the limit
-            if (pasteTrigger != null && getContainer().getNumLines(text) > pasteTrigger) {
+            if (pasteTrigger != null && getContainer().getNumLines(text)
+                    > pasteTrigger) {
                 //show the multi line paste dialog
-                new PasteDialog(this, text, getController().getMainFrame()).display();
+                new PasteDialog(this, text, getController().getMainFrame()).
+                        display();
                 inputField.setText("");
             } else {
                 //send the lines
@@ -391,17 +406,20 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
 
         if ("ui".equals(domain) && getConfigManager() != null) {
             if (getInputField() != null) {
-                if ("inputbackgroundcolour".equals(key) ||
-                        "backgroundcolour".equals(key)) {
-                    getInputField().setBackground(getConfigManager().getOptionColour(
+                if ("inputbackgroundcolour".equals(key) || "backgroundcolour".
+                        equals(key)) {
+                    getInputField().setBackground(getConfigManager().
+                            getOptionColour(
                             "ui", "inputbackgroundcolour",
                             "ui", "backgroundcolour"));
-                } else if ("inputforegroundcolour".equals(key) ||
-                        "foregroundcolour".equals(key)) {
-                    getInputField().setForeground(getConfigManager().getOptionColour(
+                } else if ("inputforegroundcolour".equals(key) || "foregroundcolour".
+                        equals(key)) {
+                    getInputField().setForeground(getConfigManager().
+                            getOptionColour(
                             "ui", "inputforegroundcolour",
                             "ui", "foregroundcolour"));
-                    getInputField().setCaretColor(getConfigManager().getOptionColour(
+                    getInputField().setCaretColor(getConfigManager().
+                            getOptionColour(
                             "ui", "inputforegroundcolour",
                             "ui", "foregroundcolour"));
                 }
@@ -444,7 +462,9 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 menu.add(populatePopupMenu(new JMenu(menuItem.getName()),
                         menuItem.getSubMenu(), arguments));
             } else {
-                menu.add(new JMenuItem(new CommandAction(getCommandParser(),
+                menu.add(
+                        new JMenuItem(
+                        new CommandAction(getCommandParser(),
                         this, menuItem.getName(), menuItem.getCommand(arguments))));
             }
         }

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

@@ -48,7 +48,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.util.StringTranscoder;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.interfaces.FrameInfoAdapter;
+import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.IconManager;
@@ -102,7 +102,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public abstract class TextFrame extends JInternalFrame implements Window,
         PropertyChangeListener, InternalFrameListener,
-        MouseListener, KeyListener, ConfigChangeListener {
+        MouseListener, KeyListener, ConfigChangeListener, FrameInfoListener {
 
     /** Logger to use. */
     private static final java.util.logging.Logger LOGGER =
@@ -165,14 +165,7 @@ public abstract class TextFrame extends JInternalFrame implements Window,
 
         setFrameIcon(IconManager.getIconManager().getIcon(owner.getIcon()));
 
-        owner.addFrameInfoListener(new FrameInfoAdapter() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void iconChanged(final Window window, final String icon) {
-                setFrameIcon(IconManager.getIconManager().getIcon(icon));
-            }
-        });
+        owner.addFrameInfoListener(this);
 
         try {
             transcoder = new StringTranscoder(Charset.forName(
@@ -1179,4 +1172,23 @@ public abstract class TextFrame extends JInternalFrame implements Window,
             }
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void iconChanged(final Window window, final String icon) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                setFrameIcon(IconManager.getIconManager().getIcon(icon));
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void nameChanged(final Window window, final String name) {
+        //Ignore
+    }
 }

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.pluginpanel;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -163,12 +164,18 @@ public final class PluginPanel extends JPanel implements
                 PluginManager.getPluginManager().getPossiblePluginInfos(true);
         Collections.sort(list);
 
-        ((DefaultListModel) pluginList.getModel()).clear();
-        for (PluginInfo plugin : list) {
-            ((DefaultListModel) pluginList.getModel()).addElement(new PluginInfoToggle(
-                    plugin));
-        }
-        pluginList.repaint();
+        UIUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                ((DefaultListModel) pluginList.getModel()).clear();
+                for (PluginInfo plugin : list) {
+                    ((DefaultListModel) pluginList.getModel()).addElement(new PluginInfoToggle(
+                            plugin));
+                }
+                pluginList.repaint();
+            }
+        });
         return pluginList;
     }
 

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupPanel.java

@@ -131,7 +131,14 @@ public abstract class StatusbarPopupPanel extends JPanel
      * @param text New text
      */
     public void setText(final String text) {
-        label.setText(text);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                label.setText(text);
+            }
+        });
     }
 
     /**

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.themepanel;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -143,18 +144,24 @@ public final class ThemePanel extends JPanel implements
                 getAvailableThemes().values());
         Collections.sort(list);
 
-        ((DefaultListModel) themeList.getModel()).clear();
+        UIUtilities.invokeLater(new Runnable() {
 
-        for (Theme plugin : list) {
-            ((DefaultListModel) themeList.getModel()).addElement(new ThemeToggle(
-                    plugin));
-        }
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                ((DefaultListModel) themeList.getModel()).clear();
+                for (Theme plugin : list) {
+                    ((DefaultListModel) themeList.getModel()).addElement(
+                            new ThemeToggle(plugin));
+                }
 
-        if (((DefaultListModel) themeList.getModel()).size() > 0) {
-            toggleButton.setEnabled(true);
-        }
+                if (((DefaultListModel) themeList.getModel()).size() > 0) {
+                    toggleButton.setEnabled(true);
+                }
 
-        themeList.repaint();
+                themeList.repaint();
+            }
+        });
         return themeList;
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -121,15 +122,29 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
 
     private void addLicensesToNode(final Map<String, InputStream> licences,
             final DefaultMutableTreeNode root) {
-        model.insertNodeInto(root, (DefaultMutableTreeNode) model.getRoot(),
-                model.getChildCount(model.getRoot()));
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                model.insertNodeInto(root, (DefaultMutableTreeNode) model.
+                        getRoot(), model.getChildCount(model.getRoot()));
+            }
+        });
         for (Entry<String, InputStream> entry : licences.entrySet()) {
             final Licence licence = createLicence(entry);
             if (licence == null) {
                 continue;
             }
-            model.insertNodeInto(new DefaultMutableTreeNode(licence), root,
-                    model.getChildCount(root));
+            UIUtilities.invokeAndWait(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    model.insertNodeInto(new DefaultMutableTreeNode(licence),
+                            root, model.getChildCount(root));
+                }
+            });
         }
     }
 

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

@@ -117,8 +117,8 @@ public class CategoryPanel extends JPanel {
 
         title = new TitlePanel(BorderFactory.createEtchedBorder(),
                 "Preferences");
-        tooltip = new ToolTipPanel("Hover over a setting to see a " +
-                    "description, if available.");
+        tooltip = new ToolTipPanel("Hover over a setting to see a "
+                + "description, if available.");
 
         add(title, "pushx, growx, h 45!");
         add(scrollPane, "grow, push");
@@ -132,8 +132,8 @@ public class CategoryPanel extends JPanel {
             @Override
             public void correctBounds(final ComponentWrapper cw) {
                 if (cw.getComponent() == scrollPane) {
-                   parent.setPanelHeight((int) (scrollPane.getViewport().
-                           getExtentSize().height * 0.95));
+                    parent.setPanelHeight((int) (scrollPane.getViewport().
+                            getExtentSize().height * 0.95));
                 }
             }
         });
@@ -209,7 +209,7 @@ public class CategoryPanel extends JPanel {
                     }
                 }
             });
-        }        
+        }
     }
 
     /**
@@ -248,7 +248,14 @@ public class CategoryPanel extends JPanel {
      * @param b
      */
     public void setWaiting(final boolean b) {
-        scrollPane.setViewportView(waitingCategory);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                scrollPane.setViewportView(waitingCategory);
+            }
+        });
     }
 
     /**
@@ -257,10 +264,18 @@ public class CategoryPanel extends JPanel {
      * @param message Message to display
      */
     public void setError(final String message) {
-        final JPanel panel = new JPanel(new MigLayout("fillx"));
-        panel.add(new TextLabel("An error has occurred loading the " +
-                "preferences dialog, an error has been raised: "), "wrap");
-        panel.add(new TextLabel(message));
-        scrollPane.setViewportView(panel);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                final JPanel panel = new JPanel(new MigLayout("fillx"));
+                panel.add(new TextLabel("An error has occurred loading the "
+                        + "preferences dialog, an error has been raised: "),
+                        "wrap");
+                panel.add(new TextLabel(message));
+                scrollPane.setViewportView(panel);
+            }
+        });
     }
 }

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

@@ -134,8 +134,15 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
             final JPanel panel, final String path) {
 
         if (!category.getDescription().isEmpty()) {
-            panel.add(new TextLabel(category.getDescription()), "span, " +
+            UIUtilities.invokeAndWait(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    panel.add(new TextLabel(category.getDescription()), "span, " +
                     "growx, pushx, wrap 2*unrel");
+                }
+            });
         }
 
         for (PreferencesCategory child : category.getSubcats()) {
@@ -191,11 +198,12 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                setObject(PrefsComponentFactory.getComponent(setting));
+                JComponent option = PrefsComponentFactory.getComponent(setting);
+                option.setToolTipText(null);
+                setObject(option);
             }
         });
-        
-        option.setToolTipText(null);
+
         categoryPanel.getToolTipPanel().registerTooltipHandler(label,
                 getTooltipText(setting, categoryPanel));
         categoryPanel.getToolTipPanel().registerTooltipHandler(option,
@@ -247,13 +255,21 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
      * @return A TextLabel with the appropriate text and tooltip
      */
     private TextLabel getLabel(final PreferencesSetting setting) {
-        final TextLabel label = new TextLabel(setting.getTitle() + ": ", false);
+        final TextLabel label = UIUtilities.invokeAndWait(
+                new ReturnableThread<TextLabel>() {
 
-        if (setting.getHelptext().isEmpty()) {
-            label.setToolTipText("No help available.");
-        } else {
-            label.setToolTipText(setting.getHelptext());
-        }
+            @Override
+            public void run() {
+                final TextLabel label = new TextLabel(setting.getTitle() +
+                        ": ", false);
+                if (setting.getHelptext().isEmpty()) {
+                    label.setToolTipText("No help available.");
+                } else {
+                    label.setToolTipText(setting.getHelptext());
+                }
+                setObject(label);
+            }
+        });
 
         return label;
     }
@@ -266,14 +282,22 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
      */
     private void addInlineCategory(final PreferencesCategory category,
             final JPanel parent) {
-        final JPanel panel =
-                new NoRemovePanel(new MigLayout("fillx, gap unrel, wrap 2, " +
-                "hidemode 3, pack, wmax 470-" + leftPadding + "-" +
-                rightPadding + "-2*" + padding));
-        panel.setName(category.getPath());
-        panel.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
-                "TitledBorder.border"), category.getTitle()));
+        final JPanel panel = UIUtilities.invokeAndWait(
+                new ReturnableThread<JPanel>() {
 
+            @Override
+            public void run() {
+                final JPanel panel =
+                new NoRemovePanel(new MigLayout("fillx, gap unrel, wrap 2, " +
+                    "hidemode 3, pack, wmax 470-" + leftPadding + "-" +
+                    rightPadding + "-2*" + padding));
+                panel.setName(category.getPath());
+                panel.setBorder(BorderFactory.createTitledBorder(UIManager.
+                        getBorder("TitledBorder.border"), category.getTitle()));
+                setObject(panel);
+            }
+        });
+        
         parent.add(panel, "span, growx, pushx, wrap");
 
         initCategory(category, panel, "");
@@ -287,14 +311,21 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
      * @param namePrefix Category name prefix
      */
     private JPanel addCategory(final PreferencesCategory category) {
-        final JPanel panel =
-                new NoRemovePanel(new MigLayout("fillx, gap unrel, " +
-                "wrap 2, pack, hidemode 3, wmax 470-" + leftPadding + "-" +
-                rightPadding + "-2*" + padding));
-        panel.setName(category.getPath());
-        final String path = category.getPath();
-
-        initCategory(category, panel, path);
+        final JPanel panel = UIUtilities.invokeAndWait(
+                new ReturnableThread<JPanel>() {
+
+            @Override
+            public void run() {
+                final JPanel panel = new NoRemovePanel(
+                        new MigLayout("fillx, gap unrel, wrap 2, pack, " +
+                        "hidemode 3, wmax 470-" + leftPadding + "-" +
+                        rightPadding + "-2*" + padding));
+                panel.setName(category.getPath());
+                setObject(panel);
+            }
+        });
+
+        initCategory(category, panel, category.getPath());
 
         return panel;
     }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java

@@ -61,7 +61,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
      */
     public FrameContainerMenuItem(final FrameContainer frame,
             final WindowMenuFrameManager manager) {
-        super(frame.toString(), IconManager.getIconManager().getIcon(frame.getIcon()));
+        super(frame.toString(), IconManager.getIconManager().getIcon(frame.
+                getIcon()));
 
         this.frame = frame;
         this.manager = manager;
@@ -78,8 +79,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if ((frame != null && window != null) &&
-                        frame.equals(window.getContainer())) {
+                if ((frame != null && window != null) && frame.equals(window.
+                        getContainer())) {
                     setIcon(IconManager.getIconManager().getIcon(icon));
                 }
             }
@@ -94,8 +95,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
             /** {@inheritDoc} */
             @Override
             public void run() {
-                if ((frame != null && window != null) &&
-                        frame.equals(window.getContainer())) {
+                if ((frame != null && window != null) && frame.equals(window.
+                        getContainer())) {
                     setText(name);
                 }
             }

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -25,19 +25,25 @@ package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.interfaces.FrameListener;
+import com.dmdirc.util.ReturnableThread;
 
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import javax.swing.AbstractButton;
 
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -147,23 +153,50 @@ public final class WindowMenuFrameManager extends JMenu implements
     /** {@inheritDoc} */
     @Override
     public void addWindow(final FrameContainer window) {
-        final FrameContainerMenuItem item = new FrameContainerMenuItem(window,
-                this);
+        final FrameContainerMenuItem item = UIUtilities.invokeAndWait(
+                new ReturnableThread<FrameContainerMenuItem>() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        setObject(new FrameContainerMenuItem(window,
+                                WindowMenuFrameManager.this));
+                    }
+                });
         items.put(window, item);
-        add(item, getIndex(window, this));
+        final int index = getIndex(window, this);
         window.addSelectionListener(this);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                add(item, index);
+            }
+        });
     }
 
     /** {@inheritDoc} */
     @Override
     public void delWindow(final FrameContainer window) {
+        final AbstractButton item;
         if (items.containsKey(window)) {
-            remove(items.get(window));
+            item = items.get(window);
             items.remove(window);
         } else if (menus.containsKey(window)) {
-            remove(menus.get(window));
+            item = menus.get(window);
             menus.remove(window);
+        } else {
+            item = null;
         }
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                remove(item);
+            }
+        });
         window.removeSelectionListener(this);
     }
 
@@ -171,12 +204,27 @@ public final class WindowMenuFrameManager extends JMenu implements
     @Override
     public void addWindow(final FrameContainer parent,
             final FrameContainer window) {
-        final FrameContainerMenuItem item = new FrameContainerMenuItem(window,
-                this);
-        JMenu parentMenu;
+        final FrameContainerMenuItem item = UIUtilities.invokeAndWait(
+                new ReturnableThread<FrameContainerMenuItem>() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        setObject(new FrameContainerMenuItem(window,
+                                WindowMenuFrameManager.this));
+                    }
+                });
+        final JMenu parentMenu;
         if (!menus.containsKey(parent)) {
-            final FrameContainerMenu replacement =
-                    new FrameContainerMenu(parent, controller);
+            final FrameContainerMenu replacement = UIUtilities.invokeAndWait(
+                    new ReturnableThread<FrameContainerMenu>() {
+
+                        /** {@inheritDoc} */
+                        @Override
+                        public void run() {
+                            setObject(new FrameContainerMenu(parent, controller));
+                        }
+                    });
             replaceItemWithMenu(getParentMenu(parent), items.get(parent),
                     replacement);
             parentMenu = replacement;
@@ -184,8 +232,15 @@ public final class WindowMenuFrameManager extends JMenu implements
             parentMenu = menus.get(parent);
         }
         items.put(window, item);
-        parentMenu.add(item, getIndex(window, parentMenu));
         window.addSelectionListener(this);
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                parentMenu.add(item, getIndex(window, parentMenu));
+            }
+        });
     }
 
     /** {@inheritDoc} */
@@ -194,12 +249,21 @@ public final class WindowMenuFrameManager extends JMenu implements
             final FrameContainer window) {
         if (items.containsKey(window)) {
             final JMenu menu = getParentMenu(window);
-            menu.remove(items.get(window));
+            final FrameContainerMenuItem item = items.get(window);
             items.remove(window);
-            if (menu.getMenuComponentCount() == 1) {
-                replaceMenuWithItem(getParentMenu(parent), menus.get(parent),
-                        new FrameContainerMenuItem(parent, this));
-            }
+            UIUtilities.invokeAndWait(new Runnable() {
+
+                /** {@inheritDoc} */
+                @Override
+                public void run() {
+                    menu.remove(item);
+                    if (menu.getMenuComponentCount() == 1) {
+                        replaceMenuWithItem(getParentMenu(parent),
+                                menus.get(parent), new FrameContainerMenuItem(
+                                parent, WindowMenuFrameManager.this));
+                    }
+                }
+            });
         } else if (menus.containsKey(window)) {
             menus.get(parent).remove(menus.get(window));
             menus.remove(window);
@@ -222,9 +286,15 @@ public final class WindowMenuFrameManager extends JMenu implements
 
     private void replaceItemWithMenu(final JMenu parentMenu,
             final FrameContainerMenuItem item, final FrameContainerMenu menu) {
-        parentMenu.remove(item);
-        parentMenu.add(menu, getIndex(menu.getFrame(), parentMenu));
-        menu.add(item, getIndex(item.getFrame(), menu));
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            @Override
+            public void run() {
+                parentMenu.remove(item);
+                parentMenu.add(menu, getIndex(menu.getFrame(), parentMenu));
+                menu.add(item, getIndex(item.getFrame(), menu));
+            }
+        });
         items.remove(item.getFrame());
         menus.put(menu.getFrame(), menu);
         menuItems.put(item.getFrame(), item);
@@ -259,23 +329,27 @@ public final class WindowMenuFrameManager extends JMenu implements
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final Window window) {
+        final Collection<SelectionListener> values =
+                new ArrayList<SelectionListener>();
         synchronized (menus) {
             synchronized (items) {
                 synchronized (menuItems) {
                     activeWindow = window;
-                    //iterate over menu items seperately here to simplify code in listeners
-                    for (SelectionListener menuItem : menus.values()) {
-                        menuItem.selectionChanged(window);
-                    }
-                    for (SelectionListener menuItem : items.values()) {
-                        menuItem.selectionChanged(window);
-                    }
-                    for (SelectionListener menuItem : menuItems.values()) {
-                        menuItem.selectionChanged(window);
-                    }
+                    values.addAll(menus.values());
+                    values.addAll(items.values());
+                    values.addAll(menuItems.values());
                 }
             }
         }
+        UIUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                for (SelectionListener menuItem : values) {
+                    menuItem.selectionChanged(window);
+                }
+            }
+        });
     }
 
     /**
@@ -322,12 +396,30 @@ public final class WindowMenuFrameManager extends JMenu implements
      */
     private int getIndex(final FrameContainer newChild, final JMenu menu) {
         final int count = menu == this ? itemCount : 0;
-        for (int i = count; i < menu.getMenuComponentCount(); i++) {
-            if (!(menu.getMenuComponent(i) instanceof FrameContainerMenuIterface)) {
+        final int menuItemCount = UIUtilities.invokeAndWait(
+                new ReturnableThread<Integer>() {
+
+                    /** {@inheritDoc} */
+                    @Override
+                    public void run() {
+                        setObject(menu.getMenuComponentCount());
+                    }
+                });
+        for (int i = count; i < menuItemCount; i++) {
+            if (!(menu.getMenuComponent(i) instanceof FrameContainerMenuItem)) {
                 continue;
             }
-            final FrameContainer child = ((FrameContainerMenuIterface)
-                    menu.getMenuComponent(i)).getFrame();
+            final int index = i;
+            final Component component = UIUtilities.invokeAndWait(
+                    new ReturnableThread<Component>() {
+
+                        @Override
+                        public void run() {
+                            setObject(menu.getMenuComponent(index));
+                        }
+                    });
+            final FrameContainer child =
+                    ((FrameContainerMenuItem) component).getFrame();
             if (sortBefore(newChild, child)) {
                 return i;
             } else if (!sortAfter(newChild, child) && IdentityManager.

src/com/dmdirc/addons/windowstatus/WindowStatusPanel.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.windowstatus;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -58,7 +59,14 @@ public class WindowStatusPanel extends JPanel implements StatusBarComponent {
      * @param text New text
      */
     public void setText(final String text) {
-        label.setText(Styliser.stipControlCodes(text));
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                label.setText(Styliser.stipControlCodes(text));
+            }
+        });
     }
 
 }

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -30,6 +30,7 @@ import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -45,6 +46,7 @@ import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.util.ReturnableThread;
 
 import java.util.Hashtable;
 import java.util.Map;
@@ -58,13 +60,23 @@ import java.util.Map.Entry;
 public final class WindowStatusPlugin extends Plugin implements ActionListener, ConfigChangeListener {
 
     /** The panel we use in the status bar. */
-    private final WindowStatusPanel panel = new WindowStatusPanel();
+    private final WindowStatusPanel panel;
     private boolean showname, shownone;
     private String nonePrefix;
 
     /** Creates a new instance of WindowStatusPlugin. */
     public WindowStatusPlugin() {
         super();
+
+        panel = UIUtilities.invokeAndWait(
+                new ReturnableThread<WindowStatusPanel>() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                setObject(new WindowStatusPanel());
+            }
+        });
     }
 
     /**