github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-1-29-25' into Ghidra_11.3

Browse Source
This commit is contained in:
Ryan Kurtz
2025-01-29 12:20:47 -05:00
parent 1dfe0c241a abca848c4a
commit 3c68902436
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/sourcefilestable/SourceFilesTablePlugin.java
View File

@@ -322,7 +322,6 @@ public class SourceFilesTablePlugin extends ProgramPlugin implements OptionsChan
}
private void initOptions(ToolOptions options) {
options.registerOption(USE_EXISTING_AS_DEFAULT_OPTION_NAME, true,
new HelpLocation(getName(), "Use_Existing_As_Default"),
@@ -336,8 +335,8 @@ public class SourceFilesTablePlugin extends ProgramPlugin implements OptionsChan
() -> new StringWithChoicesEditor(VIEWERS));
selectedViewer = options.getString(SELECTED_VIEWER_OPTION_NAME, VS_CODE);
options.addOptionsChangeListener(this);
options.setOptionsHelpLocation(
new HelpLocation(getName(), "Source_Files_Table_Plugin_Options"));
}
}

1
Ghidra/Features/Base/src/main/java/ghidra/app/util/viewer/field/SourceMapFieldFactory.java
View File

@@ -243,6 +243,7 @@ public class SourceMapFieldFactory extends FieldFactory {
"Show source file identifier info");
showIdentifier = fieldOptions.getBoolean(SHOW_IDENTIFIER_OPTION_NAME, false);
fieldOptions.getOptions(GROUP_TITLE).setOptionsHelpLocation(helpLoc);
}
private List<SourceMapEntry> getSourceMapEntries(CodeUnit cu) {

6
Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java
View File

@@ -1007,13 +1007,15 @@ public class CodeBrowserOptionsTest extends AbstractGhidraHeadedIntegrationTest
List<HelpLocation> nestedHelp = getParentHelpLocations(options, name);
for (HelpLocation help : nestedHelp) {
if (help != null && !isValidHelpLocation(help)) {
missing.add("Bad help location: " + help.toString());
missing.add("Bad parent help for path: " + options.getName() + "." + name +
"; help: " + help.toString() + "\nMake sure your options parent node " +
"has a help location set, in addition to the individual options " +
"node");
}
}
// it has a help location; is it valid?
if (hl != null && !isValidHelpLocation(hl)) {
isValidHelpLocation(hl);
missing.add(options.getName() + "." + name);
}
}