X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;h=8e3e6bbdc1c926d28270e3900f7d8648a7f01cf3;hb=11cf079ab699e65f6c97b86745a3c8cbd65817b8;hp=ac76be8b25f373f1e133cb1c2860b52433343548;hpb=1684fc4fa438d199c6ce78f32368cfe51e6f9262;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index ac76be8b..8e3e6bbd 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -26,13 +26,13 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
     
     private static boolean DEBUG = false;
 	
-	public enum Type{INLINE,TURN,END};
+	public enum PointType{INLINE,TURN,END};
 	public enum Direction{NEXT,PREVIOUS};
 	public enum PositionType {SPLIT,NEXT,PREVIOUS,PORT}
 	
 	private PipelineComponent component;
 	
-	private Type type;
+	private PointType type;
 	private boolean fixed = true;
 	private boolean rotate = false;
 	private boolean reverse = false;
@@ -69,11 +69,11 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		return component;
 	}
 	
-	public Type getType() {
+	public PointType getType() {
 		return type;
 	}
 	
-	public void setType(Type type) {
+	public void setType(PointType type) {
 		this.type = type;
 	}
 	
@@ -119,19 +119,19 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public boolean isPathLegEnd() {
-		return type != Type.INLINE;
+		return type != PointType.INLINE;
 	}
 	
 	public boolean isEnd() {
-		return type == Type.END;
+		return type == PointType.END;
 	}
 	
 	public boolean isTurn() {
-		return type == Type.TURN;
+		return type == PointType.TURN;
 	}
 	
 	public boolean isInline() {
-		return type == Type.INLINE;
+		return type == PointType.INLINE;
 	}
 	
 	public boolean isDirected() {
@@ -289,7 +289,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
     }
 	
 	public void setTurnAngle(Double turnAngle) {
-		if (Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
+		if (turnAngle == null || Double.isInfinite(turnAngle) || Double.isNaN(turnAngle)) {
 			return;
 		}
 		if (this.turnAngle != null && Math.abs(this.turnAngle-turnAngle) < MathTools.NEAR_ZERO)
@@ -796,9 +796,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public double getInlineLength() {
-		if (type == Type.TURN)
+		if (type == PointType.TURN)
 			return length;
-		else if (type == Type.INLINE)
+		else if (type == PointType.INLINE)
 			return length * 0.5;
 		return 0;
 	}