Added <Proc> side effects

* Without <Proc> some functions would not work properly

gitlab #28

Change-Id: I9ba6c545c46ddab560b27e8cb6e96013905a2985

diff --git a/org.simantics.g3d/scl/G3D/Math/MathTools.scl b/org.simantics.g3d/scl/G3D/Math/MathTools.scl
index d899edcc047304705c6588f033dd1de019ca0e77..9a340d32b8f4ff8490deb6300bb9f02666fedb54 100644 (file)
--- a/org.simantics.g3d/scl/G3D/Math/MathTools.scl
+++ b/org.simantics.g3d/scl/G3D/Math/MathTools.scl
@@ -3,12 +3,12 @@ import "./Tuple3d" as T3
 importJava "org.simantics.g3d.math.MathTools" where
 
     @JavaName equals
-    equalsd :: Double -> Double -> Boolean
+    equalsd :: Double -> Double -> <Proc> Boolean
     
     @JavaName equals
-    equalst :: T3.Tuple3d -> T3.Tuple3d -> Boolean
+    equalst :: T3.Tuple3d -> T3.Tuple3d -> <Proc> Boolean
     
-    distance :: T3.Tuple3d -> T3.Tuple3d -> Double
-    distanceSquared :: T3.Tuple3d -> T3.Tuple3d -> Double
+    distance :: T3.Tuple3d -> T3.Tuple3d -> <Proc> Double
+    distanceSquared :: T3.Tuple3d -> T3.Tuple3d -> <Proc> Double
     
-    isValid :: T3.Tuple3d -> Boolean
+    isValid :: T3.Tuple3d -> <Proc> Boolean

diff --git a/org.simantics.g3d/scl/G3D/Scenegraph/G3DNode.scl b/org.simantics.g3d/scl/G3D/Scenegraph/G3DNode.scl
index 658eb9c5f4e7e7d60a3ef91ebbb2cc5ff3f1271b..6c82813038b3664f2c9d03f3c9980f2d13803348 100644 (file)
--- a/org.simantics.g3d/scl/G3D/Scenegraph/G3DNode.scl
+++ b/org.simantics.g3d/scl/G3D/Scenegraph/G3DNode.scl
@@ -9,47 +9,47 @@ importJava "org.simantics.g3d.scenegraph.IG3DNode" where
   data G3DNode
   
   @JavaName getOrientation
-  getOrientation' :: G3DNode -> Quat4d
+  getOrientation' :: G3DNode -> <Proc> Quat4d
   @JavaName getPosition
-  getPosition' :: G3DNode -> Vector3d
+  getPosition' :: G3DNode -> <Proc> Vector3d
   
   @JavaName setOrientation
-  setOrientation' :: G3DNode -> Quat4d -> ()
+  setOrientation' :: G3DNode -> Quat4d -> <Proc> ()
   @JavaName setPosition
-  setPosition' :: G3DNode -> Vector3d -> ()
+  setPosition' :: G3DNode -> Vector3d -> <Proc> ()
   
   @JavaName getWorldOrientation
-  getWorldOrientation' :: G3DNode -> Quat4d
+  getWorldOrientation' :: G3DNode -> <Proc> Quat4d
   @JavaName getWorldPosition
-  getWorldPosition' :: G3DNode -> Vector3d
+  getWorldPosition' :: G3DNode -> <Proc> Vector3d
   
   @JavaName setWorldOrientation
-  setWorldOrientation' :: G3DNode -> Quat4d -> ()
+  setWorldOrientation' :: G3DNode -> Quat4d -> <Proc> ()
   @JavaName setWorldPosition
-  setWorldPosition' :: G3DNode -> Vector3d -> ()
+  setWorldPosition' :: G3DNode -> Vector3d -> <Proc> ()
 
 class G3DNodeClass a where
   asG3DNode :: a -> G3DNode
   asG3DNode = Java.unsafeCoerce
 
-  getOrientation :: a -> Quat4d
+  getOrientation :: a -> <Proc> Quat4d
   getOrientation c = getOrientation' (asG3DNode c)
-  getPosition :: a -> Vector3d
+  getPosition :: a -> <Proc> Vector3d
   getPosition c = getPosition' (asG3DNode c)
   
