Variants of boards having explicit sizing mode fail when trying to add to a project

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -4190,6 +4190,10 @@
 					<changeType>BUG_FIX</changeType>
 					<description>Do not apply any user-default property values when creating a standard datasheet model (e.g. a capacitor)</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Variants of boards having explicit sizing mode fail when trying to add to a project</description>
+				</org.diylc.appframework.update.Change>				
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>

diylc/diylc-library/src/org/diylc/components/boards/AbstractBoard.java

@@ -325,9 +325,10 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
   }
 
   public void setLength(Size length) {
-    if (getMode() == BoardSizingMode.Explicit) {
+    if (getMode() == BoardSizingMode.Explicit && length != null && width != null) {
       setControlPoint(firstPoint, 0);      
-      Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(), firstPoint.getY() + width.convertToPixels());
+      Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(),
+          firstPoint.getY() + width.convertToPixels());
       setControlPoint(second, 1);    
     }
     this.length = length;    
@@ -343,7 +344,7 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
   }
 
   public void setWidth(Size width) {
-    if (getMode() == BoardSizingMode.Explicit) {
+    if (getMode() == BoardSizingMode.Explicit && length != null && width != null) {
       setControlPoint(firstPoint, 0);
       Point2D second = new Point2D.Double(firstPoint.getX() + length.convertToPixels(), firstPoint.getY() + width.convertToPixels());
       setControlPoint(second, 1);