Post Analysis panel remembers previous inputs.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/model/EnrichmentMapManager.java

@@ -48,8 +48,11 @@
 import java.util.Map;
 
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapParams;
+import org.baderlab.csplugins.enrichmentmap.view.postanalysis.PostAnalysisPanelMediator;
 import org.cytoscape.view.model.CyNetworkView;
 
+import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
 
@@ -59,6 +62,8 @@ public class EnrichmentMapManager {
 	private Map<Long, EnrichmentMap> enrichmentMaps = new HashMap<>();
 	private Map<Long, HeatMapParams> heatMapParams = new HashMap<>();
 	private Map<Long, HeatMapParams> heatMapParamsEdges = new HashMap<>();
+	
+	@Inject private Provider<PostAnalysisPanelMediator> postAnalysisMediatorProvider;
 
 	/**
 	 * Registers a newly created Network.
@@ -76,7 +81,11 @@ public EnrichmentMap getEnrichmentMap(Long networkId) {
 	}
 
 	public EnrichmentMap removeEnrichmentMap(Long networkId) {
-		return enrichmentMaps.remove(networkId);
+		EnrichmentMap map = enrichmentMaps.remove(networkId);
+		if(map != null) {
+			postAnalysisMediatorProvider.get().removeEnrichmentMap(map);
+		}
+		return map;
 	}
 
 	public boolean isEnrichmentMap(Long networkId) {

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/postanalysis/PostAnalysisPanelMediator.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.WeakHashMap;
 
 import javax.swing.AbstractAction;
 import javax.swing.JButton;
@@ -56,13 +57,16 @@ public class PostAnalysisPanelMediator {
 	@Inject private CreateDiseaseSignatureTaskFactory.Factory signatureTaskFactoryFactory;
 	@Inject private ErrorMessageDialog.Factory errorMessageDialogFactory;
 
+	private WeakHashMap<EnrichmentMap,PostAnalysisInputPanel> panels = new WeakHashMap<>();
+	
+	
 
 	@SuppressWarnings("serial")
 	public void showDialog(Component parent, CyNetworkView netView) {
 		final EnrichmentMap map = emManager.getEnrichmentMap(netView.getModel().getSUID());
 
 		invokeOnEDT(() -> {
-			final PostAnalysisInputPanel panel = panelFactory.create(map);
+			final PostAnalysisInputPanel panel = panels.computeIfAbsent(map, panelFactory::create);
 
 			final JDialog dialog = new JDialog(swingApplication.getJFrame(), "Add Signature Gene Sets", ModalityType.APPLICATION_MODAL);
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
@@ -106,6 +110,9 @@ public void actionPerformed(ActionEvent e) {
 		});
 	}
 
+	public void removeEnrichmentMap(EnrichmentMap map) {
+		panels.remove(map);
+	}
 
 	private void addGeneSets(CyNetworkView netView, PostAnalysisParameters params) {
 		CreateDiseaseSignatureTaskFactory taskFactory = signatureTaskFactoryFactory.create(netView, params);