mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-19 18:12:14 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2022-08-05 00:27:17 -04:00
parent 6185c4d005 b33ba2e8f0
commit 81ef0a2f6b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java
View File

@@ -142,6 +142,12 @@ public class HelpManager implements HelpService {
@Override
public void registerHelp(Object helpObject, HelpLocation location) {
if (helpObject == null) {
Throwable t = ReflectionUtilities.createJavaFilteredThrowable();
Msg.debug(this, "Incorrect use of registerHelp() - 'helpObject' cannot be null\n", t);
return;
}
if (location == null) {
Throwable t = ReflectionUtilities.createJavaFilteredThrowable();
Msg.debug(this, "Deprecated use of registerHelp() - use excludeFromHelp()\n", t);
@@ -234,7 +240,7 @@ public class HelpManager implements HelpService {
private void showHelpLocation(HelpLocation loc, Window window) {
if (loc == null) {
displayHelp(mainHS.getHomeID(), window); // show the default help page
showDefaultHelpPage(window);
return;
}
@@ -246,7 +252,7 @@ public class HelpManager implements HelpService {
String helpId = loc.getHelpId();
if (helpId == null) {
displayHelp(mainHS.getHomeID(), window); // show the default help page
showDefaultHelpPage(window);
return;
}
@@ -256,9 +262,14 @@ public class HelpManager implements HelpService {
catch (BadIDException e) {
Msg.info(this, "Could not find help for ID: \"" + helpId +
"\" from HelpLocation: " + loc);
displayHelp(HELP_NOT_FOUND_PAGE_URL, window);
}
}
private void showDefaultHelpPage(Window w) {
displayHelp(mainHS.getHomeID(), w);
}
private Window getBestParent(Component c) {
if (c == null) {
@@ -548,7 +559,7 @@ public class HelpManager implements HelpService {
return;
}
mainHB.setCurrentURL(validateUrl(helpUrl));
mainHB.setCurrentURL(helpUrl);
}
/** This forces page to be redisplayed when location has not changed */