Make sure HeatMap repaints properly when switching networks.

Author: mikekucera

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

@@ -112,8 +112,8 @@ public class HeatMapMediator implements RowsSetListener, SetCurrentNetworkViewLi
 
 	@Inject private HeatMapPanel heatMapPanel;
 	@Inject private Provider<HeatMapContentPanel> contentPanelProvider;
-	@Inject private HeatMapContentPanel contentPanel2;
 
+	private HeatMapContentPanel contentPanel2;
 	private final CoalesceTimer selectionEventTimer = new CoalesceTimer(200, 1);
 	private boolean onlyEdges;
 
@@ -153,7 +153,6 @@ private HeatMapContentPanel getContentPanel() {
 			// Property Change Listeners
 			contentPanel2.addPropertyChangeListener("selectedRankingOption", evt -> settingChanged());
 		}
-		heatMapPanel.showContentPanel(contentPanel2);
 		return contentPanel2;
 	}
 
@@ -295,6 +294,8 @@ private void updateHeatMap(CyNetworkView networkView) {
 
 		invokeOnEDT(() -> {
 			HeatMapContentPanel contentPanel = getContentPanel();
+			heatMapPanel.showContentPanel(contentPanel2);
+			
 			resetWithoutListeners(() -> {
 				contentPanel.update(network, map, params, rankOptions, union, inter, clusterRankingOption);
 			});

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

@@ -49,6 +49,7 @@ public void showContentPanel(HeatMapContentPanel contentPanel) {
 			add(contentPanel, BorderLayout.CENTER);
 		else
 			add(nullContentPanel, BorderLayout.CENTER);
+		repaint();
 	}