Avoid race condition when reloading a session file.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/model/io/SessionModelIO.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ForkJoinPool;
 
 import org.baderlab.csplugins.enrichmentmap.ApplicationModule.Headless;
 import org.baderlab.csplugins.enrichmentmap.CyActivator;
@@ -29,6 +30,7 @@
 import org.cytoscape.service.util.CyServiceRegistrar;
 import org.cytoscape.session.CySession;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -101,7 +103,7 @@ public void restoreModel(CySession session) {
 
 		emManager.reset();
 
-		boolean sessionHasEM = false;
+		boolean sessionHasEM;
 		if(session != null && LegacySessionLoader.isLegacy(session)) {
 			sessionHasEM = true;
 			legacySessionLoaderProvider.get().loadSession(session);
@@ -112,12 +114,14 @@ public void restoreModel(CySession session) {
 		if(!headless) {
 			ControlPanelMediator controlPanelMediator = controlPanelMediatorProvider.get();
 			HeatMapMediator heatMapMediator = heatMapMediatorProvider.get();
-			controlPanelMediator.reset();
-			heatMapMediator.reset();
-			if(sessionHasEM) {
-				controlPanelMediator.showControlPanel();
-				heatMapMediator.showHeatMapPanel();
-			}
+			ListenableFuture<Void> future = controlPanelMediator.reset();
+			future.addListener(() -> {
+				heatMapMediator.reset();
+				if(sessionHasEM) {
+					controlPanelMediator.showControlPanel();
+					heatMapMediator.showHeatMapPanel();
+				}
+			}, ForkJoinPool.commonPool());
 		}
 
 		if(debug) {

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

@@ -17,6 +17,7 @@
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Paths;
+import java.util.concurrent.Callable;
 
 import javax.annotation.Nullable;
 import javax.swing.AbstractButton;
@@ -44,6 +45,8 @@
 import org.cytoscape.util.swing.LookAndFeelUtil;
 
 import com.google.common.base.Strings;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListenableFutureTask;
 
 
 public class SwingUtil {
@@ -160,6 +163,20 @@ public static void invokeOnEDT(final Runnable runnable) {
 			SwingUtilities.invokeLater(runnable);
 	}
 
+	
+	public static <T> ListenableFuture<T> invokeOnEDTFuture(Callable<T> callable) {
+		ListenableFutureTask<T> future = ListenableFutureTask.create(callable);
+		invokeOnEDT(future);
+		return future;
+	}
+	
+	public static ListenableFuture<Void> invokeOnEDTFuture(Runnable runnable) {
+		return invokeOnEDTFuture(() -> {
+			runnable.run();
+			return null;
+		});
+	}
+	
 	public static void invokeOnEDTAndWait(final Runnable runnable) {
 		if (SwingUtilities.isEventDispatchThread()) {
 			runnable.run();