Added a few null pointer checks

MyersResearchGroup · Oct 2, 2022 · f74c41a · f74c41a
1 parent 88d02ca
commit f74c41a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/...dels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/util/SBMLutilities.java b/...dels/src/main/java/edu/utah/ece/async/ibiosim/dataModels/biomodel/util/SBMLutilities.java
@@ -461,6 +461,7 @@ public static void cloneDimensions(SBase source,SBase target) {
 	}
 
 	public static void copyDimensionsToEdgeIndex(SBase source,SBase target,SBase edge,String attribute) {
+		if (source==null || target==null) return;
 		if (SBMLutilities.dimensionsMatch(source,target)) {
 			ArraysSBasePlugin sBasePlugin = SBMLutilities.getArraysSBasePlugin(source);
 			ArraysSBasePlugin sBasePluginEdge = SBMLutilities.getArraysSBasePlugin(edge);

diff --git a/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/modelEditor/schematic/BioGraph.java b/gui/src/main/java/edu/utah/ece/async/ibiosim/gui/modelEditor/schematic/BioGraph.java
@@ -209,10 +209,14 @@ private void createLayoutConnection(Layout layout,Reaction r,String reactant,Str
 //		SBMLutilities.copyIndices(getGlyph(layout,GlobalConstants.GLYPH+"__"+product), speciesReferenceGlyph, "layout:speciesGlyph");
 //		SBMLutilities.copyIndices(reactionGlyph, speciesReferenceGlyph, "layout:id");
 		LineSegment lineSegment = speciesReferenceGlyph.createCurve().createLineSegment();
-		lineSegment.setStart(new Point(this.getSpeciesOrPromoterCell(reactant).getGeometry().getCenterX(),
-				this.getSpeciesOrPromoterCell(reactant).getGeometry().getCenterY()));
-		lineSegment.setEnd(new Point(this.getSpeciesOrPromoterCell(product).getGeometry().getCenterX(),
-				this.getSpeciesOrPromoterCell(product).getGeometry().getCenterY()));
+		if (this.getSpeciesOrPromoterCell(reactant)!=null) {
+			lineSegment.setStart(new Point(this.getSpeciesOrPromoterCell(reactant).getGeometry().getCenterX(),
+					this.getSpeciesOrPromoterCell(reactant).getGeometry().getCenterY()));
+		}
+		if (this.getSpeciesOrPromoterCell(product)!=null) {
+			lineSegment.setEnd(new Point(this.getSpeciesOrPromoterCell(product).getGeometry().getCenterX(),
+					this.getSpeciesOrPromoterCell(product).getGeometry().getCenterY()));
+		}
 	}
 
 	private static void addSpeciesReferenceGlyph(Layout layout,mxCell cell,ReactionGlyph reactionGlyph,String reactionId,String speciesId, String role) {
@@ -223,8 +227,12 @@ private static void addSpeciesReferenceGlyph(Layout layout,mxCell cell,ReactionG
 //			SBMLutilities.copyIndices(getGlyph(layout,GlobalConstants.GLYPH+"__"+speciesId), speciesReferenceGlyph, "layout:speciesGlyph");
 //			SBMLutilities.copyIndices(reactionGlyph, speciesReferenceGlyph, "layout:id");
 			LineSegment lineSegment = speciesReferenceGlyph.createCurve().createLineSegment();
-			lineSegment.setStart(new Point(cell.getSource().getGeometry().getCenterX(),cell.getSource().getGeometry().getCenterY()));
-			lineSegment.setEnd(new Point(cell.getTarget().getGeometry().getCenterX(),cell.getTarget().getGeometry().getCenterY()));
+			if (cell.getSource()!=null) {
+				lineSegment.setStart(new Point(cell.getSource().getGeometry().getCenterX(),cell.getSource().getGeometry().getCenterY()));
+			}
+			if (cell.getTarget()!=null) {
+				lineSegment.setEnd(new Point(cell.getTarget().getGeometry().getCenterX(),cell.getTarget().getGeometry().getCenterY()));
+			}
 		}
 	}