Add new method for invokeAndWait using Callable not ReturnableThread

Change-Id: Ic0edb15c06533c0df5bc78f0f6878ca5ae98d9d0
Reviewed-on: http://gerrit.dmdirc.com/2465
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -26,7 +26,6 @@ import com.dmdirc.Channel;
 import com.dmdirc.ChannelClientProperty;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.ConfigManager;
@@ -38,6 +37,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -46,11 +46,11 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 /**
  * Provides various features related to nickname colouring.
@@ -264,15 +264,15 @@ public final class NickColourPlugin extends BasePlugin implements ActionListener
         final PreferencesCategory colours = new PluginPreferencesCategory(
                 pluginInfo, "Colours",
                 "Set colours for specific nicknames.", UIUtilities.invokeAndWait(
-                new ReturnableThread<NickColourPanel>() {
+                new Callable<NickColourPanel>() {
 
                     /** {@inheritDoc} */
                     @Override
-                    public void run() {
-                        setObject(new NickColourPanel(
+                    public NickColourPanel call() {
+                        return new NickColourPanel(
                                 (SwingController) PluginManager.getPluginManager()
                                 .getPluginInfoByName("ui_swing").getPlugin(),
-                                NickColourPlugin.this));
+                                NickColourPlugin.this);
                     }
                 }));
 

src/com/dmdirc/addons/notifications/NotificationsPlugin.java

