Fix problem with creation dialog blocking table command task.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/CommandModule.java

@@ -1,6 +1,6 @@
 package org.baderlab.csplugins.enrichmentmap;
 
-import org.baderlab.csplugins.enrichmentmap.actions.OpenEnrichmentMapAction;
+import org.baderlab.csplugins.enrichmentmap.actions.OpenEnrichmentMapPanelsAction;
 import org.baderlab.csplugins.enrichmentmap.commands.ChartCommandTask;
 import org.baderlab.csplugins.enrichmentmap.commands.DatasetColorCommandTask;
 import org.baderlab.csplugins.enrichmentmap.commands.DatasetShowCommandTask;
@@ -28,19 +28,19 @@ protected void configure() {
 
 
 	@ProvidesIntoSet
-	public CommandTaskFactory provideBuild(Provider<EMBuildCommandTask> taskProvider, OpenEnrichmentMapAction showTask) {
+	public CommandTaskFactory provideBuild(Provider<EMBuildCommandTask> taskProvider, OpenEnrichmentMapPanelsAction showTask) {
 		String desc = "Creates an EnrichmentMap network containing one or two data sets.";
 		return CommandTaskFactory.create("build", desc, null, taskProvider, showTask);
 	}
 
 	@ProvidesIntoSet
-	public CommandTaskFactory provideGSEA(Provider<EMGseaCommandTask> taskProvider, OpenEnrichmentMapAction showTask) {
+	public CommandTaskFactory provideGSEA(Provider<EMGseaCommandTask> taskProvider, OpenEnrichmentMapPanelsAction showTask) {
 		String desc = "Creates an EnrichmetMap network from one or two GSEA results. (Deprecated, use 'build' or 'mastermap' command instead.)";
 		return CommandTaskFactory.create("gseabuild", desc, null, taskProvider, showTask);
 	}
 
 	@ProvidesIntoSet
-	public CommandTaskFactory provideMastermap(Provider<MastermapCommandTask> taskProvider, OpenEnrichmentMapAction showTask) {
+	public CommandTaskFactory provideMastermap(Provider<MastermapCommandTask> taskProvider, OpenEnrichmentMapPanelsAction showTask) {
 		String desc = "Creates an EnrichmentMap network containing any number of data sets by scanning files in a folder.";
 		String longDesc = "Uses the same algorithm as the Create EnrichmentMap Dialog to scan the files in a folder and "
 				+ "automatically group them into data sets. Sub-folders will be scanned up to one level deep, allowing you to "
@@ -71,7 +71,7 @@ public CommandTaskFactory provideJson(Provider<ExportModelJsonCommandTask> taskP
 	}
 
 	@ProvidesIntoSet
-	public CommandTaskFactory provideBuildTable(Provider<TableCommandTask> taskProvider, OpenEnrichmentMapAction showTask) {
+	public CommandTaskFactory provideBuildTable(Provider<TableCommandTask> taskProvider, OpenEnrichmentMapPanelsAction showTask) {
 		String desc = "Creates an EnrichmentMap network from values in a table.";
 		String longDesc = "Intended mainly for other Apps to programatically create an EnrichmentMap network.";
 		return CommandTaskFactory.create("build-table", desc, longDesc, taskProvider, showTask);

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/actions/OpenEnrichmentMapPanelsAction.java

@@ -0,0 +1,47 @@
+package org.baderlab.csplugins.enrichmentmap.actions;
+
+import java.awt.event.ActionEvent;
+
+import org.baderlab.csplugins.enrichmentmap.view.control.ControlPanelMediator;
+import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapMediator;
+import org.cytoscape.application.swing.AbstractCyAction;
+import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskMonitor;
+
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+
+@SuppressWarnings("serial")
+@Singleton
+public class OpenEnrichmentMapPanelsAction extends AbstractCyAction implements Task {
+	
+	public static final String NAME = "EnrichmentMap";
+
+	@Inject private Provider<ControlPanelMediator> controlPanelMediatorProvider;
+	@Inject private Provider<HeatMapMediator> heatMapMediatorProvider;
+
+	public OpenEnrichmentMapPanelsAction() {
+		super(NAME);
+		setPreferredMenu("Apps");
+	}
+
+	public synchronized void showPanels() {
+		controlPanelMediatorProvider.get().showControlPanel();
+		heatMapMediatorProvider.get().showHeatMapPanel();
+	}
+	
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		showPanels();
+	}
+
+	@Override
+	public void run(TaskMonitor taskMonitor) {
+		showPanels();
+	}
+	
+	@Override
+	public void cancel() {
+	}
+}