Merge "Removing components left orphan piperuns in the plant"

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
index cc75aab2c81da1b1e6d48787b2344814fa969fc8..f56444e21172bf0c2378cfb74bd21b5542e669e2 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
@@ -171,6 +171,7 @@ importJava "org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint" wher
   
   isFixed :: PipeControlPoint -> <Proc> Boolean
   
+  @JavaName getChildPoints
   getSubPoint :: PipeControlPoint -> <Proc> [PipeControlPoint]
   getParentPoint :: PipeControlPoint -> <Proc> Maybe PipeControlPoint
   

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
index f853a02f06c56e04416201fb43d9b72f1bcfe838..893a07300cd2c95db095123c3794e7dbfdf53a54 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DContentOutlinePage.java
@@ -31,7 +31,7 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 
 public class P3DContentOutlinePage extends VTKContentOutlinePage<Resource, INode>{
        
-       private static final boolean DEBUG = true;
+       private static final boolean DEBUG = false;
        protected Menu contextMenu;
        
        private LocalResourceManager manager = new LocalResourceManager(JFaceResources.getResources());