-  setOrientation :: a -> Quat4d -> ()
+  setOrientation :: a -> Quat4d -> <Proc> ()
   setOrientation c = setOrientation' (asG3DNode c)
-  setPosition :: a -> Vector3d -> ()
+  setPosition :: a -> Vector3d -> <Proc> ()
   setPosition c = setPosition' (asG3DNode c)
   
-  getWorldOrientation :: a -> Quat4d
+  getWorldOrientation :: a -> <Proc> Quat4d
   getWorldOrientation c = getWorldOrientation' (asG3DNode c)
-  getWorldPosition :: a -> Vector3d
+  getWorldPosition :: a -> <Proc> Vector3d
   getWorldPosition c = getWorldPosition' (asG3DNode c)
   
-  setWorldOrientation :: a -> Quat4d -> ()
+  setWorldOrientation :: a -> Quat4d -> <Proc> ()
   setWorldOrientation c = setWorldOrientation' (asG3DNode c)
-  setWorldPosition :: a -> Vector3d -> ()
+  setWorldPosition :: a -> Vector3d -> <Proc> ()
   setWorldPosition c = setWorldPosition' (asG3DNode c)
 
 instance NodeClass G3DNode

diff --git a/org.simantics.g3d/scl/G3D/Scenegraph/Node.scl b/org.simantics.g3d/scl/G3D/Scenegraph/Node.scl
index b21bf4a2848d3073c0d428c04fefb8471baba37e..b232dde1883060eab52ae14fae5ae47c2e515209 100644 (file)
--- a/org.simantics.g3d/scl/G3D/Scenegraph/Node.scl
+++ b/org.simantics.g3d/scl/G3D/Scenegraph/Node.scl
@@ -4,36 +4,36 @@ importJava "org.simantics.g3d.scenegraph.base.ParentNode" where
   data ParentNode
   
   @JavaName addNode
-  addNode' :: ParentNode -> String -> Node -> ()
+  addNode' :: ParentNode -> String -> Node -> <Proc> ()
   @JavaName removeNode
-  removeNode' :: ParentNode -> String -> Node -> Boolean
+  removeNode' :: ParentNode -> String -> Node -> <Proc> Boolean
   @JavaName deattachNode
-  deattachNode' :: ParentNode -> String -> Node -> Boolean
+  deattachNode' :: ParentNode -> String -> Node -> <Proc> Boolean
   
   @JavaName removeNodes
-  removeNodes' :: ParentNode -> String ->()
+  removeNodes' :: ParentNode -> String -> <Proc>()
   @JavaName getNodes
-  getNodes' :: ParentNode -> String -> [Node]
+  getNodes' :: ParentNode -> String -> <Proc> [Node]
   @JavaName getNodes
-  getAllNodes' :: ParentNode -> [Node]
+  getAllNodes' :: ParentNode -> <Proc> [Node]
   @JavaName remove
-  remove' :: ParentNode -> ()
+  remove' :: ParentNode -> <Proc> ()
 
 class ParentNodeClass a where
   asParentNode :: a -> ParentNode
   asParentNode = Java.unsafeCoerce
 
-  addNode :: a -> String -> Node -> ()
+  addNode :: a -> String -> Node -> <Proc> ()
   addNode c = addNode' (asParentNode c)
-  removeNode :: a -> String -> Node -> Boolean
+  removeNode :: a -> String -> Node -> <Proc> Boolean
   removeNode c = removeNode' (asParentNode c)
-  deattachNode :: a -> String -> Node -> Boolean
+  deattachNode :: a -> String -> Node -> <Proc> Boolean
   deattachNode c = deattachNode' (asParentNode c)
-  removeNodes :: a -> String ->()
+  removeNodes :: a -> String -> <Proc> ()
   removeNodes c = removeNodes' (asParentNode c)
-  getNodes :: a -> String -> [Node]
+  getNodes :: a -> String -> <Proc> [Node]
   getNodes c = getNodes' (asParentNode c)
-  remove :: a -> ()
+  remove :: a -> <Proc> ()
   remove c = remove' (asParentNode c)
 
 instance NodeClass ParentNode