@@ -23,20 +23,20 @@ package com.dmdirc.addons.notifications;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.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;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Notification Manager plugin, aggregates notification sources exposing them
@@ -91,13 +91,13 @@ public class NotificationsPlugin extends BasePlugin implements ActionListener {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final NotificationConfig configPanel = UIUtilities.invokeAndWait(
-                new ReturnableThread<NotificationConfig>() {
+                new Callable<NotificationConfig>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(new NotificationConfig(NotificationsPlugin.this,
-                        order));
+            public NotificationConfig call() {
+                return new NotificationConfig(NotificationsPlugin.this,
+                        order);
             }
         });
 

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

@@ -30,7 +30,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
 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;
@@ -40,6 +39,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.Callable;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -158,12 +158,12 @@ public class ConfigPanel extends JPanel implements PreferencesInterface,
         }
 
         final String text = plugin.doSubstitution(
-                UIUtilities.invokeAndWait(new ReturnableThread<String>() {
+                UIUtilities.invokeAndWait(new Callable<String>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textfield.getText());
+            public String call() {
+                return textfield.getText();
             }
         }), source);
         SwingUtilities.invokeLater(new Runnable() {

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -31,15 +30,16 @@ import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.ActionListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.BasePlugin;
 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;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Plugin that allows users to advertise what they're currently playing or
@@ -107,11 +107,11 @@ public class NowPlayingPlugin extends BasePlugin implements ActionListener  {
     @Override
     public void showConfig(final PreferencesDialogModel manager) {
         final ConfigPanel configPanel = UIUtilities.invokeAndWait(
-                new ReturnableThread<ConfigPanel>() {
+                new Callable<ConfigPanel>() {
 
             @Override
-            public void run() {
-                setObject(new ConfigPanel(NowPlayingPlugin.this, order));
+            public ConfigPanel call() {
+                return new ConfigPanel(NowPlayingPlugin.this, order);
             }
         });
 

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

@@ -24,12 +24,12 @@ package com.dmdirc.addons.osd;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.Callable;
 
 /**
  * Class to manage OSD Windows.
@@ -99,15 +99,15 @@ public class OsdManager {
                 .getGlobalConfiguration().getOptionInt(plugin.getDomain(), "locationY");
 
         windowList.add(UIUtilities.invokeAndWait(
-                new ReturnableThread<OsdWindow>() {
+                new Callable<OsdWindow>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(new OsdWindow(timeout, message, false,
+            public OsdWindow call() {
+                return new OsdWindow(timeout, message, false,
                         IdentityManager.getIdentityManager().getGlobalConfiguration().getOptionInt(
                         plugin.getDomain(), "locationX"), policy.getYPosition(
-                        OsdManager.this, startY), plugin, OsdManager.this));
+                        OsdManager.this, startY), plugin, OsdManager.this);
             }
         }));
     }

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -27,7 +27,6 @@ import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -37,18 +36,19 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.IRCParser;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.ReturnableThread;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 
 /**
  * This plugin makes certain relay bots less obnoxious looking.
@@ -285,14 +285,14 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
                 pluginInfo, "Channels",
                 "Identifies where and who the bot is in channels.",
                 UIUtilities.invokeAndWait(
-                new ReturnableThread<RelayChannelPanel>() {
+                new Callable<RelayChannelPanel>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(new RelayChannelPanel(PluginManager.getPluginManager()
+            public RelayChannelPanel call() {
+                return new RelayChannelPanel(PluginManager.getPluginManager()
                         .getPluginInfoByName("ui_swing").getPlugin(),
-                        RelayBotPlugin.this));
+                        RelayBotPlugin.this);
             }
         }));
         colours.setInline().setInlineAfter();

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

@@ -46,7 +46,6 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
@@ -56,6 +55,7 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
 import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.Callable;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
@@ -188,16 +188,16 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @return Frame manager size.
      */
     public int getFrameManagerSize() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
+        return UIUtilities.invokeAndWait(new Callable<Integer>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
+            public Integer call() {
                 if (position == FramemanagerPosition.LEFT || position
                         == FramemanagerPosition.RIGHT) {
-                    setObject(frameManagerPanel.getWidth());
+                    return frameManagerPanel.getWidth();
                 } else {
-                    setObject(frameManagerPanel.getHeight());
+                    return frameManagerPanel.getHeight();
                 }
             }
         });
@@ -209,12 +209,12 @@ public final class MainFrame extends JFrame implements WindowListener,
      * @return The active window
      */
     public TextFrame getActiveFrame() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<TextFrame>() {
+        return UIUtilities.invokeAndWait(new Callable<TextFrame>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(activeFrame);
+            public TextFrame call() {
+                return activeFrame;
             }
         });
     }

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

@@ -65,7 +65,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.updater.Version;
-import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.validators.NumericalValidator;
 
 import java.awt.Dialog.ModalityType;
@@ -78,6 +77,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Callable;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -88,6 +88,7 @@ import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.UnsupportedLookAndFeelException;
 
 import lombok.Getter;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
@@ -306,12 +307,12 @@ public class SwingController extends BasePlugin implements UIController {
      */
     public void updateComponentTrees() {
         final int state = UIUtilities.invokeAndWait(
-                new ReturnableThread<Integer>() {
+                new Callable<Integer>() {
 
                     /** {@inheritDoc} */
                     @Override
-                    public void run() {
-                        setObject(getMainFrame().getExtendedState());
+                    public Integer call() {
+                        return getMainFrame().getExtendedState();
                     }
                 });
         UIUtilities.invokeLater(new Runnable() {

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

@@ -39,6 +39,8 @@ import java.awt.Rectangle;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Enumeration;
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
@@ -54,11 +56,14 @@ import javax.swing.plaf.FontUIResource;
 import javax.swing.text.JTextComponent;
 import javax.swing.undo.UndoManager;
 
+import lombok.SneakyThrows;
+
 import net.miginfocom.layout.PlatformDefaults;
 
 /**
  * UI constants.
  */
+@SuppressWarnings("PMD.UnusedImports")
 public final class UIUtilities {
 
     /** Not intended to be instantiated. */
@@ -207,13 +212,45 @@ public final class UIUtilities {
         }
     }
 
+
+
+    /**
+     * Invokes and waits for the specified callable, executed on the EDT.
+     *
+     * @param <T> The return type of the returnable thread
+     * @param returnable Thread to be executed
+     *
+     * @return Result from the completed thread or null if an exception occurred
+     *
+     * @throws Exception This method will re throw any exception thrown in the
+     * executed code
+     */
+    @SneakyThrows
+    @SuppressWarnings("PMD.AvoidThrowingRawExceptionTypes")
+    public static <T> T invokeAndWait(final Callable<T> returnable) {
+        try {
+            if (SwingUtilities.isEventDispatchThread()) {
+                return returnable.call();
+            } else {
+                final FutureTask<T> task = new FutureTask<T>(returnable);
+                SwingUtilities.invokeAndWait(task);
+                return task.get();
+            }
+        } catch (Exception ex) {
+            throw ex;
+        }
+    }
+
     /**
      * Invokes and waits for the specified runnable, executed on the EDT.
      *
      * @param <T> The return type of the returnable thread
      * @param returnable Thread to be executed
      * @return Result from the compelted thread
+     *
+     * @deprecated In favour of {@link #invokeAndWait(java.util.concurrent.Callable) }
      */
+    @Deprecated
     public static <T> T invokeAndWait(final ReturnableThread<T> returnable) {
         if (SwingUtilities.isEventDispatchThread()) {
             returnable.run();

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

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
-import com.dmdirc.util.ReturnableThread;
 import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Color;
@@ -41,6 +40,7 @@ import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.concurrent.Callable;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -132,12 +132,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public boolean requestFocusInWindow() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Boolean>() {
+        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.requestFocusInWindow());
+            public Boolean call() {
+                return textField.requestFocusInWindow();
             }
         });
     }
@@ -201,12 +201,12 @@ public class SwingInputField extends JComponent implements InputField,
      * @return JTextField
      */
     public JTextField getTextField() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<JTextField>() {
+        return UIUtilities.invokeAndWait(new Callable<JTextField>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField);
+            public JTextField call() {
+                return textField;
             }
         });
     }
@@ -266,12 +266,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public String getSelectedText() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<String>() {
+        return UIUtilities.invokeAndWait(new Callable<String>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.getSelectedText());
+            public String call() {
+                return textField.getSelectedText();
             }
         });
     }
@@ -279,12 +279,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public int getSelectionEnd() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
+        return UIUtilities.invokeAndWait(new Callable<Integer>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.getSelectionEnd());
+            public Integer call() {
+                return textField.getSelectionEnd();
             }
         });
     }
@@ -292,12 +292,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public int getSelectionStart() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
+        return UIUtilities.invokeAndWait(new Callable<Integer>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.getSelectionStart());
+            public Integer call() {
+                return textField.getSelectionStart();
             }
         });
     }
