Add a Java.upgrade signature that doesn't shutdown

hinerm · hinerm · commit 61abfb73cb7b · 2025-05-16T14:56:12.000-05:00
For the migration process we do *not* want to force a shutdown.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 
 	<artifactId>app-launcher</artifactId>
-	<version>2.1.3-SNAPSHOT</version>
+	<version>2.2.0-SNAPSHOT</version>
 
 	<name>SciJava App Launcher</name>
 	<description>Launcher for SciJava applications.</description>
diff --git a/src/main/java/org/scijava/launcher/Java.java b/src/main/java/org/scijava/launcher/Java.java
@@ -275,6 +275,10 @@ public static void upgrade() {
 	}
 
 	public static void upgrade(boolean headless) {
+		upgrade(headless, true);
+	}
+
+	public static void upgrade(boolean headless, boolean shutdownAfter) {
 		if (!headless) Splash.show(false);
 		String upgradeComplete = "<html>Java has been updated successfully.<br>" +
 				"Please restart " + ClassLauncher.appName() + " to apply the changes.";
@@ -307,7 +311,7 @@ public static void upgrade(boolean headless) {
 		finally {
 			if (!headless) Splash.hide();
 		}
-		notifyAndShutdown(upgradeComplete, headless);
+		if (shutdownAfter) notifyAndShutdown(upgradeComplete, headless);
 	}
 
 	public static void upgrade(BiConsumer<String, Double> subscriber)

Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,10 @@ public static void upgrade() {`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`public static void upgrade(boolean headless) {`
	`278`	`+ upgrade(headless, true);`
	`279`	`+ }`
	`280`	`+`
	`281`	`+ public static void upgrade(boolean headless, boolean shutdownAfter) {`
`278`	`282`	`if (!headless) Splash.show(false);`
`279`	`283`	`String upgradeComplete = "<html>Java has been updated successfully.<br>" +`
`280`	`284`	`"Please restart " + ClassLauncher.appName() + " to apply the changes.";`
`@@ -307,7 +311,7 @@ public static void upgrade(boolean headless) {`
`307`	`311`	`finally {`
`308`	`312`	`if (!headless) Splash.hide();`
`309`	`313`	`}`
`310`		`- notifyAndShutdown(upgradeComplete, headless);`
	`314`	`+ if (shutdownAfter) notifyAndShutdown(upgradeComplete, headless);`
`311`	`315`	`}`
`312`	`316`
`313`	`317`	`public static void upgrade(BiConsumer<String, Double> subscriber)`