foobaz

[simantics/platform.git] / bundles / org.simantics.document.base.ontology / graph / Components.pgraph

diff --git a/bundles/org.simantics.document.base.ontology/graph/Components.pgraph b/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
index 5384db0b27210f3aed2d6dc220951b3d4a78d19f..d3372b12c0bf1b3b82f117e32915bad50d1e93fb 100644 (file)
--- a/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
@@ -31,9 +31,9 @@ sclAttribute = COMPONENTS.sclAttribute : L0.Template
                   L0.SCLValue.expression %command
                   L0.default false
 
-DOC.SCL : L0.SCLModule
-    L0.SCLModule.definition _ : L0.String
-        @L0.loadString "scl/Code.scl"
+//DOC.SCL : L0.SCLModule
+//    L0.SCLModule.definition _ : L0.String
+//        @L0.loadString "scl/Code.scl"
 
 DOC.scl : L0.Template
     @template %subject %property %expression %valueType
@@ -49,10 +49,13 @@ DOC.sclValue : L0.Template
             L0.HasValueType %valueType
 
 DOC.SCLValue <T L0.SCLValue
-  @L0.scl L0.SCLValueType.validator """\self -> compileDocumentSCLValueExpression self""" "Variable -> <ReadGraph> String"
   @L0.assert L0.ConvertsToValueWith
     DOC.Functions.sclValue : L0.ExternalValue
 
+DOC.HandlerSCLValue <T L0.SCLValue
+  @L0.assert L0.ConvertsToValueWith
+    DOC.Functions.sclHandlerValue : L0.ExternalValue
+
 /* Basic component types */
 COMPONENTS.Component <T STR.Component
     >-- COMPONENTS.Component.manualOrdinal --> L0.Integer <R L0.HasProperty
@@ -63,9 +66,7 @@ COMPONENTS.Component <T STR.Component
     @sclAttribute PROPERTIES.commands "commandList self" "[Command]"
 
 COMPONENTS.PrimitiveComponent <T COMPONENTS.Component
-    @L0.assert PROPERTIES.primitiveProperties
-      _ : L0.Value
-        L0.domainProperties FUNCTIONS.primitiveProperties
+    @L0.sclAssertion PROPERTIES.primitiveProperties "primitiveProperties" "DocumentProperties"
 
 COMPONENTS.ParentlessComponent <T COMPONENTS.PrimitiveComponent /* Component without a parent, e.g. Root, DialogBox */
 
@@ -84,7 +85,7 @@ COMPONENTS.Event <T COMPONENTS.ParentlessComponent
  
 COMPONENTS.CommandEvent <T COMPONENTS.Event
    @connectionPoint RELATIONS.data1
-   @sclAttribute PROPERTIES.dataDefinitions "dataDefinitions self" "[DataDefinition]"
+   @sclAttribute PROPERTIES.dataDefinitions "computeDataDefinitions self" "[DataDefinition]"
    @sclAttribute PROPERTIES.SCLFunction "emptyOnClick ()" "String"
 
 DOC.commandEvent : L0.Template