Merge pull request #408 from greboid/dev3

Add a supplier param to invokeOffEDT

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

@@ -26,6 +26,7 @@ import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
 import com.dmdirc.addons.ui_swing.components.RunnableLoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.RunnableSwingWorker;
+import com.dmdirc.addons.ui_swing.components.SupplierLoggingSwingWorker;
 import com.dmdirc.util.colours.Colour;
 
 import java.awt.Color;
@@ -41,6 +42,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComboBox;
@@ -282,6 +284,21 @@ public final class UIUtilities {
         new RunnableLoggingSwingWorker<>(eventBus, runnable, consumer).execute();
     }
 
+    /**
+     * Invokes something off the EDT, handling the result when its finished on the EDT, logging
+     * any exceptions that occur.
+     *
+     * @param eventBus Eventbus to post errors to
+     * @param runnable Runnable to execute off the EDT
+     * @param consumer Consumer to finalise the runnable on the EDT
+     *
+     * @param <T>      Type the consumer takes
+     */
+    public static <T> void invokeOffEDT(final DMDircMBassador eventBus, final Supplier<T> runnable,
+            final Consumer<T> consumer) {
+        new SupplierLoggingSwingWorker<>(eventBus, runnable, consumer).execute();
+    }
+
     /**
      * Check if we are using the GTK look and feel.
      *