@@ -44,21 +44,21 @@ importJava "org.simantics.g3d.scenegraph.base.INode" where
   data Node
   
   @JavaName getParent
-  getParent' :: Node -> Maybe ParentNode
+  getParent' :: Node -> <Proc> Maybe ParentNode
   @JavaName getRootNode
-  getRootNode' :: Node -> Maybe ParentNode
+  getRootNode' :: Node -> <Proc> Maybe ParentNode
   @JavaName deattach
-  deattach' :: Node -> ()
+  deattach' :: Node -> <Proc> ()
 
 class NodeClass a where
   asNode :: a -> Node
   asNode = Java.unsafeCoerce
 
-  getParent :: a -> Maybe ParentNode
+  getParent :: a -> <Proc> Maybe ParentNode
   getParent c = getParent' (asNode c)
-  getRootNode :: a -> Maybe ParentNode
+  getRootNode :: a -> <Proc> Maybe ParentNode
   getRootNode c = getRootNode' (asNode c)
-  deattach :: a -> ()
+  deattach :: a -> <Proc> ()
   deattach c = deattach' (asNode c)
 
 instance NodeClass Node where

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/Equipment.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/Equipment.scl
index e528e7818f2d3a41a6ef940f3ec640064fed2e1f..91ccef3bbe991ef5e448f3c8d4fdfa0b77c6b160 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/Equipment.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/Equipment.scl
@@ -9,13 +9,13 @@ importJava "org.simantics.plant3d.scenegraph.Equipment" where
   data Equipment
   
   @JavaName getType
-  getEquipmentType :: Equipment -> String
+  getEquipmentType :: Equipment -> <Proc> String
   
-  addChild :: Equipment -> Nozzle -> ()
-  remChild :: Equipment -> Nozzle -> ()
-  getChild :: Equipment -> [Nozzle]
+  addChild :: Equipment -> Nozzle -> <Proc> ()
+  remChild :: Equipment -> Nozzle -> <Proc> ()
+  getChild :: Equipment -> <Proc> [Nozzle]
   
-  numberOfFixedNozzles :: Equipment -> Integer
+  numberOfFixedNozzles :: Equipment -> <Proc> Integer
 
 instance NodeClass Equipment
 instance ParentNodeClass Equipment

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl
index 4bbea43e51514345854303a72efa2b9e1d4da81a..f887b24b2f0796a20eb3a93ec2bdd6097591280c 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/InlineComponent.scl
@@ -3,12 +3,12 @@ include "./PipelineComponent"
 importJava "org.simantics.plant3d.scenegraph.InlineComponent" where
   data InlineComponent
   
-  isVariableLength :: InlineComponent -> Boolean
-  getRotationAngle :: InlineComponent -> Maybe Double
-  setRotationAngle :: InlineComponent -> Maybe Double -> ()
+  isVariableLength :: InlineComponent -> <Proc> Boolean
+  getRotationAngle :: InlineComponent -> <Proc> Maybe Double
+  setRotationAngle :: InlineComponent -> Maybe Double -> <Proc> ()
   
-  isReversed :: InlineComponent -> Maybe Boolean
-  setReversed :: InlineComponent -> Maybe Boolean -> ()
+  isReversed :: InlineComponent -> <Proc>Maybe Boolean
+  setReversed :: InlineComponent -> Maybe Boolean -> <Proc> ()
 
 instance NodeClass InlineComponent
 instance G3DNodeClass InlineComponent

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/Nozzle.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/Nozzle.scl
index 316df0c47d25f23f090e8c231a6c313fec0523d1..6bebedb8788cb87816754c35a32f15e3d60a0ff8 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/Nozzle.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/Nozzle.scl
@@ -3,9 +3,9 @@ include "./PipelineComponent"
 importJava "org.simantics.plant3d.scenegraph.Nozzle" where
   data Nozzle
   
