From 04de745ddd88f92c64df780e564d51015d6eb16f Mon Sep 17 00:00:00 2001
From: ghidravore <ghidravore@users.noreply.github.com>
Date: Tue, 22 Sep 2020 10:56:55 -0400
Subject: [PATCH] GT-1 Fixed ActionBuilder so that not specifying an
 "enabledWhen" condition doesn't interfere with manual action enablement.

---
 .../action/builder/AbstractActionBuilder.java      |  7 +++++--
 .../java/docking/action/ActionBuilderTest.java     | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java b/Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java
index aae81e68f7..c9eae2d655 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java
@@ -160,7 +160,7 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, C extends
 	/**
 	 * Predicate for determining if an action is enabled for a given context
 	 */
-	private Predicate<C> enabledPredicate = ALWAYS_TRUE;
+	private Predicate<C> enabledPredicate = null;
 
 	/**
 	 * Predicate for determining if an action should be included on the pop-up menu
@@ -664,7 +664,10 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, C extends
 			action.setHelpLocation(helpLocation);
 		}
 
-		action.enabledWhen(adaptPredicate(enabledPredicate));
+		if (enabledPredicate != null) {
+			action.enabledWhen(adaptPredicate(enabledPredicate));
+		}
+
 		action.validContextWhen(adaptPredicate(validContextPredicate));
 		action.popupWhen(adaptPredicate(popupPredicate));
 	}
diff --git a/Ghidra/Framework/Docking/src/test/java/docking/action/ActionBuilderTest.java b/Ghidra/Framework/Docking/src/test/java/docking/action/ActionBuilderTest.java
index f827e10ddb..0b1f545fde 100644
--- a/Ghidra/Framework/Docking/src/test/java/docking/action/ActionBuilderTest.java
+++ b/Ghidra/Framework/Docking/src/test/java/docking/action/ActionBuilderTest.java
@@ -237,6 +237,20 @@ public class ActionBuilderTest {
 		assertTrue(action.isEnabledForContext(new FooActionContext()));
 	}
 
+	@Test
+	public void testManualEnablement() {
+		DockingAction action = new ActionBuilder("Test", "Test")
+				.onAction(e -> actionCount++)
+				.enabled(false)
+				.build();
+
+		assertFalse(action.isEnabledForContext(new ActionContext()));
+		action.setEnabled(true);
+		assertTrue(action.isEnabledForContext(new ActionContext()));
+		action.setEnabled(true);
+		assertTrue(action.isEnabledForContext(new ActionContext()));
+	}
+
 	static class FooActionContext extends ActionContext {
 		public boolean foo() {
 			return true;