fix restoring of deleted suids, refs #319

Author: mikekucera

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

@@ -162,13 +162,21 @@ private boolean restoreModelFromTables(CySession session) {
 	private static Set<Long> mapSuids(Set<Long> oldSuids, CySession session, Class<? extends CyIdentifiable> type) {
 		Set<Long> newSuids = new HashSet<>();
 
-		for (Long suid : oldSuids) {
+		for (Long oldSuid : oldSuids) {
 			if (session != null) {
-				// If we are loading from a session file then we need to re-map the ids
-				CyIdentifiable obj = session.getObject(suid, type);
-				suid = obj.getSUID();
+				// If we are loading from a session file then we need to re-map the IDs.
+				CyIdentifiable obj = session.getObject(oldSuid, type);
+				if(obj == null) {
+					// Case where nodes/edges might have been deleted.
+					// We have to do the check here because older session files might not be saved properly.
+					System.err.println("EnrichmentMap: SUID not found: " + oldSuid);
+				} else {
+					Long suid = obj.getSUID();
+					newSuids.add(suid);
+				}
+			} else {
+				newSuids.add(oldSuid);
 			}
-			newSuids.add(suid);
 		}
 		return newSuids;
 	}

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/legend/CreationParametersPanel.java

@@ -5,6 +5,7 @@
 import java.awt.BorderLayout;
 import java.io.File;
 import java.io.StringWriter;
+import java.util.List;
 import java.util.Map;
 
 import javax.swing.JPanel;
@@ -89,10 +90,14 @@ else if (params.getSimilarityMetric() == SimilarityMetric.COMBINED)
 						ol();
 							map.getDataSetList().forEach(this::addDataSet);
 						end();
-						addTitle("Signature Data Sets");
-						ol();
-							map.getSignatureSetList().forEach(this::addSignatureDataSet);
-						end();
+						
+						List<EMSignatureDataSet> sigSets = map.getSignatureSetList();
+						if(sigSets != null && !sigSets.isEmpty()) {
+							addTitle("Signature Data Sets");
+							ol();
+								sigSets.forEach(this::addSignatureDataSet);
+							end();
+						}
 					end();
 				endAll();
 				done();