yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 02:09:44 +02:00
Code Issues Releases Wiki Activity

Fixed missing graph help

Browse source
This commit is contained in:
dragonmacher 2025-07-15 16:23:57 -04:00
parent 8c56fc8e04
commit c94d44fe1d
6 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/help/help/TOC_Source.xml
View file

@ -158,7 +158,8 @@
<tocdef id="FileSystem Browser" text="FileSystem Browser" target="help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html" /> <tocdef id="FileSystem Browser" text="FileSystem Browser" target="help/topics/FileSystemBrowserPlugin/FileSystemBrowserPlugin.html" />
<tocdef id="Graphing" text="Graphing" target="help/topics/Graph/GraphIntro.html"> <tocdef id="Graphing" text="Graphing" target="help/topics/Graph/GraphIntro.html">
<tocdef id="Graph Services" text="Graph Services" target="help/topics/Graph/GraphServicesIntro.html"/> <tocdef id="Graph Services" sortgroup="a" text="Graph Services" target="help/topics/Graph/GraphServicesIntro.html"/>
<tocdef id="Visual Graphs" text="Visual Graphs" target="help/topics/VisualGraph/Visual_Graph.html"/>
</tocdef> </tocdef>
<tocdef id="Program Tree" text="Program Tree" target="help/topics/ProgramTreePlugin/program_tree.htm" > <tocdef id="Program Tree" text="Program Tree" target="help/topics/ProgramTreePlugin/program_tree.htm" >

2
Ghidra/Features/ProgramGraph/src/main/help/help/TOC_Source.xml
View file

@ -51,7 +51,7 @@
<tocroot> <tocroot>
<tocref id="Graphing"> <tocref id="Graphing">
<tocdef id="Graphing the Program" text="Graphing the Program" target="help/topics/ProgramGraphPlugin/ProgramGraph.htm" /> <tocdef id="Program Graph" text="Program Graph" target="help/topics/ProgramGraphPlugin/ProgramGraph.htm" />
</tocref> </tocref>
</tocroot> </tocroot>

16
Ghidra/Framework/Docking/src/main/java/docking/help/HelpManager.java
View file

@ -523,20 +523,28 @@ public class HelpManager implements HelpService {
public Map<Object, HelpLocation> getInvalidHelpLocations(TaskMonitor monitor) public Map<Object, HelpLocation> getInvalidHelpLocations(TaskMonitor monitor)
throws CancelledException { throws CancelledException {
Set<String> alreadySeen = new HashSet<>();
Map<Object, HelpLocation> map = new WeakHashMap<>(); Map<Object, HelpLocation> map = new WeakHashMap<>();
Map<Object, HelpLocation> helpLocationsCopy = copyHelpLocations(); Map<Object, HelpLocation> helpLocationsCopy = copyHelpLocations();
monitor.initialize(helpLocationsCopy.size()); monitor.initialize(helpLocationsCopy.size());
Set<Entry<Object, HelpLocation>> entries = helpLocationsCopy.entrySet(); Set<Entry<Object, HelpLocation>> entries = helpLocationsCopy.entrySet();
for (Entry<Object, HelpLocation> entry : entries) { for (Entry<Object, HelpLocation> entry : entries) {
monitor.checkCancelled(); monitor.increment();
Object helpee = entry.getKey(); Object helpee = entry.getKey();
HelpLocation location = entry.getValue(); HelpLocation location = entry.getValue();
monitor.setMessage("Checking " + helpee); monitor.setMessage("Checking " + helpee);
if (!hasValidHelp(helpee, location)) { if (hasValidHelp(helpee, location)) {
map.put(helpee, location); continue;
} }
monitor.incrementProgress(1);
String inception = location.getInceptionInformation();
if (alreadySeen.contains(inception)) {
continue; // don't show repeated errors for same line of code
}
alreadySeen.add(inception);
map.put(helpee, location);
} }
return map; return map;
} }

6
Ghidra/Framework/Graph/src/main/help/help/topics/VisualGraph/Visual_Graph.html
View file

@ -2,9 +2,6 @@
<HTML> <HTML>
<HEAD> <HEAD>
<META name="generator" content=
"HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net">
<TITLE>Visual Graphs</TITLE> <TITLE>Visual Graphs</TITLE>
<META http-equiv="Content-Type" content="text/html; charset=windows-1252"> <META http-equiv="Content-Type" content="text/html; charset=windows-1252">
<LINK rel="stylesheet" type="text/css" href="help/shared/DefaultStyle.css"> <LINK rel="stylesheet" type="text/css" href="help/shared/DefaultStyle.css">
@ -15,7 +12,8 @@
<BLOCKQUOTE> <BLOCKQUOTE>
<P>Visual Graphs are highly integrated graphs that all share common features and <P>Visual Graphs are highly integrated graphs that all share common features and
actions. They typically have both a <A href="#Visual_Graph_Primary_View">Primary View</A> and actions. Various Graph component providers are based upon the Visual Graph API.They typically
have both a <A href="#Visual_Graph_Primary_View">Primary View</A> and
a <A href="#Satellite_View">Satellite View</A> a <A href="#Satellite_View">Satellite View</A>
</BLOCKQUOTE> </BLOCKQUOTE>

4
Ghidra/Framework/Graph/src/main/java/ghidra/graph/featurette/VgSatelliteFeaturette.java
View file

@ -288,9 +288,7 @@ public class VgSatelliteFeaturette<V extends VisualVertex,
satelliteComponent.setMinimumSize(new Dimension(400, 400)); satelliteComponent.setMinimumSize(new Dimension(400, 400));
// TODO - need generic, shared help for the common abstract graph features; setHelpLocation(new HelpLocation("VisualGraph", "Satellite_View_Dock"));
// will be done in an upcoming ticket
// setHelpLocation(new HelpLocation("Graph", "Satellite_View_Dock"));
// this will group the satellite with the provider // this will group the satellite with the provider
setWindowMenuGroup(windowGroup); setWindowMenuGroup(windowGroup);

2
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/GraphComponent.java
View file

@ -473,7 +473,7 @@ public class GraphComponent<V extends VisualVertex, E extends VisualEdge<V>, G e
HelpService helpService = DockingWindowManager.getHelpService(); HelpService helpService = DockingWindowManager.getHelpService();
helpService.registerHelp(button, helpService.registerHelp(button,
new HelpLocation("Visual_Graph", "Satellite_View_Dock")); new HelpLocation("VisualGraph", "Satellite_View_Dock"));
return button; return button;
} }