-  getNozzleId :: Nozzle -> Integer
-  isFixed :: Nozzle -> Boolean
-  isConnected :: Nozzle -> Boolean
+  getNozzleId :: Nozzle -> <Proc> Integer
+  isFixed :: Nozzle -> <Proc> Boolean
+  isConnected :: Nozzle -> <Proc> Boolean
 
 instance NodeClass Nozzle
 instance G3DNodeClass Nozzle

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DNode.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DNode.scl
index 227c551ed89336e6fe723a3af13e125daa3b4267..4d01b51972735d9c8cb57430dd13ce45ec51697b 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DNode.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DNode.scl
@@ -4,17 +4,17 @@ importJava "org.simantics.plant3d.scenegraph.IP3DVisualNode" where
   data P3DNode
   
   @JavaName getName
-  getName' :: P3DNode -> Maybe String
+  getName' :: P3DNode -> <Proc> Maybe String
   @JavaName setName
-  setName' :: P3DNode -> String -> ()
+  setName' :: P3DNode -> String -> <Proc> ()
   
 class P3DNodeClass a where
   asP3DNode :: a -> P3DNode
   asP3DNode = Java.unsafeCoerce
 
-  getName :: a -> Maybe String
+  getName :: a -> <Proc> Maybe String
   getName c = getName' (asP3DNode c)
-  setName :: a -> String -> ()
+  setName :: a -> String -> <Proc> ()
   setName c = setName' (asP3DNode c)
 
 instance P3DNodeClass P3DNode where

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl
index 3b4991654730bf4c0e879df5601b3a1912ab2c20..6017c07a0bd5ee49dc04937a92b22c4bff1a92ad 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/P3DRootNode.scl
@@ -4,9 +4,9 @@ include "G3D/Scenegraph/G3DNode"
 importJava "org.simantics.plant3d.scenegraph.P3DRootNode" where
   data P3DRootNode
   
-  addChild :: P3DRootNode -> Node -> () 
-  getChild :: P3DRootNode -> [Node]
-  remChild :: P3DRootNode -> Node -> () 
+  addChild :: P3DRootNode -> Node -> <Proc> () 
+  getChild :: P3DRootNode -> <Proc> [Node]
+  remChild :: P3DRootNode -> Node -> <Proc> () 
 
 instance NodeClass P3DRootNode
 instance ParentNodeClass P3DRootNode

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
index efd86b715a7fbaed5ef88051ef4f64000cd7e44b..1883620a4cce92be04477c75b15e38bcb76f9a54 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/PipelineComponent.scl
@@ -13,14 +13,14 @@ importJava "org.simantics.plant3d.scenegraph.PipelineComponent" where
   data PipelineComponent
   
   @JavaName getPipeRun
-  getPipeRun' :: PipelineComponent -> PipeRun
+  getPipeRun' :: PipelineComponent -> <Proc> PipeRun
   @JavaName setPipeRun
-  setPipeRun' :: PipelineComponent -> PipeRun -> ()
+  setPipeRun' :: PipelineComponent -> PipeRun -> <Proc> ()
   
   @JavaName getAlternativePipeRun
-  getAlternativePipeRun' :: PipelineComponent -> Maybe PipeRun
+  getAlternativePipeRun' :: PipelineComponent -> <Proc> Maybe PipeRun
   @JavaName setAlternativePipeRun
-  setAlternativePipeRun' :: PipelineComponent -> PipeRun -> ()
+  setAlternativePipeRun' :: PipelineComponent -> PipeRun -> <Proc> ()
   
   @JavaName updateParameters
   updateParameters' :: PipelineComponent -> ()
@@ -28,72 +28,72 @@ importJava "org.simantics.plant3d.scenegraph.PipelineComponent" where
   @JavaName getNext
   getNext' :: PipelineComponent -> Maybe PipelineComponent
   @JavaName setNext
-  setNext' :: PipelineComponent -> Maybe PipelineComponent -> ()
+  setNext' :: PipelineComponent -> Maybe PipelineComponent -> <Proc> ()
   
   @JavaName getPrevious
-  getPrevious' :: PipelineComponent -> Maybe PipelineComponent
+  getPrevious' :: PipelineComponent -> <Proc> Maybe PipelineComponent
   @JavaName setPrevious
-  setPrevious' :: PipelineComponent -> Maybe PipelineComponent -> ()
+  setPrevious' :: PipelineComponent -> Maybe PipelineComponent -> <Proc> ()
   
   @JavaName getBranch0
