Merge pull request #47 from petebankhead/cleanup

Minor cleanup, make easier to close window

Author: petebankhead

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 qupathExtension {
 	name = "qupath-extension-djl"
-	version = "0.4.2"
+	version = "0.4.3"
 	group = "io.github.qupath"
 	description = "QuPath extension to use Deep Java Library"
 	automaticModule = "qupath.extension.djl"

src/main/java/qupath/ext/djl/DjlDnnModelBuilder.java

@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022 QuPath developers, University of Edinburgh
+ * Copyright 2022 - 2026 QuPath developers, University of Edinburgh
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,21 +37,15 @@ public class DjlDnnModelBuilder implements DnnModelBuilder {
 	private static String getEngineName(String framework) {
 		if (DjlTools.ALL_ENGINES.contains(framework))
 			return framework;
-		
-		switch(framework) {
-		case DnnModelParams.FRAMEWORK_TENSORFLOW:
-			return DjlTools.ENGINE_TENSORFLOW;
-		case DnnModelParams.FRAMEWORK_TF_LITE:
-			return DjlTools.ENGINE_TFLITE;
-		case DnnModelParams.FRAMEWORK_ONNX_RUNTIME:
-			return DjlTools.ENGINE_ONNX_RUNTIME;
-		case DnnModelParams.FRAMEWORK_PYTORCH:
-			return DjlTools.ENGINE_PYTORCH;
-		case DnnModelParams.FRAMEWORK_MXNET:
-			return DjlTools.ENGINE_MXNET;
-		default:
-			return null;
-		}
+
+        return switch (framework) {
+            case DnnModelParams.FRAMEWORK_TENSORFLOW -> DjlTools.ENGINE_TENSORFLOW;
+            case DnnModelParams.FRAMEWORK_TF_LITE -> DjlTools.ENGINE_TFLITE;
+            case DnnModelParams.FRAMEWORK_ONNX_RUNTIME -> DjlTools.ENGINE_ONNX_RUNTIME;
+            case DnnModelParams.FRAMEWORK_PYTORCH -> DjlTools.ENGINE_PYTORCH;
+            case DnnModelParams.FRAMEWORK_MXNET -> DjlTools.ENGINE_MXNET;
+            default -> null;
+        };
 	}
 
 

src/main/java/qupath/ext/djl/ui/DjlEngineCommand.java

@@ -1,5 +1,5 @@
 /*-
- * Copyright 2022-2023 QuPath developers, University of Edinburgh
+ * Copyright 2022-2026 QuPath developers, University of Edinburgh
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 import java.nio.file.Files;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -58,6 +58,7 @@
 import javafx.stage.Stage;
 import qupath.ext.djl.DjlTools;
 import qupath.fx.dialogs.Dialogs;
+import qupath.fx.utils.FXUtils;
 import qupath.fx.utils.GridPaneUtils;
 import qupath.lib.common.GeneralTools;
 import qupath.lib.common.ThreadTools;
@@ -166,36 +167,24 @@ private void init() {
 				status.get() == EngineStatus.AVAILABLE || status.get() == EngineStatus.PENDING,
 				status));
 			btnDownload.textProperty().bind(Bindings.createStringBinding(() -> {
-				switch (status.get()) {
-				case AVAILABLE:
-					return bundle.getString("button.download.available");
-				case FAILED:
-					return bundle.getString("button.download.failed");
-				case PENDING:
-					return bundle.getString("button.download.pending");
-				case UNAVAILABLE:
-					return bundle.getString("button.download.unavailable");
-				case UNKNOWN:
-				default:
-					return bundle.getString("button.download.unknown");
-				}
+                return switch (status.get()) {
+                    case AVAILABLE -> bundle.getString("button.download.available");
+                    case FAILED -> bundle.getString("button.download.failed");
+                    case PENDING -> bundle.getString("button.download.pending");
+                    case UNAVAILABLE -> bundle.getString("button.download.unavailable");
+                    default -> bundle.getString("button.download.unknown");
+                };
 			}, status));
 
 			var tooltipDownload = new Tooltip();
 			tooltipDownload.textProperty().bind(Bindings.createStringBinding(() -> {
-				switch (status.get()) {
-					case AVAILABLE:
-						return String.format(bundle.getString("tooltip.download.available"), name);
-					case FAILED:
-						return String.format(bundle.getString("tooltip.download.failed"), name);
-					case PENDING:
-						return String.format(bundle.getString("tooltip.download.pending"), name);
-					case UNAVAILABLE:
-						return String.format(bundle.getString("tooltip.download.unavailable"), name);
-					case UNKNOWN:
-					default:
-						return String.format(bundle.getString("tooltip.download.unknown"), name);
-				}
+                return switch (status.get()) {
+                    case AVAILABLE -> String.format(bundle.getString("tooltip.download.available"), name);
+                    case FAILED -> String.format(bundle.getString("tooltip.download.failed"), name);
+                    case PENDING -> String.format(bundle.getString("tooltip.download.pending"), name);
+                    case UNAVAILABLE -> String.format(bundle.getString("tooltip.download.unavailable"), name);
+                    default -> String.format(bundle.getString("tooltip.download.unknown"), name);
+                };
 			}, status));
 			btnDownload.setTooltip(tooltipDownload);
 
@@ -254,12 +243,13 @@ private void init() {
 		stage.initOwner(QuPathGUI.getInstance().getStage());
 //		stage.initModality(Modality.WINDOW_MODAL);
 		stage.setScene(new Scene(pane));
+		FXUtils.addCloseWindowShortcuts(stage);
 	}
 
 	private static void updateIconFromStatus(EngineStatus status, Node node) {
 		if (status == null)
 			status = EngineStatus.UNKNOWN;
-		node.getStyleClass().setAll("djl-engine-status", status.name().toString().toLowerCase());
+		node.getStyleClass().setAll("djl-engine-status", status.name().toLowerCase());
 	}
 
 	private static void updateVersionFromStatus(EngineStatus status, String engineName, Label labelVersion) {
@@ -336,23 +326,24 @@ private static String getCudaString() {
 
 	private void checkEngineStatus(String name, ObjectProperty<EngineStatus> status, long timeoutMillis, boolean doQuietly) {
 		// Request the engine in a background thread, triggering download if necessary
-		var pool = Executors.newSingleThreadExecutor(ThreadTools.createThreadFactory("djl-engine-request", true));
-		updateStatus(status, EngineStatus.PENDING);
-		var future = pool.submit((Callable<Boolean>)() -> checkEngineAvailability(name, status, doQuietly));
-		if (timeoutMillis <= 0)
-			return;
-		pool.shutdown();
+		Future<Boolean> future;
+		try (var pool = Executors.newSingleThreadExecutor(ThreadTools.createThreadFactory("djl-engine-request", true))) {
+			updateStatus(status, EngineStatus.PENDING);
+			future = pool.submit(() -> checkEngineAvailability(name, status, doQuietly));
+			if (timeoutMillis <= 0)
+				return;
+		}
 		try {
 			// Wait until the timeout - engine might already be available & return quickly
 			var result = future.get(timeoutMillis, TimeUnit.MILLISECONDS);
-			if (result != null && result.booleanValue()) {
+			if (result != null && result) {
 				Dialogs.showInfoNotification(TITLE, String.format(bundle.getString("notify.engine.available"), name));
 			} else
 				logger.debug("No engine available for {}", name);
 		} catch (InterruptedException e) {
-			logger.error("Requesting for engine " + name + "interrupted!", e);
+            logger.error("Request for engine {} interrupted!", name, e);
 		} catch (ExecutionException e) {
-			logger.error("Error requesting engine " + name + ": " + e.getLocalizedMessage(), e);
+            logger.error("Error requesting engine {}: {}", name, e.getMessage(), e);
 		} catch (TimeoutException e) {
 			logger.debug("Request for engine {} timed out - likely either initializing or downloading", name);
 		}