Component Provider - fixed bug that prevented some providers' close

button from working

Ghidra/Features/Base/src/test.slow/java/docking/ComponentProviderActionsTest.java

@@ -339,6 +339,29 @@ public class ComponentProviderActionsTest extends AbstractGhidraHeadedIntegratio
 		assertProviderIsHidden();
 	}
 
+	@Test
+	public void testEveryCloseButtonsActionContext() {
+
+		// grab the tool that has all the provider's loaded
+		env.closeTool(tool);
+		tool = env.launchDefaultTool();
+
+		DockingWindowManager dwm = tool.getWindowManager();
+		PlaceholderManager pm = dwm.getPlaceholderManager();
+		Set<ComponentProvider> allProviders = pm.getActiveProviders();
+		for (ComponentProvider cp : allProviders) {
+			ActionContext context = cp.getActionContext(null);
+			if (context == null) {
+				continue; // a null context is allowed
+			}
+
+			// this is a rule we need for context to work as intended for some actions (like the
+			// close button)
+			assertSame("Component provider did not make itself the context's provider",
+				context.getComponentProvider(), cp);
+		}
+	}
+
 //==================================================================================================
 // Private Methods
 //==================================================================================================

Ghidra/Framework/Docking/src/main/java/docking/ActionContext.java

@@ -100,7 +100,7 @@ public class ActionContext {
 	 * Sets the sourceObject for this ActionContext.  This method is used internally by the 
 	 * DockingWindowManager. ComponentProvider and action developers should
 	 * only use this method for testing.
-	 * @param sourceObject
+	 * @param sourceObject the source object
 	 */
 	public void setSource(Object sourceObject) {
 		this.sourceObject = sourceObject;
@@ -125,4 +125,18 @@ public class ActionContext {
 	public MouseEvent getMouseEvent() {
 		return mouseEvent;
 	}
+
+	@Override
+	public String toString() {
+
+		//@formatter:off
+		return "{\n" +
+			"\tprovider: " + provider + ",\n" + 
+			"\tcontextObject: " + contextObject + ",\n" +
+			"\tsourceObject: " + sourceObject + ",\n" +
+			"\tmouseEvent: " + mouseEvent + "\n" +
+		"}";
+		//@formatter:on
+	}
+
 }

Ghidra/Framework/Docking/src/main/java/docking/menu/ToolBarItemManager.java

@@ -229,7 +229,8 @@ public class ToolBarItemManager implements PropertyChangeListener, ActionListene
 	private ActionContext getActionContext() {
 		ComponentProvider provider = getComponentProvider();
 		ActionContext context = provider == null ? null : provider.getActionContext(null);
-		final ActionContext actionContext = context == null ? new ActionContext() : context;
+		final ActionContext actionContext =
+			context == null ? new ActionContext(provider, null) : context;
 		return actionContext;
 	}