-  getBranch0' :: PipelineComponent -> Maybe PipelineComponent
+  getBranch0' :: PipelineComponent -> <Proc> Maybe PipelineComponent
   @JavaName setBranch0
-  setBranch0' :: PipelineComponent -> Maybe PipelineComponent -> ()
+  setBranch0' :: PipelineComponent -> Maybe PipelineComponent -> <Proc> ()
   
   @JavaName getType
-  getType' :: PipelineComponent -> String
+  getType' :: PipelineComponent -> <Proc> String
   
-  //getControlPoint :: PipelineComponent -> PipeControlPoint
+  //getControlPoint :: PipelineComponent -> <Proc> PipeControlPoint
   
   @JavaName remove
-  remove' :: PipelineComponent -> ()
+  remove' :: PipelineComponent -> <Proc> ()
   
   @JavaName getFlowLength
-  getFlowLength' :: PipelineComponent -> Maybe Double
+  getFlowLength' :: PipelineComponent -> <Proc> Maybe Double
   @JavaName getEnds
-  getEnds' :: PipelineComponent -> Tuple3d -> Tuple3d -> ()
+  getEnds' :: PipelineComponent -> Tuple3d -> Tuple3d -> <Proc> ()
 
 class PipelineComponentClass a where
   asPipelineComponent :: a -> PipelineComponent
   asPipelineComponent = Java.unsafeCoerce
 
-  getPipeRun :: a -> PipeRun
+  getPipeRun :: a -> <Proc> PipeRun
   getPipeRun c = getPipeRun' (asPipelineComponent c)
-  setPipeRun :: a -> PipeRun -> ()
+  setPipeRun :: a -> PipeRun -> <Proc> ()
   setPipeRun c = setPipeRun' (asPipelineComponent c)
   
-  getAlternativePipeRun :: a -> Maybe PipeRun
+  getAlternativePipeRun :: a -> <Proc> Maybe PipeRun
   getAlternativePipeRun c = getAlternativePipeRun' (asPipelineComponent c)
-  setAlternativePipeRun :: a -> PipeRun -> ()
+  setAlternativePipeRun :: a -> PipeRun -> <Proc> ()
   setAlternativePipeRun c = setAlternativePipeRun' (asPipelineComponent c)
   
-  updateParameters :: a -> ()
+  updateParameters :: a -> <Proc> ()
   updateParameters c = updateParameters' (asPipelineComponent c)
   
-  getNext :: a -> Maybe PipelineComponent
+  getNext :: a -> <Proc> Maybe PipelineComponent
   getNext c = getNext' (asPipelineComponent c)
-  setNext :: a -> Maybe PipelineComponent -> ()
+  setNext :: a -> Maybe PipelineComponent -> <Proc> ()
   setNext c = setNext' (asPipelineComponent c)
   
-  getPrevious :: a -> Maybe PipelineComponent
+  getPrevious :: a -> <Proc> Maybe PipelineComponent
   getPrevious c = getPrevious' (asPipelineComponent c)
-  setPrevious :: a -> Maybe PipelineComponent -> ()
+  setPrevious :: a -> Maybe PipelineComponent -> <Proc> ()
   setPrevious c = setPrevious' (asPipelineComponent c)
   
-  getBranch0 :: a -> Maybe PipelineComponent
+  getBranch0 :: a -> <Proc> Maybe PipelineComponent
   getBranch0 c = getBranch0' (asPipelineComponent c)
-  setBranch0 :: a -> Maybe PipelineComponent -> ()
+  setBranch0 :: a -> Maybe PipelineComponent -> <Proc> ()
   setBranch0 c = setBranch0' (asPipelineComponent c)
   
-  getType :: a -> String
+  getType :: a -> <Proc> String
   getType c = getType' (asPipelineComponent c)
   
-  remove :: a -> ()
+  remove :: a -> <Proc> ()
   remove c = remove' (asPipelineComponent c)
   
-  getFlowLength :: a -> Maybe Double
+  getFlowLength :: a -> <Proc>Maybe Double
   getFlowLength c = getFlowLength' (asPipelineComponent c)
