Using SWT thread with Plant3d

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scenegraph / PipelineComponent.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
index 8fe597cad4f760a58dcf82636a594a8c88eb44ae..26a3239700657c78aa7085c14332dc1ecac7ac61 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipelineComponent.java
@@ -54,7 +54,7 @@ public abstract class PipelineComponent extends GeometryNode {
        }
        
        @RelatedGetObj(Plant3D.URIs.HasAlternativePipeRun)
-       public PipeRun getAlternaitvePipeRun() {
+       public PipeRun getAlternativePipeRun() {
                return alternativePipeRun;
        }
        
@@ -299,12 +299,13 @@ public abstract class PipelineComponent extends GeometryNode {
        @Override
        public void remove() {
                PipeControlPoint pcp = getControlPoint();
-               if (pcp != null) {
+               // Second check is needed, when remove process is initiated from control point.
+               if (pcp != null && pcp.getPipelineComponent() != null) {
                        pcp.remove();
                }
                super.remove();
        }
-       
+
        @Override
        protected double[] getColor() {
                if (getControlPoint() == null || !getControlPoint().isFixed())