From 04e49ee46a89fac5c6943f31f1e12a148cb88e85 Mon Sep 17 00:00:00 2001
From: ghidravore <ghidravore@users.noreply.github.com>
Date: Tue, 14 Jan 2020 14:50:41 -0500
Subject: [PATCH] fixes to action builder

---
 .../src/main/java/docking/action/MenuData.java       | 12 ++++++------
 .../action/builder/AbstractActionBuilder.java        |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java b/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
index 3f46e3d514..8d125c21fc 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java
@@ -41,19 +41,19 @@ public class MenuData {
 	private String menuSubGroup;
 
 	public MenuData(String[] menuPath) {
-		this(menuPath, null, null);
+		this(menuPath, null, null, NO_MNEMONIC, null);
 	}
 
 	public MenuData(String[] menuPath, String group) {
-		this(menuPath, null, group);
+		this(menuPath, null, group, NO_MNEMONIC, null);
 	}
 
 	public MenuData(String[] menuPath, Icon icon) {
-		this(menuPath, icon, null);
+		this(menuPath, icon, null, NO_MNEMONIC, null);
 	}
 
 	public MenuData(String[] menuPath, Icon icon, String menuGroup) {
-		this(processMenuPath(menuPath), icon, menuGroup, getMnemonic(menuPath), null);
+		this(menuPath, icon, menuGroup, NO_MNEMONIC, null);
 	}
 
 	public MenuData(String[] menuPath, Icon icon, String menuGroup, int mnemonic,
@@ -62,10 +62,10 @@ public class MenuData {
 		if (menuPath == null || menuPath.length == 0) {
 			throw new IllegalArgumentException("Menu path cannot be null or empty");
 		}
-		this.menuPath = menuPath;
+		this.menuPath = processMenuPath(menuPath);
 		this.menuGroup = menuGroup;
 		this.menuSubGroup = menuSubGroup == null ? NO_SUBGROUP : menuSubGroup;
-		this.mnemonic = mnemonic;
+		this.mnemonic = mnemonic == NO_MNEMONIC ? getMnemonic(menuPath) : mnemonic;
 		this.icon = DockingUtils.scaleIconAsNeeded(icon);
 	}
 
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 5fca16ae69..49788772a6 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
@@ -100,7 +100,7 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, B extends
 	/**
 	 * The mnemonic for the menu action (optional)
 	 */
-	private int menuMnemonic;
+	private int menuMnemonic = MenuData.NO_MNEMONIC;
 
 	/**
 	 * The icon for the  menu item (optional)
@@ -304,7 +304,8 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, B extends
 	 * @see #menuGroup(String)
 	 */
 	public B menuGroup(String group, String subGroup) {
-		menuSubGroup = group;
+		menuGroup = group;
+		menuSubGroup = subGroup;
 		return self();
 	}