-  getEnds :: a -> Tuple3d -> Tuple3d -> ()
+  getEnds :: a -> Tuple3d -> Tuple3d -> <Proc> ()
   getEnds c = getEnds' (asPipelineComponent c)
 
 instance NodeClass PipelineComponent
@@ -133,25 +133,25 @@ importJava "org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint" wher
   //@JavaName getType
   //getPointType :: PipeControlPoint -> PointType
   
-  isFixed :: PipeControlPoint -> Boolean
+  isFixed :: PipeControlPoint -> <Proc> Boolean
   
-  getSubPoint :: PipeControlPoint -> [PipeControlPoint]
-  getParentPoint :: PipeControlPoint -> Maybe PipeControlPoint
+  getSubPoint :: PipeControlPoint -> <Proc> [PipeControlPoint]
+  getParentPoint :: PipeControlPoint -> <Proc> Maybe PipeControlPoint
   
 importJava "org.simantics.plant3d.scenegraph.PipeRun" where
   data PipeRun
   
-  getTurnRadius :: PipeRun -> Double
-  setTurnRadius :: PipeRun -> Double -> ()
+  getTurnRadius :: PipeRun -> <Proc> Double
+  setTurnRadius :: PipeRun -> Double -> <Proc> ()
   
-  getPipeDiameter :: PipeRun -> Double
-  setPipeDiameter :: PipeRun -> Double -> ()
+  getPipeDiameter :: PipeRun -> <Proc> Double
+  setPipeDiameter :: PipeRun -> Double -> <Proc> ()
   
-  addChild :: PipeRun -> PipelineComponent -> ()
-  getChild :: PipeRun -> [PipelineComponent]
-  remChild :: PipeRun -> PipelineComponent -> ()
+  addChild :: PipeRun -> PipelineComponent -> <Proc> ()
+  getChild :: PipeRun -> <Proc> [PipelineComponent]
+  remChild :: PipeRun -> PipelineComponent -> <Proc> ()
   
-  getSortedChild :: PipeRun -> [PipelineComponent]
+  getSortedChild :: PipeRun -> <Proc> [PipelineComponent]
 
 instance NodeClass PipeRun
 instance ParentNodeClass PipeRun

diff --git a/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl b/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl
index 3eedf63f4c6e8f84a842d164feb854bc60620206..19cc533ee3d794dcefddee3f90d71a05978e66c1 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Scenegraph/TurnComponent.scl
@@ -5,14 +5,14 @@ import "G3D/Math/Vector3d"
 importJava "org.simantics.plant3d.scenegraph.TurnComponent" where
   data TurnComponent
   
-  isVariableAngle :: TurnComponent -> Boolean
-  getTurnAngle :: TurnComponent -> Maybe Double
-  setTurnAngle :: TurnComponent -> Maybe Double -> ()
+  isVariableAngle :: TurnComponent -> <Proc> Boolean
+  getTurnAngle :: TurnComponent -> <Proc> Maybe Double
+  setTurnAngle :: TurnComponent -> Maybe Double -> <Proc> ()
   
-  getTurnAxis :: TurnComponent -> Vector3d
+  getTurnAxis :: TurnComponent -> <Proc> Vector3d
   
-  getRotationAngle :: TurnComponent -> Maybe Double
-  setRotationAngle :: TurnComponent -> Maybe Double -> ()
+  getRotationAngle :: TurnComponent -> <Proc> Maybe Double
+  setRotationAngle :: TurnComponent -> Maybe Double -> <Proc> ()
 
 instance NodeClass TurnComponent
 instance G3DNodeClass TurnComponent

diff --git a/org.simantics.plant3d/scl/Plant3d/Utils/ComponentUtils.scl b/org.simantics.plant3d/scl/Plant3d/Utils/ComponentUtils.scl
index 24b2e42c19c750654d0b9e015464eade386a71c7..e88d271a545c49124666b502df50112721ffc971 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Utils/ComponentUtils.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Utils/ComponentUtils.scl
@@ -32,7 +32,7 @@ importJava "org.simantics.plant3d.utils.ComponentUtils$InsertInstruction" where
    data InsertInstruction
    
    @JavaName "<init>"