@@ -305,12 +305,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public String getText() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<String>() {
+        return UIUtilities.invokeAndWait(new Callable<String>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.getText());
+            public String call() {
+                return textField.getText();
             }
         });
     }
@@ -331,12 +331,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public int getCaretPosition() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
+        return UIUtilities.invokeAndWait(new Callable<Integer>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.getCaretPosition());
+            public Integer call() {
+                return textField.getCaretPosition();
             }
         });
     }
@@ -423,12 +423,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public boolean hasFocus() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Boolean>() {
+        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.hasFocus());
+            public Boolean call() {
+                return textField.hasFocus();
             }
         });
     }
@@ -436,12 +436,12 @@ public class SwingInputField extends JComponent implements InputField,
     /** {@inheritDoc} */
     @Override
     public boolean isFocusOwner() {
-        return UIUtilities.invokeAndWait(new ReturnableThread<Boolean>() {
+        return UIUtilities.invokeAndWait(new Callable<Boolean>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(textField.isFocusOwner());
+            public Boolean call() {
+                return textField.isFocusOwner();
             }
         });
     }

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

@@ -35,9 +35,10 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.ReturnableThread;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
+
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -198,14 +199,14 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
 
 
         final JComponent option = UIUtilities.invokeAndWait(
-                new ReturnableThread<JComponent>() {
+                new Callable<JComponent>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
+            public JComponent call() {
                 JComponent option = factory.getComponent(setting);
                 option.setToolTipText(null);
-                setObject(option);
+                return option;
             }
         });
 
@@ -270,10 +271,10 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     private void addInlineCategory(final PreferencesCategory category,
             final JPanel parent) {
         final JPanel panel = UIUtilities.invokeAndWait(
-                new ReturnableThread<JPanel>() {
+                new Callable<JPanel>() {
 
             @Override
-            public void run() {
+            public JPanel call() {
                 final JPanel panel =
                 new NoRemovePanel(new MigLayout("fillx, gap unrel, wrap 2, " +
                     "hidemode 3, pack, wmax 470-" + leftPadding + "-" +
@@ -281,7 +282,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
                 panel.setName(category.getPath());
                 panel.setBorder(BorderFactory.createTitledBorder(UIManager.
                         getBorder("TitledBorder.border"), category.getTitle()));
-                setObject(panel);
+                return panel;
             }
         });
 
@@ -299,16 +300,16 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      */
     private JPanel addCategory(final PreferencesCategory category) {
         final JPanel panel = UIUtilities.invokeAndWait(
-                new ReturnableThread<JPanel>() {
+                new Callable<JPanel>() {
 
             @Override
-            public void run() {
+            public JPanel call() {
                 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);
+                return panel;
             }
         });
 

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -40,9 +39,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
-import javax.swing.AbstractButton;
 
+import javax.swing.AbstractButton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -135,14 +135,14 @@ public final class WindowMenuFrameManager extends JMenu implements
     public void windowAdded(final TextFrame parent, final TextFrame window) {
         if (parent == null) {
             final FrameContainerMenuItem item = UIUtilities.invokeAndWait(
-                    new ReturnableThread<FrameContainerMenuItem>() {
+                    new Callable<FrameContainerMenuItem>() {
 
                         /** {@inheritDoc} */
                         @Override
-                        public void run() {
-                            setObject(new FrameContainerMenuItem(controller,
+                        public FrameContainerMenuItem call() {
+                            return new FrameContainerMenuItem(controller,
                                     window.getContainer(),
-                                    WindowMenuFrameManager.this));
+                                    WindowMenuFrameManager.this);
                         }
                     });
             items.put(window.getContainer(), item);
@@ -157,26 +157,26 @@ public final class WindowMenuFrameManager extends JMenu implements
             });
         } else {
             final FrameContainerMenuItem item = UIUtilities.invokeAndWait(
-                    new ReturnableThread<FrameContainerMenuItem>() {
+                    new Callable<FrameContainerMenuItem>() {
 
                         /** {@inheritDoc} */
                         @Override
-                        public void run() {
-                            setObject(new FrameContainerMenuItem(controller,
+                        public FrameContainerMenuItem call() {
+                            return new FrameContainerMenuItem(controller,
                                     window.getContainer(),
-                                    WindowMenuFrameManager.this));
+                                    WindowMenuFrameManager.this);
                         }
                     });
             final JMenu parentMenu;
             if (!menus.containsKey(parent.getContainer())) {
                 final FrameContainerMenu replacement = UIUtilities.invokeAndWait(
-                        new ReturnableThread<FrameContainerMenu>() {
+                        new Callable<FrameContainerMenu>() {
 
                             /** {@inheritDoc} */
                             @Override
-                            public void run() {
-                                setObject(new FrameContainerMenu(parent.
-                                        getContainer(), controller));
+                            public FrameContainerMenu call() {
+                                return new FrameContainerMenu(parent.
+                                        getContainer(), controller);
                             }
                         });
                 replaceItemWithMenu(getParentMenu(parent.getContainer()),
@@ -347,22 +347,22 @@ public final class WindowMenuFrameManager extends JMenu implements
     private int getIndex(final FrameContainer newChild, final JMenu menu) {
         final int count = menu == this ? itemCount : 0;
         final int menuItemCount = UIUtilities.invokeAndWait(
-                new ReturnableThread<Integer>() {
+                new Callable<Integer>() {
 
                     /** {@inheritDoc} */
                     @Override
-                    public void run() {
-                        setObject(menu.getMenuComponentCount());
+                    public Integer call() {
+                        return menu.getMenuComponentCount();
                     }
                 });
         for (int i = count; i < menuItemCount; i++) {
             final int index = i;
             final Component component = UIUtilities.invokeAndWait(
-                    new ReturnableThread<Component>() {
+                    new Callable<Component>() {
 
                         @Override
-                        public void run() {
-                            setObject(menu.getMenuComponent(index));
+                        public Component call() {
+                            return menu.getMenuComponent(index);
                         }
                     });
             if (!(component instanceof FrameContainerMenuInterface)) {
@@ -380,12 +380,12 @@ public final class WindowMenuFrameManager extends JMenu implements
             }
         }
 
-        return UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
+        return UIUtilities.invokeAndWait(new Callable<Integer>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(menu.getMenuComponentCount());
+            public Integer call() {
+                return menu.getMenuComponentCount();
             }
         });
     }

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

@@ -43,11 +43,11 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.ReturnableThread;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.Callable;
 
 /**
  * Displays information related to the current window in the status bar.
@@ -78,12 +78,12 @@ public final class WindowStatusPlugin extends BasePlugin
         this.pluginInfo = pluginInfo;
 
         panel = UIUtilities.invokeAndWait(
-                new ReturnableThread<WindowStatusPanel>() {
+                new Callable<WindowStatusPanel>() {
 
             /** {@inheritDoc} */
             @Override
-            public void run() {
-                setObject(new WindowStatusPanel());
+            public WindowStatusPanel call() {
+                return new WindowStatusPanel();
             }
         });
     }