Disposable -> Job

Author: nedtwigg

durian-swt/src/main/java/com/diffplug/common/swt/Shells.kt

@@ -21,8 +21,7 @@ import com.diffplug.common.swt.os.WS
 import com.diffplug.common.tree.TreeIterable
 import com.diffplug.common.tree.TreeQuery
 import com.diffplug.common.tree.TreeStream
-import io.reactivex.disposables.Disposable
-import io.reactivex.disposables.Disposables
+import kotlinx.coroutines.Job
 import org.eclipse.swt.SWT
 import org.eclipse.swt.graphics.Image
 import org.eclipse.swt.graphics.Point
@@ -36,7 +35,7 @@ import java.util.*
 
 /** A fluent builder for creating SWT [Shell]s.  */
 class Shells private constructor(private val style: Int, private val coat: Coat) {
-    private var title: String = ""
+    private var title: String? = null
     private var image: Image? = null
     private var alpha = SWT.DEFAULT
     private val size = Point(SWT.DEFAULT, SWT.DEFAULT)
@@ -434,17 +433,19 @@ class Shells private constructor(private val style: Int, private val coat: Coat)
 
         /** Prevents the given shell from closing without prompting.  Returns a Subscription which can cancel this blocking.  */
         @JvmStatic
-        fun confirmClose(shell: Shell, title: String, question: String, runOnClose: Runnable): Disposable {
+        fun confirmClose(shell: Shell, title: String, question: String, runOnClose: Runnable): Job {
             val listener = Listener { e: Event ->
                 e.doit = SwtMisc.blockForQuestion(title, question, shell)
                 if (e.doit) {
                     runOnClose.run()
                 }
             }
             shell.addListener(SWT.Close, listener)
-            return Disposables.fromRunnable {
-                SwtExec.immediate().guardOn(shell).execute {
-                    shell.removeListener(SWT.Close, listener)
+            return Job().apply {
+                invokeOnCompletion {
+                    SwtExec.immediate().guardOn(shell).execute {
+                        shell.removeListener(SWT.Close, listener)
+                    }
                 }
             }
         }

durian-swt/src/test/java/com/diffplug/common/swt/SwtExecProfile.java

@@ -20,11 +20,11 @@
 import com.diffplug.common.debug.JuxtaProfiler;
 import com.diffplug.common.debug.LapTimer;
 import com.diffplug.common.rx.Rx;
-import io.reactivex.disposables.Disposable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.function.Consumer;
+import kotlinx.coroutines.Job;
 import kotlinx.coroutines.flow.MutableSharedFlow;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Widget;
@@ -137,7 +137,7 @@ public void run(Widget guard) {
 			toProfile.forEach((name, underTest) -> {
 				profiler.addTest(name, new JuxtaProfiler.InitTimedCleanup(LapTimer.createNanoWrap2Sec()) {
 					MutableSharedFlow<Integer> subject;
-					Disposable sub;
+					Job sub;
 
 					@Override
 					protected void init() throws Throwable {
@@ -152,7 +152,7 @@ protected void timed() throws Throwable {
 
 					@Override
 					protected void cleanup() throws Throwable {
-						sub.dispose();
+						sub.cancel(null);
 						subject = null;
 						sub = null;
 					}