Merge remote-tracking branch 'origin/GP-4656-dragonmacher-fcg-exception' into Ghidra_11.1

This commit is contained in:
Ryan Kurtz 2024-06-03 06:14:24 -04:00
commit 8bfb75cc9b

View file

@ -32,9 +32,6 @@ import ghidra.graph.viewer.vertex.VisualVertexRenderer;
*/
public class FcgComponent extends GraphComponent<FcgVertex, FcgEdge, FunctionCallGraph> {
// our parent stores a reference to this graph, but we do it here to maintain its type
private FunctionCallGraph fcGraph;
private FcgVertexPaintTransformer vertexPaintTransformer =
new FcgVertexPaintTransformer(FcgVertex.DEFAULT_VERTEX_SHAPE_COLOR);
@ -55,7 +52,7 @@ public class FcgComponent extends GraphComponent<FcgVertex, FcgEdge, FunctionCal
@Override
protected FcgVertex getInitialVertex() {
return fcGraph.getSource();
return graph.getSource();
}
@Override
@ -91,13 +88,6 @@ public class FcgComponent extends GraphComponent<FcgVertex, FcgEdge, FunctionCal
edgeRenderer.setDrawColorTransformer(satelliteEdgePaintTransformer);
}
@Override
public void dispose() {
fcGraph = null;
super.dispose();
}
@Override // open access for testing
public VisualGraphViewUpdater<FcgVertex, FcgEdge> getViewUpdater() {
return super.getViewUpdater();