X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.base.ontology%2Fgraph%2FComponents.pgraph;h=65a75d288777bc3556ef802cfa1d0219828aba9f;hb=3bcd1023180e2cdc55bc001d0f60075dd7184cfa;hp=8c03f41c5e9935fd4d47c485460040e102ffd999;hpb=8959bb33806d2252cdf09e42386afd242919630a;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 8c03f41c5..65a75d288 100644
--- a/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
+++ b/bundles/org.simantics.document.base.ontology/graph/Components.pgraph
@@ -53,6 +53,10 @@ DOC.SCLValue <T L0.SCLValue
   @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 +67,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,14 +86,14 @@ 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
     @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