From a651e3095986feb14c8394fef17fa2349d9bbe71 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Fri, 24 May 2024 16:21:30 -0400
Subject: [PATCH] Fixed shared action binding conflict

---
 .../app/plugin/core/compositeeditor/PointerAction.java     | 7 +------
 .../plugin/core/datamgr/actions/CreatePointerAction.java   | 5 +++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/PointerAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/PointerAction.java
index 5838ef3ac2..b86a54eadc 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/PointerAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/PointerAction.java
@@ -15,12 +15,8 @@
  */
 package ghidra.app.plugin.core.compositeeditor;
 
-import static docking.KeyBindingPrecedence.*;
-
 import java.awt.event.KeyEvent;
 
-import javax.swing.KeyStroke;
-
 import docking.ActionContext;
 import docking.action.KeyBindingData;
 import ghidra.program.model.data.DataType;
@@ -37,12 +33,11 @@ public class PointerAction extends CompositeEditorTableAction {
 	private final static String GROUP_NAME = COMPONENT_ACTION_GROUP;
 	private final static String DESCRIPTION = "Create a pointer(s) on the selection";
 	private final static DataType POINTER_DT = new PointerDataType();
-	private final static KeyStroke KEY_STROKE = KeyStroke.getKeyStroke(KeyEvent.VK_P, 0);
 
 	public PointerAction(CompositeEditorProvider provider) {
 		super(provider, ACTION_NAME, GROUP_NAME, null, null, null);
 		setDescription(DESCRIPTION);
-		setKeyBindingData(new KeyBindingData(KEY_STROKE, DefaultLevel));
+		setKeyBindingData(new KeyBindingData(KeyEvent.VK_P, 0));
 		adjustEnablement();
 	}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreatePointerAction.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreatePointerAction.java
index e9aa804163..227153fa26 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreatePointerAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreatePointerAction.java
@@ -16,12 +16,12 @@
 package ghidra.app.plugin.core.datamgr.actions;
 
 import java.awt.Component;
+import java.awt.event.KeyEvent;
 
 import javax.swing.tree.TreePath;
 
 import docking.ActionContext;
-import docking.action.DockingAction;
-import docking.action.MenuData;
+import docking.action.*;
 import docking.widgets.tree.GTree;
 import docking.widgets.tree.GTreeNode;
 import ghidra.app.plugin.core.datamgr.*;
@@ -37,6 +37,7 @@ public class CreatePointerAction extends DockingAction {
 		super("Create Pointer", plugin.getName());
 		this.plugin = plugin;
 
+		setKeyBindingData(new KeyBindingData(KeyEvent.VK_P, 0));
 		setPopupMenuData(new MenuData(new String[] { "New", "Pointer" }, null, "Create"));
 	}