mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3375_ghidra007_CreateEnumFromSelection_fixMultipleWarnings--SQUASHED' into Ghidra_10.3

Browse Source
This commit is contained in:
Ryan Kurtz
2023-05-02 13:23:42 -04:00
parent 6e4b81f329 43bc47985f
commit 57a7d100d4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/actions/CreateEnumFromSelectionAction.java
View File

@@ -197,6 +197,7 @@ public class CreateEnumFromSelectionAction extends DockingAction {
private void mergeEnum(Enum mergedEnum, Enum enumToMerge) {
boolean hasSameNameDiffValueEntry = false;
for (String name : enumToMerge.getNames()) {
long valueToAdd = enumToMerge.getValue(name);
@@ -209,16 +210,20 @@ public class CreateEnumFromSelectionAction extends DockingAction {
if (isConflictingEntry(mergedEnum, enumToMerge, name)) {
name = createDeconflictedName(mergedEnum, name);
hasSameNameDiffValueEntry = true;
comment = "NOTE: Duplicate name with different value";
Msg.debug(this,
"Merged Enum " + mergedEnum.getName() +
" has at least one duplicate named entry with different value than " +
"original. Underscore(s) have been appended to name allow addition.");
}
mergedEnum.add(name, valueToAdd, comment);
}
if(hasSameNameDiffValueEntry) {
Msg.showWarn(this, null, "Duplicate Entry Name(s)",
"Merged Enum " + mergedEnum.getName() + " has one or more entries with duplicate" +
" names. Underscore(s) have been appended to make them unique.");
}
}
private String createDeconflictedName(Enum enumm, String name) {