From bfd7b33177608103e54213c997ee83446aac8f7e Mon Sep 17 00:00:00 2001
From: Caleb Hulbert <cmhulbert@gmail.com>
Date: Tue, 9 Jul 2024 16:09:35 -0400
Subject: [PATCH] refactor: invoke on main thread via coroutines

---
 .../util/InvokeOnJavaFXApplicationThread.kt   | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/main/kotlin/org/janelia/saalfeldlab/fx/util/InvokeOnJavaFXApplicationThread.kt b/src/main/kotlin/org/janelia/saalfeldlab/fx/util/InvokeOnJavaFXApplicationThread.kt
index 02f20f4..3f5fda1 100644
--- a/src/main/kotlin/org/janelia/saalfeldlab/fx/util/InvokeOnJavaFXApplicationThread.kt
+++ b/src/main/kotlin/org/janelia/saalfeldlab/fx/util/InvokeOnJavaFXApplicationThread.kt
@@ -29,51 +29,34 @@
 package org.janelia.saalfeldlab.fx.util
 
 import javafx.application.Platform
-import java.util.concurrent.CountDownLatch
-import java.util.function.Consumer
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 
 class InvokeOnJavaFXApplicationThread {
 
 	companion object {
 
-		operator fun invoke(task: () -> Unit) = invoke(Runnable { task() })
+		private val sharedMainScope = MainScope()
+
+		@JvmStatic
+		operator fun invoke(task: suspend CoroutineScope.() -> Unit) = sharedMainScope.launch(block = task)
 
 		@JvmStatic
 		operator fun invoke(task: Runnable) {
-			if (Platform.isFxApplicationThread())
-				task.run()
-			else
-				Platform.runLater(task)
+			if (Platform.isFxApplicationThread()) task.run()
+			else invoke { task.run() }
 		}
 
 		@Throws(InterruptedException::class)
-		fun invokeAndWait(task: () -> Unit) = invokeAndWait(Runnable { task() })
+		fun invokeAndWait(task: suspend CoroutineScope.() -> Unit) = runBlocking {
+			sharedMainScope.launch { task() }.join()
+		}
 
 		@JvmStatic
 		@Throws(InterruptedException::class)
-		fun invokeAndWait(task: Runnable) {
-			val latch = CountDownLatch(1)
-			val countDownTask = Runnable {
-				task.run()
-				latch.countDown()
-			}
-			invoke(countDownTask)
-			synchronized(latch) {
-				latch.await()
-			}
-		}
+		fun invokeAndWait(task: Runnable) = invokeAndWait { task.run() }
 
-		fun invokeAndWait(task: () -> Unit, exceptionHandler: (InterruptedException) -> Unit) = invokeAndWait(
-			Runnable { task() },
-			Consumer { exceptionHandler(it) })
-
-		@JvmStatic
-		fun invokeAndWait(task: Runnable, exceptionHandler: Consumer<InterruptedException>) {
-			try {
-				invokeAndWait(task)
-			} catch (e: InterruptedException) {
-				exceptionHandler.accept(e)
-			}
-		}
 	}
 }