Browse Source

Type Analyzer update for ValuedEventsTest

benjamin.schwertfeger@gmail.com 13 years ago
parent
commit
406cccfcde

+ 3 - 0
plugins/org.yakindu.sct.generator.genmodel/src/org/yakindu/sct/generator/genmodel/validation/SGenJavaValidator.java

@@ -251,6 +251,9 @@ public class SGenJavaValidator extends AbstractSGenJavaValidator {
 		return new Predicate<NamedElement>() {
 
 			public boolean apply(NamedElement input) {
+				if (name == null) {
+					return (input == null);
+				}
 				return name.equals(input.getName());
 			}
 		};

+ 8 - 5
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/validation/StaticTypeAnalyzer.xtend

@@ -54,6 +54,7 @@ import org.yakindu.base.types.TypesFactory
 import org.yakindu.sct.model.stext.stext.StringLiteral
 import org.eclipse.xtext.validation.AbstractValidationMessageAcceptor
 import org.eclipse.xtext.EcoreUtil2
+import org.yakindu.sct.model.stext.stext.EventDerivation
  
 /**
  * 
@@ -86,7 +87,7 @@ class StaticTypeAnalyzer implements ITypeAnalyzer {
 		var type = assignment.varRef.inferType
 		
 		if(!isAssignable(type, valueType)){
-			error("Can not assign a value of type " + valueType.name + " to a variable of type " + type.name)
+			error("Can not assign a value of type " + valueType?.name + " to a variable of type " + type?.name)
 			return null 
 		}
 		return type
@@ -99,7 +100,7 @@ class StaticTypeAnalyzer implements ITypeAnalyzer {
 		var type = eventRaising.event.inferType
 		
 		if(!isAssignable(type, valueType)){
-			error("Can not assign a value of type " + valueType.name + " to a variable of type " + type.name)
+			error("Can not assign a value of type " + valueType?.name + " to a variable of type " + type?.name)
 			return null 
 		}
 		return type
@@ -142,7 +143,7 @@ class StaticTypeAnalyzer implements ITypeAnalyzer {
 		//If both types are boolean, only relational operators Equals and not_Equals are allowed
 		if(leftType.^boolean && rightType.^boolean){
 			if(expression.operator != RelationalOperator::EQUALS && expression.operator != RelationalOperator::NOT_EQUALS){
-				error("operator '" + expression.operator.literal + "' can not be applied to boolean values!")
+				error("operator '" + expression.operator?.literal + "' can not be applied to boolean values!")
 				return null
 			}
 		} else {
@@ -206,7 +207,9 @@ class StaticTypeAnalyzer implements ITypeAnalyzer {
 			return (reference as VariableDefinition).type
 		}
 		if(reference instanceof EventDefinition){
-			if(expression.eContainer instanceof EventRaisingExpression)
+			if(expression.eContainer instanceof EventRaisingExpression
+				|| expression.eContainer instanceof EventValueReferenceExpression
+			)
 				return (reference as EventDefinition).type
 			else
 				return createBoolean
@@ -295,7 +298,7 @@ class StaticTypeAnalyzer implements ITypeAnalyzer {
 	}
 	
 	override isAssignable(Type expected, Type actual) {
-		if (expected.equals(combine(expected, actual))) {
+		if (expected?.equals(combine(expected, actual))) {
 			return true
 		}
 		if ((expected.integer || expected.real) && (actual.integer || actual.real)) {

+ 13 - 6
plugins/org.yakindu.sct.model.stext/xtend-gen/org/yakindu/sct/model/stext/validation/StaticTypeAnalyzer.java

@@ -80,10 +80,10 @@ public class StaticTypeAnalyzer implements ITypeAnalyzer {
       boolean _operator_not = BooleanExtensions.operator_not(_isAssignable);
       if (_operator_not) {
         {
-          String _name = valueType.getName();
+          String _name = valueType==null?(String)null:valueType.getName();
           String _operator_plus = StringExtensions.operator_plus("Can not assign a value of type ", _name);
           String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, " to a variable of type ");
-          String _name_1 = type.getName();
+          String _name_1 = type==null?(String)null:type.getName();
           String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _name_1);
           this.error(_operator_plus_2);
           return null;
@@ -105,10 +105,10 @@ public class StaticTypeAnalyzer implements ITypeAnalyzer {
       boolean _operator_not = BooleanExtensions.operator_not(_isAssignable);
       if (_operator_not) {
         {
-          String _name = valueType.getName();
+          String _name = valueType==null?(String)null:valueType.getName();
           String _operator_plus = StringExtensions.operator_plus("Can not assign a value of type ", _name);
           String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, " to a variable of type ");
-          String _name_1 = type.getName();
+          String _name_1 = type==null?(String)null:type.getName();
           String _operator_plus_2 = StringExtensions.operator_plus(_operator_plus_1, _name_1);
           this.error(_operator_plus_2);
           return null;
@@ -223,7 +223,7 @@ public class StaticTypeAnalyzer implements ITypeAnalyzer {
         if (_operator_and_1) {
           {
             RelationalOperator _operator_2 = expression.getOperator();
-            String _literal = _operator_2.getLiteral();
+            String _literal = _operator_2==null?(String)null:_operator_2.getLiteral();
             String _operator_plus = StringExtensions.operator_plus("operator \'", _literal);
             String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, "\' can not be applied to boolean values!");
             this.error(_operator_plus_1);
@@ -362,8 +362,15 @@ public class StaticTypeAnalyzer implements ITypeAnalyzer {
         return _type;
       }
       if ((reference instanceof org.yakindu.sct.model.stext.stext.EventDefinition)) {
+        boolean _operator_or = false;
         EObject _eContainer = expression.eContainer();
         if ((_eContainer instanceof org.yakindu.sct.model.stext.stext.EventRaisingExpression)) {
+          _operator_or = true;
+        } else {
+          EObject _eContainer_1 = expression.eContainer();
+          _operator_or = BooleanExtensions.operator_or((_eContainer instanceof org.yakindu.sct.model.stext.stext.EventRaisingExpression), (_eContainer_1 instanceof org.yakindu.sct.model.stext.stext.EventValueReferenceExpression));
+        }
+        if (_operator_or) {
           Type _type_1 = ((EventDefinition) reference).getType();
           return _type_1;
         } else {
@@ -551,7 +558,7 @@ public class StaticTypeAnalyzer implements ITypeAnalyzer {
   public boolean isAssignable(final Type expected, final Type actual) {
     {
       Type _combine = this.combine(expected, actual);
-      boolean _equals = expected.equals(_combine);
+      boolean _equals = expected==null?false:expected.equals(_combine);
       if (_equals) {
         return true;
       }

+ 45 - 34
test-plugins/org.yakindu.sct.model.sexec.interpreter.test/.project

@@ -1,34 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.yakindu.sct.model.sexec.interpreter.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.yakindu.sct.model.sexec.interpreter.test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1333365538899</id>
+			<name>target</name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-work</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

+ 0 - 1
test-plugins/org.yakindu.sct.model.sexec.interpreter.test/src/org/yakindu/sct/model/sexec/interpreter/test/ExecutionFlowInterpreterTest.java

@@ -97,7 +97,6 @@ public class ExecutionFlowInterpreterTest extends AbstractExecutionFlowTest {
 	}
 
 	@Test
-	@Ignore("Error in execution flow transformation")
 	public void testValuedEvents() throws IOException {
 		loadAndconfigureInterpreter(models.createValuedEventsModel());
 		assertIsActive("A");

+ 157 - 157
test-plugins/org.yakindu.sct.model.sexec.interpreter.test/testmodels/ValuedEvents.sct

@@ -1,157 +1,157 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_mYUJQHjXEeGKl8JlHfi_Yg" specification="interface:&#xD;&#xA;in event event1&#xD;&#xA;interface:&#xD;&#xA;in event event2" name="ValuedEvents">
-    <regions xmi:id="_mYUwUnjXEeGKl8JlHfi_Yg" name="main region">
-      <vertices xsi:type="sgraph:Entry" xmi:id="_mYXMkXjXEeGKl8JlHfi_Yg">
-        <outgoingTransitions xmi:id="_mYcsIXjXEeGKl8JlHfi_Yg" target="_mYZo0XjXEeGKl8JlHfi_Yg"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_mYZo0XjXEeGKl8JlHfi_Yg" specification="" name="A" incomingTransitions="_mYcsIXjXEeGKl8JlHfi_Yg"/>
-    </regions>
-    <regions xmi:id="_4BMZkHjZEeGKl8JlHfi_Yg">
-      <vertices xsi:type="sgraph:Entry" xmi:id="_4h2PkHjZEeGKl8JlHfi_Yg">
-        <outgoingTransitions xmi:id="_6753MHjZEeGKl8JlHfi_Yg" specification="" target="_48UlEHjZEeGKl8JlHfi_Yg"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_48UlEHjZEeGKl8JlHfi_Yg" name="B" incomingTransitions="_6753MHjZEeGKl8JlHfi_Yg">
-        <outgoingTransitions xmi:id="_-hBjwHjZEeGKl8JlHfi_Yg" specification="IntegerEvent / myVar = valueof(IntegerEvent)" target="_9hO6sHjZEeGKl8JlHfi_Yg"/>
-      </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_9hO6sHjZEeGKl8JlHfi_Yg" name="C" incomingTransitions="_-hBjwHjZEeGKl8JlHfi_Yg"/>
-    </regions>
-  </sgraph:Statechart>
-  <notation:Diagram xmi:id="_mYUwUHjXEeGKl8JlHfi_Yg" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_mYUJQHjXEeGKl8JlHfi_Yg" measurementUnit="Pixel">
-    <children xmi:id="_mYVXYHjXEeGKl8JlHfi_Yg" type="Region" element="_mYUwUnjXEeGKl8JlHfi_Yg">
-      <children xsi:type="notation:DecorationNode" xmi:id="_mYV-cHjXEeGKl8JlHfi_Yg" type="RegionName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYV-cXjXEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYV-cnjXEeGKl8JlHfi_Yg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_mYWlgHjXEeGKl8JlHfi_Yg" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
-        <children xmi:id="_mYXMknjXEeGKl8JlHfi_Yg" type="Entry" element="_mYXMkXjXEeGKl8JlHfi_Yg">
-          <children xmi:id="_mYYasHjXEeGKl8JlHfi_Yg" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_mYZBwHjXEeGKl8JlHfi_Yg" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_mYZBwXjXEeGKl8JlHfi_Yg"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_mYZBwnjXEeGKl8JlHfi_Yg"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_mYYasXjXEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYYasnjXEeGKl8JlHfi_Yg"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_mYXMk3jXEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYZo0HjXEeGKl8JlHfi_Yg" x="70" y="20"/>
-        </children>
-        <children xmi:id="_mYaP4HjXEeGKl8JlHfi_Yg" type="State" element="_mYZo0XjXEeGKl8JlHfi_Yg">
-          <children xsi:type="notation:DecorationNode" xmi:id="_mYa28HjXEeGKl8JlHfi_Yg" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_mYa28XjXEeGKl8JlHfi_Yg"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_mYa28njXEeGKl8JlHfi_Yg"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_mYbeAHjXEeGKl8JlHfi_Yg" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_mYbeAXjXEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYbeAnjXEeGKl8JlHfi_Yg"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_mYcFEHjXEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_mYaP4XjXEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_mYaP4njXEeGKl8JlHfi_Yg"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_mYcFEXjXEeGKl8JlHfi_Yg"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYcsIHjXEeGKl8JlHfi_Yg" x="9" y="79" width="176" height="76"/>
-        </children>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYWlgXjXEeGKl8JlHfi_Yg"/>
-      </children>
-      <styles xsi:type="notation:ShapeStyle" xmi:id="_mYVXYXjXEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYXMkHjXEeGKl8JlHfi_Yg" x="265" y="10" width="211" height="206"/>
-    </children>
-    <children xsi:type="notation:Shape" xmi:id="_mYehUHjXEeGKl8JlHfi_Yg" type="StatechartText" fontName="Verdana" lineColor="4210752">
-      <children xsi:type="notation:DecorationNode" xmi:id="_mYfIYHjXEeGKl8JlHfi_Yg" type="StatechartName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYfIYXjXEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYfIYnjXEeGKl8JlHfi_Yg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_mYfvcHjXEeGKl8JlHfi_Yg" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYfvcXjXEeGKl8JlHfi_Yg"/>
-      </children>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYgWgHjXEeGKl8JlHfi_Yg" x="20" y="40" width="236" height="91"/>
-    </children>
-    <children xmi:id="_4BWxoHjZEeGKl8JlHfi_Yg" type="Region" element="_4BMZkHjZEeGKl8JlHfi_Yg">
-      <children xsi:type="notation:DecorationNode" xmi:id="_4BX_wHjZEeGKl8JlHfi_Yg" type="RegionName">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_4BX_wXjZEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_4BX_wnjZEeGKl8JlHfi_Yg"/>
-      </children>
-      <children xsi:type="notation:Shape" xmi:id="_4BYm0HjZEeGKl8JlHfi_Yg" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
-        <children xmi:id="_4iGHMHjZEeGKl8JlHfi_Yg" type="Entry" element="_4h2PkHjZEeGKl8JlHfi_Yg">
-          <children xmi:id="_4iHVUHjZEeGKl8JlHfi_Yg" type="BorderItemLabelContainer">
-            <children xsi:type="notation:DecorationNode" xmi:id="_4iH8YHjZEeGKl8JlHfi_Yg" type="BorderItemLabel">
-              <styles xsi:type="notation:ShapeStyle" xmi:id="_4iH8YXjZEeGKl8JlHfi_Yg"/>
-              <layoutConstraint xsi:type="notation:Location" xmi:id="_4iIjcHjZEeGKl8JlHfi_Yg"/>
-            </children>
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_4iHVUXjZEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
-            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4iHVUnjZEeGKl8JlHfi_Yg"/>
-          </children>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_4iGHMXjZEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4iGHMnjZEeGKl8JlHfi_Yg" x="93" y="14"/>
-        </children>
-        <children xmi:id="_48tmoHjZEeGKl8JlHfi_Yg" type="State" element="_48UlEHjZEeGKl8JlHfi_Yg">
-          <children xsi:type="notation:DecorationNode" xmi:id="_48wC4HjZEeGKl8JlHfi_Yg" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_48wC4XjZEeGKl8JlHfi_Yg"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_48wp8HjZEeGKl8JlHfi_Yg"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_48wp8XjZEeGKl8JlHfi_Yg" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_48xRAHjZEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_48xRAXjZEeGKl8JlHfi_Yg"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_48x4EHjZEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_48tmoXjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_48tmonjZEeGKl8JlHfi_Yg"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_48yfIHjZEeGKl8JlHfi_Yg"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_48tmo3jZEeGKl8JlHfi_Yg" x="107" y="74" width="111" height="66"/>
-        </children>
-        <children xmi:id="_9hmHEHjZEeGKl8JlHfi_Yg" type="State" element="_9hO6sHjZEeGKl8JlHfi_Yg">
-          <children xsi:type="notation:DecorationNode" xmi:id="_9hn8QHjZEeGKl8JlHfi_Yg" type="StateName">
-            <styles xsi:type="notation:ShapeStyle" xmi:id="_9hn8QXjZEeGKl8JlHfi_Yg"/>
-            <layoutConstraint xsi:type="notation:Location" xmi:id="_9hn8QnjZEeGKl8JlHfi_Yg"/>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_9hn8Q3jZEeGKl8JlHfi_Yg" type="StateTextCompartment">
-            <children xsi:type="notation:Shape" xmi:id="_9hojUHjZEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
-              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9hojUXjZEeGKl8JlHfi_Yg"/>
-            </children>
-          </children>
-          <children xsi:type="notation:Compartment" xmi:id="_9hpKYHjZEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
-          <styles xsi:type="notation:ShapeStyle" xmi:id="_9hmuIHjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
-          <styles xsi:type="notation:FontStyle" xmi:id="_9hmuIXjZEeGKl8JlHfi_Yg"/>
-          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9hpxcHjZEeGKl8JlHfi_Yg"/>
-          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9hmuInjZEeGKl8JlHfi_Yg" x="114" y="209" width="96" height="61"/>
-        </children>
-        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4BYm0XjZEeGKl8JlHfi_Yg"/>
-      </children>
-      <styles xsi:type="notation:ShapeStyle" xmi:id="_4BWxoXjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4BWxonjZEeGKl8JlHfi_Yg" x="485" y="10" width="321" height="331"/>
-    </children>
-    <styles xsi:type="notation:DiagramStyle" xmi:id="_mYUwUXjXEeGKl8JlHfi_Yg"/>
-    <edges xmi:id="_mYdTMHjXEeGKl8JlHfi_Yg" type="Transition" element="_mYcsIXjXEeGKl8JlHfi_Yg" source="_mYXMknjXEeGKl8JlHfi_Yg" target="_mYaP4HjXEeGKl8JlHfi_Yg">
-      <children xsi:type="notation:DecorationNode" xmi:id="_mYd6QXjXEeGKl8JlHfi_Yg" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYd6QnjXEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYd6Q3jXEeGKl8JlHfi_Yg" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_mYdTMXjXEeGKl8JlHfi_Yg" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_mYd6QHjXEeGKl8JlHfi_Yg" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_mYdTMnjXEeGKl8JlHfi_Yg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    </edges>
-    <edges xmi:id="_68GrgHjZEeGKl8JlHfi_Yg" type="Transition" element="_6753MHjZEeGKl8JlHfi_Yg" source="_4iGHMHjZEeGKl8JlHfi_Yg" target="_48tmoHjZEeGKl8JlHfi_Yg">
-      <children xsi:type="notation:DecorationNode" xmi:id="_68H5oHjZEeGKl8JlHfi_Yg" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_68H5oXjZEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_68H5onjZEeGKl8JlHfi_Yg" y="10"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_68GrgXjZEeGKl8JlHfi_Yg" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_68HSkHjZEeGKl8JlHfi_Yg" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_68GrgnjZEeGKl8JlHfi_Yg" points="[0, 8, 5, -44]$[0, 27, 5, -25]"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8mAokHjZEeGKl8JlHfi_Yg" id="(0.36036036036036034,0.07575757575757576)"/>
-    </edges>
-    <edges xmi:id="_-hO_IHjZEeGKl8JlHfi_Yg" type="Transition" element="_-hBjwHjZEeGKl8JlHfi_Yg" source="_48tmoHjZEeGKl8JlHfi_Yg" target="_9hmHEHjZEeGKl8JlHfi_Yg">
-      <children xsi:type="notation:DecorationNode" xmi:id="_-hQNQHjZEeGKl8JlHfi_Yg" type="TransitionExpression">
-        <styles xsi:type="notation:ShapeStyle" xmi:id="_-hQNQXjZEeGKl8JlHfi_Yg"/>
-        <layoutConstraint xsi:type="notation:Location" xmi:id="_-hQNQnjZEeGKl8JlHfi_Yg" x="2" y="-4"/>
-      </children>
-      <styles xsi:type="notation:ConnectorStyle" xmi:id="_-hO_IXjZEeGKl8JlHfi_Yg" lineColor="4210752"/>
-      <styles xsi:type="notation:FontStyle" xmi:id="_-hPmMHjZEeGKl8JlHfi_Yg" fontName="Verdana"/>
-      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_-hO_InjZEeGKl8JlHfi_Yg" points="[26, 3, -70, 2]$[97, -15, 1, -16]"/>
-      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-hrrEHjZEeGKl8JlHfi_Yg" id="(0.7567567567567568,0.30303030303030304)"/>
-      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-hrrEXjZEeGKl8JlHfi_Yg" id="(0.17708333333333334,0.29508196721311475)"/>
-    </edges>
-  </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
+  <sgraph:Statechart xmi:id="_mYUJQHjXEeGKl8JlHfi_Yg" specification="interface:&#xD;&#xA;in event IntegerEvent : integer&#xD;&#xA;var myVar : integer" name="ValuedEvents">
+    <regions xmi:id="_mYUwUnjXEeGKl8JlHfi_Yg" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_mYXMkXjXEeGKl8JlHfi_Yg">
+        <outgoingTransitions xmi:id="_mYcsIXjXEeGKl8JlHfi_Yg" target="_mYZo0XjXEeGKl8JlHfi_Yg"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_mYZo0XjXEeGKl8JlHfi_Yg" specification="entry / raise IntegerEvent : 2*21" name="A" incomingTransitions="_mYcsIXjXEeGKl8JlHfi_Yg"/>
+    </regions>
+    <regions xmi:id="_4BMZkHjZEeGKl8JlHfi_Yg">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_4h2PkHjZEeGKl8JlHfi_Yg">
+        <outgoingTransitions xmi:id="_6753MHjZEeGKl8JlHfi_Yg" specification="" target="_48UlEHjZEeGKl8JlHfi_Yg"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_48UlEHjZEeGKl8JlHfi_Yg" name="B" incomingTransitions="_6753MHjZEeGKl8JlHfi_Yg">
+        <outgoingTransitions xmi:id="_-hBjwHjZEeGKl8JlHfi_Yg" specification="IntegerEvent / myVar = valueof(IntegerEvent)" target="_9hO6sHjZEeGKl8JlHfi_Yg"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_9hO6sHjZEeGKl8JlHfi_Yg" name="C" incomingTransitions="_-hBjwHjZEeGKl8JlHfi_Yg"/>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_mYUwUHjXEeGKl8JlHfi_Yg" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_mYUJQHjXEeGKl8JlHfi_Yg" measurementUnit="Pixel">
+    <children xmi:id="_mYVXYHjXEeGKl8JlHfi_Yg" type="Region" element="_mYUwUnjXEeGKl8JlHfi_Yg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mYV-cHjXEeGKl8JlHfi_Yg" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYV-cXjXEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYV-cnjXEeGKl8JlHfi_Yg"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_mYWlgHjXEeGKl8JlHfi_Yg" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_mYXMknjXEeGKl8JlHfi_Yg" type="Entry" element="_mYXMkXjXEeGKl8JlHfi_Yg">
+          <children xmi:id="_mYYasHjXEeGKl8JlHfi_Yg" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_mYZBwHjXEeGKl8JlHfi_Yg" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_mYZBwXjXEeGKl8JlHfi_Yg"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_mYZBwnjXEeGKl8JlHfi_Yg"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_mYYasXjXEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYYasnjXEeGKl8JlHfi_Yg"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_mYXMk3jXEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYZo0HjXEeGKl8JlHfi_Yg" x="70" y="20"/>
+        </children>
+        <children xmi:id="_mYaP4HjXEeGKl8JlHfi_Yg" type="State" element="_mYZo0XjXEeGKl8JlHfi_Yg">
+          <children xsi:type="notation:DecorationNode" xmi:id="_mYa28HjXEeGKl8JlHfi_Yg" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_mYa28XjXEeGKl8JlHfi_Yg"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_mYa28njXEeGKl8JlHfi_Yg"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_mYbeAHjXEeGKl8JlHfi_Yg" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_mYbeAXjXEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYbeAnjXEeGKl8JlHfi_Yg"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_mYcFEHjXEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_mYaP4XjXEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_mYaP4njXEeGKl8JlHfi_Yg"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_mYcFEXjXEeGKl8JlHfi_Yg"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYcsIHjXEeGKl8JlHfi_Yg" x="9" y="79" width="176" height="76"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYWlgXjXEeGKl8JlHfi_Yg"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_mYVXYXjXEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYXMkHjXEeGKl8JlHfi_Yg" x="265" y="10" width="211" height="206"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_mYehUHjXEeGKl8JlHfi_Yg" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mYfIYHjXEeGKl8JlHfi_Yg" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYfIYXjXEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYfIYnjXEeGKl8JlHfi_Yg"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_mYfvcHjXEeGKl8JlHfi_Yg" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYfvcXjXEeGKl8JlHfi_Yg"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_mYgWgHjXEeGKl8JlHfi_Yg" x="20" y="40" width="236" height="91"/>
+    </children>
+    <children xmi:id="_4BWxoHjZEeGKl8JlHfi_Yg" type="Region" element="_4BMZkHjZEeGKl8JlHfi_Yg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4BX_wHjZEeGKl8JlHfi_Yg" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_4BX_wXjZEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4BX_wnjZEeGKl8JlHfi_Yg"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_4BYm0HjZEeGKl8JlHfi_Yg" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_4iGHMHjZEeGKl8JlHfi_Yg" type="Entry" element="_4h2PkHjZEeGKl8JlHfi_Yg">
+          <children xmi:id="_4iHVUHjZEeGKl8JlHfi_Yg" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_4iH8YHjZEeGKl8JlHfi_Yg" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_4iH8YXjZEeGKl8JlHfi_Yg"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_4iIjcHjZEeGKl8JlHfi_Yg"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_4iHVUXjZEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4iHVUnjZEeGKl8JlHfi_Yg"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_4iGHMXjZEeGKl8JlHfi_Yg" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4iGHMnjZEeGKl8JlHfi_Yg" x="93" y="14"/>
+        </children>
+        <children xmi:id="_48tmoHjZEeGKl8JlHfi_Yg" type="State" element="_48UlEHjZEeGKl8JlHfi_Yg">
+          <children xsi:type="notation:DecorationNode" xmi:id="_48wC4HjZEeGKl8JlHfi_Yg" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_48wC4XjZEeGKl8JlHfi_Yg"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_48wp8HjZEeGKl8JlHfi_Yg"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_48wp8XjZEeGKl8JlHfi_Yg" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_48xRAHjZEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_48xRAXjZEeGKl8JlHfi_Yg"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_48x4EHjZEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_48tmoXjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_48tmonjZEeGKl8JlHfi_Yg"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_48yfIHjZEeGKl8JlHfi_Yg"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_48tmo3jZEeGKl8JlHfi_Yg" x="107" y="74" width="111" height="66"/>
+        </children>
+        <children xmi:id="_9hmHEHjZEeGKl8JlHfi_Yg" type="State" element="_9hO6sHjZEeGKl8JlHfi_Yg">
+          <children xsi:type="notation:DecorationNode" xmi:id="_9hn8QHjZEeGKl8JlHfi_Yg" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_9hn8QXjZEeGKl8JlHfi_Yg"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_9hn8QnjZEeGKl8JlHfi_Yg"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_9hn8Q3jZEeGKl8JlHfi_Yg" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_9hojUHjZEeGKl8JlHfi_Yg" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9hojUXjZEeGKl8JlHfi_Yg"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_9hpKYHjZEeGKl8JlHfi_Yg" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_9hmuIHjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_9hmuIXjZEeGKl8JlHfi_Yg"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9hpxcHjZEeGKl8JlHfi_Yg"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9hmuInjZEeGKl8JlHfi_Yg" x="114" y="209" width="96" height="61"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4BYm0XjZEeGKl8JlHfi_Yg"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_4BWxoXjZEeGKl8JlHfi_Yg" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4BWxonjZEeGKl8JlHfi_Yg" x="485" y="10" width="321" height="331"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_mYUwUXjXEeGKl8JlHfi_Yg"/>
+    <edges xmi:id="_mYdTMHjXEeGKl8JlHfi_Yg" type="Transition" element="_mYcsIXjXEeGKl8JlHfi_Yg" source="_mYXMknjXEeGKl8JlHfi_Yg" target="_mYaP4HjXEeGKl8JlHfi_Yg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mYd6QXjXEeGKl8JlHfi_Yg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_mYd6QnjXEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mYd6Q3jXEeGKl8JlHfi_Yg" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_mYdTMXjXEeGKl8JlHfi_Yg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_mYd6QHjXEeGKl8JlHfi_Yg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_mYdTMnjXEeGKl8JlHfi_Yg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_68GrgHjZEeGKl8JlHfi_Yg" type="Transition" element="_6753MHjZEeGKl8JlHfi_Yg" source="_4iGHMHjZEeGKl8JlHfi_Yg" target="_48tmoHjZEeGKl8JlHfi_Yg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_68H5oHjZEeGKl8JlHfi_Yg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_68H5oXjZEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_68H5onjZEeGKl8JlHfi_Yg" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_68GrgXjZEeGKl8JlHfi_Yg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_68HSkHjZEeGKl8JlHfi_Yg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_68GrgnjZEeGKl8JlHfi_Yg" points="[0, 8, 5, -44]$[0, 27, 5, -25]"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_8mAokHjZEeGKl8JlHfi_Yg" id="(0.36036036036036034,0.07575757575757576)"/>
+    </edges>
+    <edges xmi:id="_-hO_IHjZEeGKl8JlHfi_Yg" type="Transition" element="_-hBjwHjZEeGKl8JlHfi_Yg" source="_48tmoHjZEeGKl8JlHfi_Yg" target="_9hmHEHjZEeGKl8JlHfi_Yg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_-hQNQHjZEeGKl8JlHfi_Yg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_-hQNQXjZEeGKl8JlHfi_Yg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_-hQNQnjZEeGKl8JlHfi_Yg" x="2" y="-4"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_-hO_IXjZEeGKl8JlHfi_Yg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_-hPmMHjZEeGKl8JlHfi_Yg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_-hO_InjZEeGKl8JlHfi_Yg" points="[26, 3, -70, 2]$[97, -15, 1, -16]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-hrrEHjZEeGKl8JlHfi_Yg" id="(0.7567567567567568,0.30303030303030304)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_-hrrEXjZEeGKl8JlHfi_Yg" id="(0.17708333333333334,0.29508196721311475)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>