X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.modeling%2Fscl%2FSimantics%2FDiagram.scl;h=6e04a6f6d6f4c6e21cbc9e94d3fae840786838ae;hb=a42562ce5347643cf8303eb4c6acef4d65c9e210;hp=2490acc5b916b52ccd6e05e8b26accfcf15abce8;hpb=d615f9ce52ccde4f0de408d6345d033faa4590e6;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Diagram.scl b/bundles/org.simantics.modeling/scl/Simantics/Diagram.scl
index 2490acc5b..6e04a6f6d 100644
--- a/bundles/org.simantics.modeling/scl/Simantics/Diagram.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Diagram.scl
@@ -140,18 +140,18 @@ hasRandomIdentifier entity = runProc (claimRelatedValue_ entity L0.identifier GU
 diagramsOf :: Model -> <ReadGraph> [Diagram]
 diagramsOf model = recurse
                    DIA.Diagram 
-                   (toResource (configurationOf model))
+                   (configurationOf model)
   where
     recurse t r = do
-        cs = resourceChildrenOf r 
-        dias = map fromResource $ filter isDiagramComposite cs
+        cs = children r 
+        dias = filter isDiagramComposite cs
         folders = filter (not . isDiagramComposite) cs
         dias + concatMap (recurse t) folders
     isDiagramComposite r = existsStatement r MOD.CompositeToDiagram
 
 """Returns a model relative path of the given diagram."""
 pathOf :: Diagram -> <ReadGraph> [String]
-pathOf diagram = map nameOf $ unfoldl aux $ toResource diagram
+pathOf diagram = map nameOf $ unfoldl aux diagram
   where
     aux r = if existsStatement r SIMU.IsConfigurationOf
             then Nothing
@@ -169,7 +169,7 @@ pathNameOf diagram = do
 
 // @Private?
 diagramResourceOf :: Diagram -> <ReadGraph> Resource
-diagramResourceOf d = singleObject (toResource d) MOD.CompositeToDiagram
+diagramResourceOf d = singleObject d MOD.CompositeToDiagram
 
 import "Extras/HashMap" as Map
 
@@ -214,11 +214,11 @@ compositeToDiagram' c = singleObject c MOD.CompositeToDiagram
 """Creates or modifies an existing diagram to contain the given diagram elements."""        
 createDiagramR :: DiagramSpec -> (Dynamic -> <WriteGraph> Resource) -> [DiagramElement Resource] -> <WriteGraph> (Diagram, [Resource])
 createDiagramR (ExistingDiagram diagram') joinMap elementSpecs = runProc do
-    configuration = toResource diagram'
+    configuration = diagram'
     diagram = compositeToDiagram' configuration
     hasName = L0.HasName
     componentMap = Map.fromList [ (c `relatedValue` hasName :: String, c)
-                                | c <- resourceChildrenOf configuration
+                                | c <- children configuration
                                 ]
     denyByPredicate diagram L0.ConsistsOf
     elements = setElements (DiagramInfo diagram configuration componentMap) joinMap elementSpecs
@@ -232,12 +232,12 @@ createDiagramR (NewDiagram model path folderType compositeType) joinMap elementS
     elements = setElements (DiagramInfo diagram configuration (Map.create ())) joinMap elementSpecs
     claimRelatedValue diagram DIA.HasModCount 
         (fromInteger (length elements) :: Long)
-    (fromResource configuration, elements)
+    (configuration, elements)
 ) where
     createConfiguration () = do
         lastId = length path - 1
         parentFolder = foldl (\p id -> getOrCreateFolder p (path!id)) 
-            (toResource (configurationOf model)) 
+            (configurationOf model)
             [0..lastId-1]        
         createComposite_ parentFolder (path!lastId) compositeType
     getOrCreateFolder parentFolder name =
@@ -250,14 +250,14 @@ claimFolder :: Model -> [String] -> Resource -> <Proc,WriteGraph> Resource
 claimFolder model path folderType = do
     lastId = length path
     foldl (\p id -> getOrCreateFolder p folderType (path!id)) 
-        (toResource (configurationOf model)) 
+        (configurationOf model) 
         [0..lastId-1]
 
 claimModelFolder :: Model -> [String] -> Resource -> <Proc,WriteGraph> Resource
 claimModelFolder model path folderType = do
     lastId = length path
     foldl (\p id -> getOrCreateFolder p folderType (path!id)) 
-        (toResource model) 
+        model
         [0..lastId-1]        
 
 getOrCreateFolder :: Resource -> Resource -> String -> <Proc,WriteGraph> Resource
@@ -554,21 +554,21 @@ setElements (DiagramInfo diagram configuration componentMap) joinMap elementSpec
 """Returns a diagram in the given model with the given model relative path.""" 
 diagram :: Model -> [String] -> <ReadGraph> Diagram
 diagram model path = 
-    fromResource $ foldl 
+    foldl 
         (\r name -> match possibleResourceChild r name with
             Just c -> c
             Nothing -> fail ("Didn't find " + name + ".") 
         ) 
-        (toResource (configurationOf model)) path
+        (configurationOf model) path
 
 possibleDiagram :: Model -> [String] -> <ReadGraph> (Maybe Diagram)
 possibleDiagram model path = 
-    map fromResource (foldl
+    foldl
         (\r name -> match r with
             Just p -> possibleResourceChild p name
             Nothing -> Nothing 
         ) 
-        (Just $ toResource (configurationOf model)) path)
+        (Just (configurationOf model)) path
 
 /*
 """FIXME: doesn't work anymore with the elementsOfR spec
@@ -757,7 +757,7 @@ importJava "org.simantics.modeling.typicals.TypicalUtil" where
     
 syncActivateDiagram :: Diagram -> <WriteGraph, Proc> Boolean
 syncActivateDiagram composite = do
-    diagram = compositeToDiagram' $ toResource composite
+    diagram = compositeToDiagram' composite
     syncActivateOnce diagram
     True
 
@@ -768,25 +768,21 @@ importJava "org.simantics.structural2.utils.StructuralUtils" where
     createComposite__ :: Configuration -> String -> Resource -> <WriteGraph> Diagram
 
 compositeToDiagram :: Resource -> <ReadGraph> Diagram
-compositeToDiagram c = fromResource (singleObject c MOD.CompositeToDiagram) 
+compositeToDiagram c = singleObject c MOD.CompositeToDiagram
 
 createComposite :: Configuration -> String -> Resource -> <WriteGraph> Diagram
 createComposite diagramFolder name compositeType = do
-     newName = findFreshName name (toResource diagramFolder)
+     newName = findFreshName name diagramFolder
      createComposite__ diagramFolder newName compositeType
 
 elementToComponent :: Element -> <ReadGraph> Component
-elementToComponent element = do
-    component = singleObject (toResource element) MOD.ElementToComponent
-    fromResource component
+elementToComponent element = singleObject element MOD.ElementToComponent
     
 componentToElement :: Component -> <ReadGraph> Element
-componentToElement component = do
-    element = singleObject (toResource component) MOD.ComponentToElement
-    fromResource element
+componentToElement component = singleObject component MOD.ComponentToElement
 
 getConnections :: Diagram -> <ReadGraph> [Resource]
-getConnections diagram = [object | object <- (toResource $ compositeToDiagram $ toResource diagram) # L0.ConsistsOf, isInstanceOf object DIA.RouteGraphConnection]
+getConnections diagram = [object | object <- (compositeToDiagram diagram) # L0.ConsistsOf, isInstanceOf object DIA.RouteGraphConnection]
 
 getConnection :: Diagram -> String -> <ReadGraph> [Resource]
 getConnection diagram name = do