Fixes heatmap NPE.

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/task/CreateDummyExpressionTask.java

@@ -5,6 +5,7 @@
 import java.util.Iterator;
 
 import org.baderlab.csplugins.enrichmentmap.model.DataSet;
+import org.baderlab.csplugins.enrichmentmap.model.EnrichmentMap;
 import org.baderlab.csplugins.enrichmentmap.model.GeneExpression;
 import org.baderlab.csplugins.enrichmentmap.model.GeneExpressionMatrix;
 import org.cytoscape.work.AbstractTask;
@@ -82,7 +83,10 @@ private void createDummyExpression(){
 		expressionMatrix.setFilename("Dummy Expression_" + dataset.getName().toString() );
 
 		//set that there is data for the expression viewer
-		dataset.getMap().getParams().setData(true);
+		if(dataset.getName().equals(EnrichmentMap.DATASET1))
+			dataset.getMap().getParams().setData(true);
+		else if(dataset.getName().equals(EnrichmentMap.DATASET2))
+			dataset.getMap().getParams().setData2(true);
     }
 
 	public void run(TaskMonitor taskMonitor) throws Exception {

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

@@ -1174,7 +1174,7 @@ private JPanel createExpressionLegendPanel() {
 		layout.setHorizontalGroup(hGroup);
 		layout.setVerticalGroup(vGroup);
 
-		if (params.isTwoDistinctExpressionSets()) {
+		if (params.isTwoDistinctExpressionSets() && params.isData2()) {
 			ColorGradientWidget legend1 = ColorGradientWidget.getInstance("", hmParams.getTheme_ds1(),
 					hmParams.getRange_ds1(), true, ColorGradientWidget.LEGEND_POSITION.NA);
 			ColorGradientWidget legend2 = ColorGradientWidget.getInstance("", hmParams.getTheme_ds2(),