-   createInsertInstruction :: () -> InsertInstruction
+   createInsertInstruction :: () -> <Proc> InsertInstruction
    
    setTypeUri :: InsertInstruction -> String -> <Proc> ()
    setPosition :: InsertInstruction -> PositionType -> <Proc> ()

diff --git a/org.simantics.plant3d/scl/Plant3d/Utils/Loader.scl b/org.simantics.plant3d/scl/Plant3d/Utils/Loader.scl
index a337115636815e84e0c135e6cfa46c1f6db985ba..12ff32a7e2be44360d6cab48b0cf4fe12ca43d1c 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Utils/Loader.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Utils/Loader.scl
@@ -4,6 +4,6 @@ import "./P3DScriptNodeMap"
 
 importJava "org.simantics.plant3d.scl.SCLUtil" where
   
-  loadReadOnly :: Resource -> P3DRootNode
-  load :: Resource -> P3DScriptNodeMap
+  loadReadOnly :: Resource -> <Proc> P3DRootNode
+  load :: Resource -> <Proc> P3DScriptNodeMap
   

diff --git a/org.simantics.plant3d/scl/Plant3d/Utils/P3DScriptNodeMap.scl b/org.simantics.plant3d/scl/Plant3d/Utils/P3DScriptNodeMap.scl
index 131b560f0d99bb3547af50606d66f4388e1c6e41..a2ca0835358758b594869a98faee70a124ee42d6 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Utils/P3DScriptNodeMap.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Utils/P3DScriptNodeMap.scl
@@ -7,9 +7,9 @@ importJava "org.simantics.plant3d.scl.P3DScriptNodeMap" where
    update ::  P3DScriptNodeMap -> <Proc> ()
    
    populate :: P3DScriptNodeMap -> <Proc> ()
-   getRootNode :: P3DScriptNodeMap -> ParentNode
+   getRootNode :: P3DScriptNodeMap -> <Proc> ParentNode
    
-   isChangeTracking :: P3DScriptNodeMap -> Boolean
+   isChangeTracking :: P3DScriptNodeMap -> <Proc> Boolean
    setChangeTracking :: P3DScriptNodeMap -> Boolean -> <Proc> ()
    
    

diff --git a/org.simantics.plant3d/scl/Plant3d/Utils/P3DUtil.scl b/org.simantics.plant3d/scl/Plant3d/Utils/P3DUtil.scl
index 1e73caf47790e76587d79a9718afe02e1ab89f3b..d185992dcbb7bc67a1b9b31586ee6e88f8cc9591 100644 (file)
--- a/org.simantics.plant3d/scl/Plant3d/Utils/P3DUtil.scl
+++ b/org.simantics.plant3d/scl/Plant3d/Utils/P3DUtil.scl
@@ -13,22 +13,22 @@ importJava "org.simantics.plant3d.utils.Item$Type" where
 importJava "org.simantics.plant3d.utils.Item" where
     data Item
     
-    getUri :: Item -> String
-    getName :: Item -> String
-    getType :: Item -> ItemType
+    getUri :: Item -> <Proc> String
+    getName :: Item -> <Proc> String
+    getType :: Item -> <Proc> ItemType
     
-    isCode :: Item -> Boolean
-    isVariable :: Item -> Boolean
-    isSizeChange :: Item -> Boolean
+    isCode :: Item -> <Proc> Boolean
+    isVariable :: Item -> <Proc> Boolean
+    isSizeChange :: Item -> <Proc> Boolean
 
 importJava "org.simantics.plant3d.utils.P3DUtil" where
 
-    getEquipments :: () -> [Item]
-    getNozzles :: () -> [Item]
-    getTurns :: () -> [Item]
-    getInlines :: () -> [Item]
-    getEnds :: () -> [Item]
-    filterUserComponents :: [Item] -> [Item]
+    getEquipments :: () -> <Proc> [Item]
+    getNozzles :: () -> <Proc> [Item]
+    getTurns :: () -> <Proc> [Item]
+    getInlines :: () -> <Proc> [Item]
+    getEnds :: () -> <Proc> [Item]
+    filterUserComponents :: [Item] -> <Proc> [Item]
     
     createModel :: String -> <WriteGraph> Resource