Open PDF viewer when exporting legend

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/ExportPDFAction.java

@@ -1,6 +1,5 @@
 package org.baderlab.csplugins.enrichmentmap.view.heatmap;
 
-import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.Optional;
@@ -11,11 +10,10 @@
 import javax.swing.JTable;
 
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
+import org.baderlab.csplugins.enrichmentmap.view.util.OpenPDFViewerTask;
 import org.cytoscape.util.swing.FileUtil;
-import org.cytoscape.work.AbstractTask;
 import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskIterator;
-import org.cytoscape.work.TaskMonitor;
 import org.cytoscape.work.swing.DialogTaskManager;
 
 import com.google.inject.Inject;
@@ -48,25 +46,12 @@ public void actionPerformed(ActionEvent e) {
 		Optional<File> file = FileBrowser.promptForPdfExport(fileUtil, jframeProvider.get());
 		if(file.isPresent()) {
 			ExportPDFTask exportPdfTask = new ExportPDFTask(file.get(), table, rankingSupplier.get());
-			Task openPdfViewerTask = getOpenPdfViewerTask(file.get());
+			Task openPdfViewerTask = new OpenPDFViewerTask(file.get());
 			dialogTaskManager.execute(new TaskIterator(exportPdfTask, openPdfViewerTask));
 		}
 	}
 
 
-	private static Task getOpenPdfViewerTask(File file) {
-		return new AbstractTask() {
-			@Override
-			public void run(TaskMonitor taskMonitor) {
-				try {
-					if(Desktop.isDesktopSupported()) {
-						Desktop.getDesktop().open(file);
-					}
-				} catch(Exception e) { } // ignore, just make best attempt to open the viewer
-			}
-		};
-	}
-	
 }
 
 

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/legend/LegendPanelMediator.java

@@ -22,11 +22,13 @@
 import org.baderlab.csplugins.enrichmentmap.model.EMDataSet;
 import org.baderlab.csplugins.enrichmentmap.style.EMStyleOptions;
 import org.baderlab.csplugins.enrichmentmap.view.util.FileBrowser;
+import org.baderlab.csplugins.enrichmentmap.view.util.OpenPDFViewerTask;
 import org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil;
 import org.cytoscape.application.swing.CySwingApplication;
 import org.cytoscape.util.swing.FileUtil;
 import org.cytoscape.util.swing.IconManager;
 import org.cytoscape.util.swing.LookAndFeelUtil;
+import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskIterator;
 import org.cytoscape.work.swing.DialogTaskManager;
 
@@ -128,8 +130,9 @@ private void updateDialog(EMStyleOptions options, Collection<EMDataSet> filtered
 	private void exportPDF() {
 		Optional<File> file = FileBrowser.promptForPdfExport(fileUtil, swingApplication.getJFrame());
 		if(file.isPresent()) {
-			ExportLegendPDFTask task = new ExportLegendPDFTask(file.get(), legendPanelProvider.get());
-			dialogTaskManager.execute(new TaskIterator(task));
+			ExportLegendPDFTask exportTask = new ExportLegendPDFTask(file.get(), legendPanelProvider.get());
+			Task openPdfViewerTask = new OpenPDFViewerTask(file.get());
+			dialogTaskManager.execute(new TaskIterator(exportTask, openPdfViewerTask));
 		}
 	}
 

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/OpenPDFViewerTask.java

@@ -0,0 +1,29 @@
+package org.baderlab.csplugins.enrichmentmap.view.util;
+
+import java.awt.Desktop;
+import java.io.File;
+import java.util.Objects;
+
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskMonitor;
+
+public class OpenPDFViewerTask extends AbstractTask {
+
+	private final File file;
+	
+	public OpenPDFViewerTask(File file) {
+		this.file = Objects.requireNonNull(file);
+	}
+
+	@Override
+	public void run(TaskMonitor tm) throws Exception {
+		try {
+			if(Desktop.isDesktopSupported()) {
+				Desktop.getDesktop().open(file);
+			}
+		} catch(Exception e) { 
+			// ignore, just make best attempt to open the viewer
+		} 
+	}
+
+}