Additional SCL Bindings to G3D and Plant3D classes

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

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
index 71602dcc0ff163220a36b741a78ec9c4d082111d..99b1448cb8e498decc9c8eef3f7655bd0fdea324 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/ControlPointFactory.java
@@ -11,7 +11,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.request.Read;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.PipelineComponent;
-import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.Type;
+import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.PointType;
 import org.simantics.plant3d.utils.Item;
 import org.simantics.plant3d.utils.P3DUtil;
 
@@ -74,7 +74,7 @@ public class ControlPointFactory {
        
        
        private static class Instruction {
-               Type type;
+               PointType type;
                boolean fixed;
                boolean isOffset;
                boolean isSizeChange;
@@ -95,15 +95,15 @@ public class ControlPointFactory {
                                i.isSizeChange = false;
                                i.isRotate = false;
                                i.isReverse = false;
-                               i.type = Type.INLINE;
+                               i.type = PointType.INLINE;
                                if (graph.isInheritedFrom(res, p3d.Nozzle)) {
                                        i.fixed = true;
                                        i.isOffset = false;
                                        i.isSizeChange = false;
-                                       i.type = Type.END;
+                                       i.type = PointType.END;
                                } else if (graph.isInheritedFrom(res, p3d.InlineComponent)){
                                        
-                                       i.type = Type.INLINE;
+                                       i.type = PointType.INLINE;
                                        if (graph.hasStatement(res,p3d.VariableLengthInlineComponent)) {
                                                i.fixed = false;
                                        } else if (graph.hasStatement(res,p3d.FixedLengthInlineComponent)) {
@@ -126,7 +126,7 @@ public class ControlPointFactory {
                                        }
                                        
                                } else if (graph.isInheritedFrom(res, p3d.TurnComponent)) {
-                                       i.type = Type.TURN;
+                                       i.type = PointType.TURN;
                                        if (graph.hasStatement(res,p3d.VariableAngleTurnComponent)) {
                                                i.fixed = false;
                                        } else if (graph.hasStatement(res,p3d.FixedAngleTurnComponent)) {
@@ -134,7 +134,7 @@ public class ControlPointFactory {
                                        }
                                } else if (graph.isInheritedFrom(res, p3d.EndComponent)) {
                                        i.fixed = false;
-                                       i.type = Type.END;
+                                       i.type = PointType.END;
                                } else {
                                        return null;
                                }