Merge branch 'feature/funcwrite'

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

diff --git a/bundles/org.simantics.modeling/scl/Simantics/DiagramMapping.scl b/bundles/org.simantics.modeling/scl/Simantics/DiagramMapping.scl
index c11fc532d9697f85a20dec90fa287361513a2442..a612aca96cc089003b0aa514e932ee32d9ade642 100644 (file)
--- a/bundles/org.simantics.modeling/scl/Simantics/DiagramMapping.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/DiagramMapping.scl
@@ -50,7 +50,7 @@ translateDiagrams (sourceModel :: Model)
                       $ sourceDiagram
   
   for targetDiagrams $ \diagram ->
-    syncActivateOnce $ toResource diagram
+    syncActivateOnce diagram
     
   doElementPostProcessing elementMap elementPostProcessing
 
@@ -74,7 +74,7 @@ translateDiagram (sourceModel :: Model)
 possibleDrawingTemplate :: Model -> Diagram -> <ReadGraph> Maybe Resource
 possibleDrawingTemplate model d = do
     d' = diagramResourceOf d
-    library = fromJust $ possibleResourceChild (toResource model) "Diagram Templates"
+    library = fromJust $ possibleResourceChild model "Diagram Templates"
     match (possibleObject d' TMPL.HasDrawingTemplate) with
         Just dt -> match (possibleNameOf dt) with
             Just name -> possibleResourceChild library name
@@ -102,7 +102,7 @@ store elementMap a b c = do
   ()
 
 getTargetComponent (targetDiagram :: Diagram) (sourceComponent :: Resource) =
-    (possibleResourceChild (toResource targetDiagram) (fromJust $ possibleNameOf sourceComponent)) :: Maybe Resource
+    (possibleResourceChild targetDiagram (fromJust $ possibleNameOf sourceComponent)) :: Maybe Resource
 
 translateDiagram2 (targetModel :: Model)  
                   (sourceDiagram :: Diagram)