X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.base.ontology%2Fgraph%2FComponents.pgraph;h=5384db0b27210f3aed2d6dc220951b3d4a78d19f;hb=dc53504d9c548324d6a827e6ea10dbe74bfe1c19;hp=bd6c97123d43eab2ac009b12cde9994903b8e99e;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.document.base.ontology/graph/Components.pgraph b/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
index bd6c97123..5384db0b2 100644
--- a/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
@@ -21,13 +21,13 @@ connectionPoint = COMPONENTS.connectionPoint : L0.Template
             >-- %relation    
 
 sclAttribute = COMPONENTS.sclAttribute : L0.Template
-    @template %subject %relation %command
+    @template %subject %relation %command %valueType
         %subject
             >-- %relation
             L0.Asserts _ : L0.Assertion
                 L0.HasPredicate %relation
                 L0.HasObject _ : DOC.SCLValue
-                  L0.HasValueType "String"
+                  L0.HasValueType %valueType
                   L0.SCLValue.expression %command
                   L0.default false
 
@@ -49,6 +49,7 @@ 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
 
@@ -59,9 +60,12 @@ COMPONENTS.Component <T STR.Component
     @attribute PROPERTIES.session FUNCTIONS.session
     @attribute PROPERTIES.state FUNCTIONS.state
     @attribute PROPERTIES.icstate FUNCTIONS.icstate
-    @sclAttribute PROPERTIES.commands "commandList self"
+    @sclAttribute PROPERTIES.commands "commandList self" "[Command]"
 
 COMPONENTS.PrimitiveComponent <T COMPONENTS.Component
+    @L0.assert PROPERTIES.primitiveProperties
+      _ : L0.Value
+        L0.domainProperties FUNCTIONS.primitiveProperties
 
 COMPONENTS.ParentlessComponent <T COMPONENTS.PrimitiveComponent /* Component without a parent, e.g. Root, DialogBox */
 
@@ -80,14 +84,14 @@ COMPONENTS.Event <T COMPONENTS.ParentlessComponent
  
 COMPONENTS.CommandEvent <T COMPONENTS.Event
    @connectionPoint RELATIONS.data1
-   @sclAttribute PROPERTIES.dataDefinitions "dataDefinitions self"   
-   @sclAttribute PROPERTIES.SCLFunction "emptyOnClick ()"
+   @sclAttribute PROPERTIES.dataDefinitions "dataDefinitions self" "[DataDefinition]"
+   @sclAttribute PROPERTIES.SCLFunction "emptyOnClick ()" "String"
 
 DOC.commandEvent : L0.Template
     @template %instance %expression %valueType
         %instance : COMPONENTS.CommandEvent
             PROPERTIES.SCLFunction _ : %valueType
-                L0.HasValueType "EventHandler"
+                L0.HasValueType "AbstractEventHandler"
                 L0.SCLValue.expression %expression
 
 COMPONENTS.DefVar <T COMPONENTS.ParentlessComponent