Merge remote-tracking branch 'origin/GP-3402-dragonmacher-graph-threading'

Author: ryanmkurtz

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/graph/AddressBasedGraphDisplayListener.java

@@ -56,11 +56,6 @@ public AddressBasedGraphDisplayListener(PluginTool tool, Program program,
 		program.addListener(this);
 	}
 
-	@Override
-	public void graphClosed() {
-		dispose();
-	}
-
 	@Override
 	public void locationFocusChanged(AttributedVertex vertex) {
 		Address address = getAddress(vertex);

Ghidra/Features/Base/src/main/java/ghidra/app/services/GraphDisplayBroker.java

@@ -26,10 +26,10 @@
 
 /**
  * Ghidra service interface for managing and directing graph output.  It purpose is to discover
- * available graphing display providers and (if more than one) allow the user to select the currently
- * active graph consumer.  Clients that generate graphs don't have to worry about how to display them
- * or export graphs. They simply send their graphs to the broker and register for graph events if
- * they want interactive support.
+ * available graphing display providers and (if more than one) allow the user to select the
+ * currently active graph consumer.  Clients that generate graphs don't have to worry about how to
+ * display them or export graphs. They simply send their graphs to the broker and register for graph
+ * events if they want interactive support.
  */
 @ServiceInfo(defaultProvider = GraphDisplayBrokerPlugin.class, description = "Get a Graph Display")
 public interface GraphDisplayBroker {
@@ -56,7 +56,7 @@ public interface GraphDisplayBroker {
 	/**
 	 * A convenience method for getting a {@link GraphDisplay} from the currently active provider.
 	 * This method is intended to be used to display a new graph.
-	 * 
+	 *
 	 * @param reuseGraph if true, the provider will attempt to re-use a current graph display
 	 * @param monitor the {@link TaskMonitor} that can be used to cancel the operation
 	 * @return a {@link GraphDisplay} object to sends graphs to be displayed or exported.
@@ -87,7 +87,7 @@ public GraphDisplay getDefaultGraphDisplay(boolean reuseGraph, TaskMonitor monit
 	/**
 	 * Returns the {@link AttributedGraphExporter} with the given name or null in no exporter with
 	 * that name is known
-	 * 
+	 *
 	 * @param name the name of the exporter to retrieve
 	 * @return  the {@link AttributedGraphExporter} with the given name or null if no exporter with
 	 * that name is known

Ghidra/Features/GraphServices/src/main/java/ghidra/graph/export/ExportAttributedGraphDisplay.java

@@ -17,23 +17,22 @@
 
 import java.util.*;
 
-import org.jgrapht.Graph;
-
 import docking.action.DockingActionIf;
 import docking.widgets.EventTrigger;
 import ghidra.app.services.GraphDisplayBroker;
 import ghidra.framework.plugintool.PluginTool;
 import ghidra.service.graph.*;
+import ghidra.util.Swing;
 import ghidra.util.exception.CancelledException;
 import ghidra.util.task.TaskMonitor;
 
 /**
  * {@link GraphDisplay} implementation for exporting graphs.  In this case, there is no
- * associated visual display, instead the graph output gets sent to a file.  The 
+ * associated visual display, instead the graph output gets sent to a file.  The
  * {@link GraphDisplay} is mostly just a placeholder for executing the export function.  By
  * hijacking the {@link GraphDisplayProvider} and {@link GraphDisplay} interfaces for exporting,
  * all graph generating operations can be exported instead of being displayed without changing
- * the graph generation code.    
+ * the graph generation code.
  */
 class ExportAttributedGraphDisplay implements GraphDisplay {
 
@@ -66,7 +65,8 @@ public void setGraphDisplayListener(GraphDisplayListener listener) {
 	 */
 	private void doSetGraphData(AttributedGraph attributedGraph) {
 		List<AttributedGraphExporter> exporters = findGraphExporters();
-		GraphExporterDialog dialog = new GraphExporterDialog(attributedGraph, exporters);
+		GraphExporterDialog dialog =
+			Swing.runNow(() -> new GraphExporterDialog(attributedGraph, exporters));
 		tool.showDialog(dialog);
 	}
 
@@ -79,8 +79,7 @@ private List<AttributedGraphExporter> findGraphExporters() {
 	}
 
 	@Override
-	public void setGraph(AttributedGraph graph, String title, boolean append,
-			TaskMonitor monitor) {
+	public void setGraph(AttributedGraph graph, String title, boolean append, TaskMonitor monitor) {
 		this.title = title;
 		this.graph = graph;
 		doSetGraphData(graph);
@@ -92,9 +91,6 @@ public void setGraph(AttributedGraph graph, GraphDisplayOptions options, String
 		this.setGraph(graph, title, append, monitor);
 	}
 
-	/**
-	 * remove all vertices and edges from the {@link Graph}
-	 */
 	@Override
 	public void clear() {
 		// not interactive, so N/A