Merge remote-tracking branch

'origin/GP-4581_ryanmkurtz_osgi-modal--SQUASHED' (Closes #6384)
NationalSecurityAgency · May 7, 2024 · 9026139 · 9026139
2 parents f2a9460 + ba5575a
commit 9026139
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleHost.java
@@ -891,7 +891,7 @@ else if (isSystem) {
 		}
 
 		if (!bundlesToActivate.isEmpty()) {
-			TaskLauncher.launchNonModal("Restoring bundle state",
+			TaskLauncher.launchModal("Restoring Bundle State",
 				(monitor) -> activateInStages(bundlesToActivate, monitor, new NullPrintWriter()));
 		}
 	}

diff --git a/...eatures/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java b/...eatures/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java
@@ -219,7 +219,7 @@ private void doRefresh() {
 		}
 
 		// then activate them all
-		new TaskLauncher(new EnableAndActivateBundlesTask("activating", statuses, true),
+		new TaskLauncher(new EnableAndActivateBundlesTask("Activating Bundles", statuses, true),
 			getComponent(), 1000);
 	}
 
@@ -243,7 +243,7 @@ private void doRemoveBundles() {
 		if (selectedModelRows == null || selectedModelRows.length == 0) {
 			return;
 		}
-		new TaskLauncher(new RemoveBundlesTask("removing bundles", getSelectedStatuses()),
+		new TaskLauncher(new RemoveBundlesTask("Removing Bundles", getSelectedStatuses()),
 			getComponent(), 1000);
 	}
 
@@ -281,7 +281,7 @@ public boolean accept(File f, GhidraFileChooserModel model) {
 				files.stream().map(ResourceFile::new).collect(Collectors.toUnmodifiableList());
 			Collection<GhidraBundle> bundles = bundleHost.add(resourceFiles, true, false);
 
-			TaskLauncher.launchNonModal("Activating new bundles", (monitor) -> {
+			TaskLauncher.launchModal("Activating New Bundles", (monitor) -> {
 				try {
 					bundleHost.activateAll(bundles, monitor,
 						getTool().getService(ConsoleService.class).getStdErr());
@@ -303,12 +303,14 @@ protected List<BundleStatus> getSelectedStatuses() {
 	}
 
 	protected void doEnableBundles() {
-		new TaskLauncher(new EnableAndActivateBundlesTask("enabling", getSelectedStatuses(), false),
+		new TaskLauncher(
+			new EnableAndActivateBundlesTask("Enabling Bundles", getSelectedStatuses(), false),
 			getComponent(), 1000);
 	}
 
 	protected void doDisableBundles() {
-		new TaskLauncher(new DeactivateAndDisableBundlesTask("disabling", getSelectedStatuses()),
+		new TaskLauncher(
+			new DeactivateAndDisableBundlesTask("Disabling Bundles", getSelectedStatuses()),
 			getComponent(), 1000);
 	}
 
@@ -317,7 +319,7 @@ protected void doActivateDeactivateBundle(BundleStatus status, boolean activate)
 		notifyTableRowChanged(status);
 		new TaskLauncher(
 			new ActivateDeactivateBundleTask(
-				(activate ? "Activating" : "Deactivating ") + " bundle...", status, activate),
+				(activate ? "Activating" : "Deactivating ") + " Bundle", status, activate),
 			null, 1000);
 	}
 
@@ -373,7 +375,7 @@ private final class RemoveBundlesTask extends Task {
 		private final List<BundleStatus> statuses;
 
 		private RemoveBundlesTask(String title, List<BundleStatus> statuses) {
-			super(title);
+			super(title, true, false, true);
 			this.deactivateBundlesTask =
 				new DeactivateAndDisableBundlesTask("deactivating", statuses);
 			this.statuses = statuses;
@@ -415,7 +417,7 @@ private class EnableAndActivateBundlesTask extends Task {
 		 */
 		private EnableAndActivateBundlesTask(String title, List<BundleStatus> statuses,
 				boolean inStages) {
-			super(title, true, true, false);
+			super(title, true, true, true);
 			this.statuses = statuses;
 			this.inStages = inStages;
 		}
@@ -473,7 +475,7 @@ private class DeactivateAndDisableBundlesTask extends Task {
 		final List<BundleStatus> statuses;
 
 		private DeactivateAndDisableBundlesTask(String title, List<BundleStatus> statuses) {
-			super(title, true, true, false);
+			super(title, true, true, true);
 			this.statuses = statuses;
 		}
 
@@ -511,7 +513,7 @@ private class ActivateDeactivateBundleTask extends Task {
 		private final boolean activate;
 
 		private ActivateDeactivateBundleTask(String title, BundleStatus status, boolean activate) {
-			super(title);
+			super(title, true, false, true);
 			this.status = status;
 			this.activate = activate;
 		}