Fixes #341

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/creation/MasterDetailDialogPage.java

@@ -164,10 +164,7 @@ public void finish() {
 		CreateEnrichmentMapTaskFactory taskFactory = taskFactoryFactory.create(params, dataSets);
 		TaskIterator tasks = taskFactory.createTaskIterator();
 
-		// Close this dialog after the progress dialog finishes normally
-		tasks.append(callback.getCloseTask());
-		
-		dialogTaskManager.execute(tasks);
+		dialogTaskManager.execute(tasks, callback.getCloseTaskObserver());
 	}
 
 

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

@@ -27,8 +27,11 @@
 
 import org.cytoscape.util.swing.LookAndFeelUtil;
 import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.FinishStatus;
+import org.cytoscape.work.ObservableTask;
 import org.cytoscape.work.Task;
 import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.TaskObserver;
 
 public class CardDialog {
 
@@ -242,6 +245,11 @@ public void close() {
 			dialog.setVisible(false);
 		}
 
+		@Override
+		public CardDialog getDialog() {
+			return CardDialog.this;
+		}
+		
 		@Override
 		public Task getCloseTask() {
 			return new AbstractTask() {
@@ -254,9 +262,19 @@ public void run(TaskMonitor taskMonitor) throws Exception {
 		}
 
 		@Override
-		public CardDialog getDialog() {
-			return CardDialog.this;
+		public TaskObserver getCloseTaskObserver() {
+			return new TaskObserver() {
+				@Override
+				public void taskFinished(ObservableTask task) {
+				}
+				@Override
+				public void allFinished(FinishStatus finishStatus) {
+					// because the finishButton listener disables the Finish button
+					// need to re-enable the finish button even if the task fails
+					finishButton.setEnabled(true); 
+					close();
+				}
+			};
 		}
-
 	}
 }

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

@@ -3,6 +3,7 @@
 import javax.swing.JDialog;
 
 import org.cytoscape.work.Task;
+import org.cytoscape.work.TaskObserver;
 
 public interface CardDialogCallback {
 
@@ -15,4 +16,6 @@ public interface CardDialogCallback {
 	void close();
 
 	Task getCloseTask();
+	
+	TaskObserver getCloseTaskObserver();
 }