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

Changed graph api to use vertex and edge object instead of ids.

Browse source
This commit is contained in:
ghidravore 2020-10-09 14:27:29 -04:00
parent 3cd26120a3
commit 592b8a3cfc
14 changed files with 292 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/DummyGraphDisplayListener.java
View file

@ -15,7 +15,7 @@
*/
package ghidra.service.graph;
import java.util.List;
import java.util.Set;
public class DummyGraphDisplayListener implements GraphDisplayListener {
@ -24,19 +24,19 @@ public class DummyGraphDisplayListener implements GraphDisplayListener {
// I'm a dummy
}
@Override
public void selectionChanged(List<String> vertexIds) {
// I'm a dummy
}
@Override
public void locationFocusChanged(String vertexId) {
// I'm a dummy
}
@Override
public GraphDisplayListener cloneWith(GraphDisplay graphDisplay) {
return new DummyGraphDisplayListener();
}
@Override
public void selectionChanged(Set<AttributedVertex> vertices) {
// I'm a dummy
}
@Override
public void locationFocusChanged(AttributedVertex vertex) {
// I'm a dummy
}
}

45
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplay.java
View file

@ -15,7 +15,6 @@
*/
package ghidra.service.graph;
import java.util.List;
import java.util.Set;
import docking.action.DockingAction;
@ -46,41 +45,46 @@ public interface GraphDisplay {
/**
* Tells the graph display window to focus the vertex with the given id.
*
* @param vertexID the id of the vertex to focus
* @param vertex the vertex to focus
* @param eventTrigger Provides a hint to the GraphDisplay as to why we are updating the
* graph location so that the GraphDisplay can decide if it should send out a notification via
* the {@link GraphDisplayListener#locationFocusChanged(String)}. For example, if we are updating
* the the location due to an event from the main application, we don't want to notify the
* application the graph changed to avoid event cycles. See {@link EventTrigger} for more
* information.
*
* the {@link GraphDisplayListener#locationFocusChanged(AttributedVertex)}. For example, if we
* are updating the the location due to an event from the main application, we don't want to
* notify the application the graph changed to avoid event cycles. See {@link EventTrigger} for
* more information.
*/
public void setLocationFocus(String vertexID, EventTrigger eventTrigger);
public void setFocusedVertex(AttributedVertex vertex, EventTrigger eventTrigger);
/**
* Returns the currently focused vertexID or null if no vertex is focussed.
* @return the currently focused vertexID or null if no vertex is focussed.
* Returns the graph for this display
* @return the graph for this display
*/
public String getFocusedVertexId();
public AttributedGraph getGraph();
/**
* Returns the currently focused vertex or null if no vertex is focused
* @return the currently focused vertex or null if no vertex is focused.
*/
public AttributedVertex getFocusedVertex();
/**
* Tells the graph display window to select the vertices with the given ids
*
* @param vertexList the list of vertex ids to select
* @param vertexSet the set of vertices to select
* @param eventTrigger Provides a hint to the GraphDisplay as to why we are updating the
* graph location so that the GraphDisplay can decide if it should send out a notification via
* the {@link GraphDisplayListener#locationFocusChanged(String)}. For example, if we are updating
* the {@link GraphDisplayListener#selectionChanged(Set)}. For example, if we are updating
* the the location due to an event from the main application, we don't want to notify the
* application the graph changed to avoid event cycles. See {@link EventTrigger} for more
* information.
*/
public void selectVertices(List<String> vertexList, EventTrigger eventTrigger);
public void selectVertices(Set<AttributedVertex> vertexSet, EventTrigger eventTrigger);
/**
* Returns a list of vertex ids for all the currently selected vertices
* @return a list of vertex ids for all the currently selected vertices
* Returns a set of vertex ids for all the currently selected vertices
* @return a set of vertex ids for all the currently selected vertices
*/
public Set<String> getSelectedVertexIds();
public Set<AttributedVertex> getSelectedVertices();
/**
* Closes this graph display window.
@ -131,10 +135,10 @@ public interface GraphDisplay {
/**
* Updates a vertex to a new name
* @param id the vertex id
* @param newName the new name of the vertex
* @param vertex the vertex to rename
* @param newName the new name for the vertex
*/
public void updateVertexName(String id, String newName);
public void updateVertexName(AttributedVertex vertex, String newName);
/**
* Returns the description of the current graph
@ -148,4 +152,5 @@ public interface GraphDisplay {
* @param action the action to add.
*/
public void addAction(DockingAction action);
}

12
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/service/graph/GraphDisplayListener.java
View file

@ -15,7 +15,7 @@
*/
package ghidra.service.graph;
import java.util.List;
import java.util.Set;
/**
* Interface for being notified when the user interacts with a visual graph display
@ -27,17 +27,17 @@ public interface GraphDisplayListener {
public void graphClosed();
/**
* Notification that the list of selected vertices has changed
* Notification that the set of selected vertices has changed
*
* @param vertexIds the list of vertex ids for the currently selected vertices
* @param vertices the set of currently selected vertices
*/
public void selectionChanged(List<String> vertexIds);
public void selectionChanged(Set<AttributedVertex> vertices);
/**
* Notification that the "focused" (active) vertex has changed
* @param vertexId the vertex id of the currently "focused" vertex
* @param vertex the vertex that is currently "focused"
*/
public void locationFocusChanged(String vertexId);
public void locationFocusChanged(AttributedVertex vertex);
/**
* Makes a new GraphDisplayListener of the same type as the specific