Removed uses of deprecated functions

[simantics/platform.git] / bundles / org.simantics.modeling / scl / Simantics / Scenegraph.scl

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl b/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
index dae67434e9d2a64a1463f384378812e8b8e73c6f..fa1d2193fde51181ade6b5dc66bd79e256ff2cc4 100644 (file)
--- a/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Scenegraph.scl
@@ -54,10 +54,10 @@ importJava "org.simantics.modeling.SCLScenegraph" where
 
 getSceneGraphProvider :: Diagram -> <Proc> ICanvasSceneGraphProvider
 getSceneGraphProvider diagram = do
-    diagramName = syncRead(\() -> getSafeName (toResource diagram))
+    diagramName = syncRead(\() -> getSafeName diagram)
     diagramRVI = "/" + diagramName
-    model = syncRead(\() -> getPossibleModel (toResource diagram))
-    composite = syncRead(\() -> compositeToDiagram' (toResource diagram))
+    model = syncRead(\() -> getPossibleModel diagram)
+    composite = syncRead(\() -> compositeToDiagram' diagram)
     getICanvasSceneGraphProvider model composite diagramRVI
 
 getDiagramContext :: ICanvasSceneGraphProvider -> ICanvasContext
@@ -66,30 +66,30 @@ getDiagramContext provider = do
     
 getNodeTransform :: Diagram -> String -> <Proc> String
 getNodeTransform diagram nodeName = do
-    diagramName = syncRead(\() -> getSafeName (toResource diagram))
+    diagramName = syncRead(\() -> getSafeName diagram)
     diagramRVI = "/" + diagramName
-    model = syncRead(\() -> getPossibleModel (toResource diagram))
-    composite = syncRead(\() -> compositeToDiagram' (toResource diagram))
+    model = syncRead(\() -> getPossibleModel diagram)
+    composite = syncRead(\() -> compositeToDiagram' diagram)
     provider = getICanvasSceneGraphProvider model composite diagramRVI
     context = getCanvasContext provider
     getTransform context nodeName
     
 getNodeText :: Diagram -> String -> <Proc> String
 getNodeText diagram nodeName = do
-    diagramName = syncRead(\() -> getSafeName (toResource diagram))
+    diagramName = syncRead(\() -> getSafeName diagram)
     diagramRVI = "/" + diagramName
-    model = syncRead(\() -> getPossibleModel (toResource diagram))
-    composite = syncRead(\() -> compositeToDiagram' (toResource diagram))
+    model = syncRead(\() -> getPossibleModel diagram)
+    composite = syncRead(\() -> compositeToDiagram' diagram)
     provider = getICanvasSceneGraphProvider model composite diagramRVI
     context = getCanvasContext provider
     getText context nodeName
 
 getNodeCount :: Diagram -> <Proc> String
 getNodeCount diagram = do
-    diagramName = syncRead(\() -> getSafeName (toResource diagram))
+    diagramName = syncRead(\() -> getSafeName diagram)
     diagramRVI = "/" + diagramName
-    model = syncRead(\() -> getPossibleModel (toResource diagram))
-    composite = syncRead(\() -> compositeToDiagram' (toResource diagram))
+    model = syncRead(\() -> getPossibleModel diagram)
+    composite = syncRead(\() -> compositeToDiagram' diagram)
     provider = getICanvasSceneGraphProvider model composite diagramRVI
     context = getCanvasContext provider 
     getCount context