Skip to content

Commit 04e49ee

Browse files
committed
fixes to action builder
1 parent 341f100 commit 04e49ee

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

Ghidra/Framework/Docking/src/main/java/docking/action/MenuData.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ public class MenuData {
4141
private String menuSubGroup;
4242

4343
public MenuData(String[] menuPath) {
44-
this(menuPath, null, null);
44+
this(menuPath, null, null, NO_MNEMONIC, null);
4545
}
4646

4747
public MenuData(String[] menuPath, String group) {
48-
this(menuPath, null, group);
48+
this(menuPath, null, group, NO_MNEMONIC, null);
4949
}
5050

5151
public MenuData(String[] menuPath, Icon icon) {
52-
this(menuPath, icon, null);
52+
this(menuPath, icon, null, NO_MNEMONIC, null);
5353
}
5454

5555
public MenuData(String[] menuPath, Icon icon, String menuGroup) {
56-
this(processMenuPath(menuPath), icon, menuGroup, getMnemonic(menuPath), null);
56+
this(menuPath, icon, menuGroup, NO_MNEMONIC, null);
5757
}
5858

5959
public MenuData(String[] menuPath, Icon icon, String menuGroup, int mnemonic,
@@ -62,10 +62,10 @@ public MenuData(String[] menuPath, Icon icon, String menuGroup, int mnemonic,
6262
if (menuPath == null || menuPath.length == 0) {
6363
throw new IllegalArgumentException("Menu path cannot be null or empty");
6464
}
65-
this.menuPath = menuPath;
65+
this.menuPath = processMenuPath(menuPath);
6666
this.menuGroup = menuGroup;
6767
this.menuSubGroup = menuSubGroup == null ? NO_SUBGROUP : menuSubGroup;
68-
this.mnemonic = mnemonic;
68+
this.mnemonic = mnemonic == NO_MNEMONIC ? getMnemonic(menuPath) : mnemonic;
6969
this.icon = DockingUtils.scaleIconAsNeeded(icon);
7070
}
7171

Ghidra/Framework/Docking/src/main/java/docking/action/builder/AbstractActionBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public abstract class AbstractActionBuilder<T extends DockingActionIf, B extends
100100
/**
101101
* The mnemonic for the menu action (optional)
102102
*/
103-
private int menuMnemonic;
103+
private int menuMnemonic = MenuData.NO_MNEMONIC;
104104

105105
/**
106106
* The icon for the menu item (optional)
@@ -304,7 +304,8 @@ public B menuGroup(String group) {
304304
* @see #menuGroup(String)
305305
*/
306306
public B menuGroup(String group, String subGroup) {
307-
menuSubGroup = group;
307+
menuGroup = group;
308+
menuSubGroup = subGroup;
308309
return self();
309310
}
310311

0 commit comments

Comments
 (0)