Skip to content

Commit 25cb235

Browse files
committed
Merge remote-tracking branch 'origin/GT-1-dragonmacher-documentation-fixup'
2 parents 2ad6dd6 + d0dc082 commit 25cb235

File tree

4 files changed

+151
-63
lines changed

4 files changed

+151
-63
lines changed

Ghidra/Features/Decompiler/src/main/java/ghidra/app/decompiler/parallel/ParallelDecompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private static <R> List<R> decompileFunctions(QCallback<Function, R> callback, P
110110
* @param monitor the monitor used to report progress and to cancel
111111
* @return the parallel decompiler used for decompiling.
112112
*/
113-
public static <R> ChunkingParallelDecompiler<R> createChunkingParallelDecopmiler(
113+
public static <R> ChunkingParallelDecompiler<R> createChunkingParallelDecompiler(
114114
QCallback<Function, R> callback, TaskMonitor monitor) {
115115
return new ChunkingParallelDecompiler<>(callback, monitor);
116116
}

Ghidra/Features/Decompiler/src/main/java/ghidra/app/util/exporter/CppExporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public boolean export(File file, DomainObject domainObj, AddressSetView addrSet,
9696
ParallelDecompilerCallback callback = new ParallelDecompilerCallback(decompilerPool);
9797
ChunkingTaskMonitor chunkingMonitor = new ChunkingTaskMonitor(monitor);
9898
ChunkingParallelDecompiler<CPPResult> parallelDecompiler =
99-
ParallelDecompiler.createChunkingParallelDecopmiler(callback, chunkingMonitor);
99+
ParallelDecompiler.createChunkingParallelDecompiler(callback, chunkingMonitor);
100100

101101
try {
102102
writeProgramDataTypes(program, header, headerWriter, cFileWriter, chunkingMonitor);

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

0 commit comments

Comments
 (0)