ESFBehaviours and ESFProperties meta-models update
- fix import of ESFCore
Change-Id: Iad80bb8537e1c1c7dda157f2db89f32b63f82cfa
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
index bf9abab..8634d4c 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
index 249bf51..d748434 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.notation
@@ -106,44 +106,6 @@
<element xmi:type="uml:Model" href="esfbehaviours_metamodel.uml#_IYSU4AnREeW356xdbh3U2Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_8gsJ4QnSEeW356xdbh3U2Q" x="249" y="284" width="556" height="269"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_AtwyIGLGEeWRk_KThWkycg" type="2005" fillColor="12621752">
- <children xmi:type="notation:DecorationNode" xmi:id="_AtwyImLGEeWRk_KThWkycg" type="5020"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_AtwyI2LGEeWRk_KThWkycg" type="7009">
- <children xmi:type="notation:Shape" xmi:id="_CnTtsGLGEeWRk_KThWkycg" type="3010">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EBInYGLGEeWRk_KThWkycg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EBInYWLGEeWRk_KThWkycg" key="fillColor" value="true"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_CnTtsmLGEeWRk_KThWkycg" type="5014"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_CnTts2LGEeWRk_KThWkycg" type="8518">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_CnTttGLGEeWRk_KThWkycg" y="5"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CnUUwGLGEeWRk_KThWkycg" visible="false" type="7011">
- <styles xmi:type="notation:TitleStyle" xmi:id="_CnUUwWLGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CnUUwmLGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CnUUw2LGEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnUUxGLGEeWRk_KThWkycg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CnUUxWLGEeWRk_KThWkycg" visible="false" type="7012">
- <styles xmi:type="notation:TitleStyle" xmi:id="_CnUUxmLGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CnUUx2LGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CnUUyGLGEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnUUyWLGEeWRk_KThWkycg"/>
- </children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_CnUUymLGEeWRk_KThWkycg" visible="false" type="7013">
- <styles xmi:type="notation:TitleStyle" xmi:id="_CnUUy2LGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CnUUzGLGEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CnUUzWLGEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnUUzmLGEeWRk_KThWkycg"/>
- </children>
- <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CnTtsWLGEeWRk_KThWkycg" x="62" y="13" width="202" height="62"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_AtwyJGLGEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AtwyJWLGEeWRk_KThWkycg"/>
- </children>
- <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AtwyIWLGEeWRk_KThWkycg" x="377" y="38" width="342" height="153"/>
- </children>
<children xmi:type="notation:Shape" xmi:id="_RrzZYIFLEeWKIdAlVGN13g" type="2005" fillColor="8905185">
<children xmi:type="notation:DecorationNode" xmi:id="_Rr2csIFLEeWKIdAlVGN13g" type="5020"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_Rr3DwIFLEeWKIdAlVGN13g" type="7009">
@@ -173,6 +135,44 @@
<element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrzZYYFLEeWKIdAlVGN13g" x="849" y="359" height="134"/>
</children>
+ <children xmi:type="notation:Shape" xmi:id="_Tel1kIFfEeWKIdAlVGN13g" type="2005" fillColor="12621752">
+ <children xmi:type="notation:DecorationNode" xmi:id="_TemcoIFfEeWKIdAlVGN13g" type="5020"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_TemcoYFfEeWKIdAlVGN13g" type="7009">
+ <children xmi:type="notation:Shape" xmi:id="_Y_OzoIFfEeWKIdAlVGN13g" type="3010">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gSYRIIFfEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gSY4MIFfEeWKIdAlVGN13g" key="fillColor" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasIFfEeWKIdAlVGN13g" type="5014"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Y_PasYFfEeWKIdAlVGN13g" type="8518">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Y_PasoFfEeWKIdAlVGN13g" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBwIFfEeWKIdAlVGN13g" visible="false" type="7011">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBwYFfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBwoFfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBw4FfEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBxIFfEeWKIdAlVGN13g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QBxYFfEeWKIdAlVGN13g" visible="false" type="7012">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBxoFfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBx4FfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QByIFfEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QByYFfEeWKIdAlVGN13g"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Y_QByoFfEeWKIdAlVGN13g" visible="false" type="7013">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Y_QBy4FfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Y_QBzIFfEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Y_QBzYFfEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_QBzoFfEeWKIdAlVGN13g"/>
+ </children>
+ <element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y_OzoYFfEeWKIdAlVGN13g" x="52" y="20" width="152" height="62"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_TemcooFfEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Temco4FfEeWKIdAlVGN13g"/>
+ </children>
+ <element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tel1kYFfEeWKIdAlVGN13g" x="390" y="96" width="274" height="138"/>
+ </children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_5vSZQQnSEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_5vSZQgnSEeW356xdbh3U2Q"/>
<styles xmi:type="style:PapyrusViewStyle" xmi:id="_5vSZQwnSEeW356xdbh3U2Q">
@@ -199,30 +199,7 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0I08AnTEeW356xdbh3U2Q" id="(0.51,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q0JcAAnTEeW356xdbh3U2Q" id="(0.14655172413793102,1.0)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_GzgoYGLGEeWRk_KThWkycg" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_AtwyIGLGEeWRk_KThWkycg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_GzgoY2LGEeWRk_KThWkycg" type="6026">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GzgoZGLGEeWRk_KThWkycg" y="40"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_GzgoZWLGEeWRk_KThWkycg" type="6027">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GzgoZmLGEeWRk_KThWkycg" y="60"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_GzgoYWLGEeWRk_KThWkycg"/>
- <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_GzQJsGLGEeWRk_KThWkycg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GzgoYmLGEeWRk_KThWkycg" points="[169, 26, 88, 162]$[169, -93, 88, 43]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gz6RAGLGEeWRk_KThWkycg" id="(0.08513189448441247,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Gz6RAWLGEeWRk_KThWkycg" id="(0.0,0.7189542483660131)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_JSEVgGLGEeWRk_KThWkycg" type="4002" source="_6r6ZkAnSEeW356xdbh3U2Q" target="_CnTtsGLGEeWRk_KThWkycg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_JSE8kGLGEeWRk_KThWkycg" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JSE8kWLGEeWRk_KThWkycg" y="40"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_JSEVgWLGEeWRk_KThWkycg"/>
- <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_JR4IQGLGEeWRk_KThWkycg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JSEVgmLGEeWRk_KThWkycg" points="[-19, 0, -19, 201]$[-19, -201, -19, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JSdXEGLGEeWRk_KThWkycg" id="(0.5488505747126436,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JSdXEWLGEeWRk_KThWkycg" id="(0.46534653465346537,1.0)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_YEq_8IFLEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_RrzZYIFLEeWKIdAlVGN13g">
+ <edges xmi:type="notation:Connector" xmi:id="_YEq_8IFLEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_RrzZYIFLEeWKIdAlVGN13g" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_YErnAIFLEeWKIdAlVGN13g" type="6026">
<layoutConstraint xmi:type="notation:Location" xmi:id="_YErnAYFLEeWKIdAlVGN13g" y="40"/>
</children>
@@ -235,4 +212,27 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFdqIIFLEeWKIdAlVGN13g" id="(1.0,0.48698884758364314)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YFeRMIFLEeWKIdAlVGN13g" id="(0.0,0.39552238805970147)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_U7tT0IFfEeWKIdAlVGN13g" type="4008" source="_8gsJ4AnSEeW356xdbh3U2Q" target="_Tel1kIFfEeWKIdAlVGN13g" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_U7t64IFfEeWKIdAlVGN13g" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t64YFfEeWKIdAlVGN13g" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_U7t64oFfEeWKIdAlVGN13g" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_U7t644FfEeWKIdAlVGN13g" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_U7tT0YFfEeWKIdAlVGN13g"/>
+ <element xmi:type="uml:Dependency" href="esfbehaviours_metamodel.uml#_U7iUsIFfEeWKIdAlVGN13g"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U7tT0oFfEeWKIdAlVGN13g" points="[2, -4, 0, 129]$[-17, -125, -19, 8]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsIFfEeWKIdAlVGN13g" id="(0.29676258992805754,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U8JYsYFfEeWKIdAlVGN13g" id="(0.08759124087591241,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_hbZusIFfEeWKIdAlVGN13g" type="4002" source="_6r6ZkAnSEeW356xdbh3U2Q" target="_Y_OzoIFfEeWKIdAlVGN13g" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_hbZus4FfEeWKIdAlVGN13g" type="6007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_hbaVwIFfEeWKIdAlVGN13g" y="40"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_hbZusYFfEeWKIdAlVGN13g"/>
+ <element xmi:type="uml:Generalization" href="esfbehaviours_metamodel.uml#_hbJQAIFfEeWKIdAlVGN13g"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hbZusoFfEeWKIdAlVGN13g" points="[0, -2, 0, 146]$[2, -138, 2, 10]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgIFfEeWKIdAlVGN13g" id="(0.49712643678160917,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hb1MgYFfEeWKIdAlVGN13g" id="(0.5328947368421053,1.0)"/>
+ </edges>
</notation:Diagram>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
index f1d9482..cfd3348 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfbehaviours/src/main/resources/metamodel/esfbehaviours_metamodel.uml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_IYSU4AnREeW356xdbh3U2Q" name="ESFBehaviours">
<packagedElement xmi:type="uml:Class" xmi:id="_6r3WQAnSEeW356xdbh3U2Q" name="AbstractSBehaviourObject" isAbstract="true">
- <generalization xmi:type="uml:Generalization" xmi:id="_JR4IQGLGEeWRk_KThWkycg">
+ <generalization xmi:type="uml:Generalization" xmi:id="_hbJQAIFfEeWKIdAlVGN13g">
<general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
</generalization>
</packagedElement>
@@ -14,11 +14,10 @@
<type xmi:type="uml:DataType" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_e45QgH8AEeW5YtCK2zP8qA"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Dependency" xmi:id="_GzQJsGLGEeWRk_KThWkycg" client="_IYSU4AnREeW356xdbh3U2Q">
- <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
<packagedElement xmi:type="uml:Dependency" xmi:id="_YEZ6MIFLEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">
<supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_U7iUsIFfEeWKIdAlVGN13g" client="_IYSU4AnREeW356xdbh3U2Q">
+ <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+ </packagedElement>
</uml:Model>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
index bf9abab..8634d4c 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
index c60fd21..26c329b 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.notation
@@ -161,43 +161,43 @@
<element xmi:type="uml:Model" href="esfproperties_metamodel.uml#_-NKksAnQEeW356xdbh3U2Q"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_i7xvwQnTEeW356xdbh3U2Q" x="56" y="218" width="962" height="322"/>
</children>
- <children xmi:type="notation:Shape" xmi:id="_sMJ9AGLKEeWRk_KThWkycg" type="2005" fillColor="12621752">
- <children xmi:type="notation:DecorationNode" xmi:id="_sMJ9AmLKEeWRk_KThWkycg" type="5020"/>
- <children xmi:type="notation:BasicCompartment" xmi:id="_sMJ9A2LKEeWRk_KThWkycg" type="7009">
- <children xmi:type="notation:Shape" xmi:id="_vk3lQGLKEeWRk_KThWkycg" type="3010">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xY2rYGLKEeWRk_KThWkycg" source="PapyrusCSSForceValue">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xY2rYWLKEeWRk_KThWkycg" key="fillColor" value="true"/>
+ <children xmi:type="notation:Shape" xmi:id="_PY9AcIFgEeWKIdAlVGN13g" type="2005" fillColor="12621752">
+ <children xmi:type="notation:DecorationNode" xmi:id="_PY9ngIFgEeWKIdAlVGN13g" type="5020"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_PY-OkIFgEeWKIdAlVGN13g" type="7009">
+ <children xmi:type="notation:Shape" xmi:id="_YbcUoIFgEeWKIdAlVGN13g" type="3010">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZvIxIIFgEeWKIdAlVGN13g" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZvIxIYFgEeWKIdAlVGN13g" key="fillColor" value="true"/>
</eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_vk4MUGLKEeWRk_KThWkycg" type="5014"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_vk4MUWLKEeWRk_KThWkycg" type="8518">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vk4MUmLKEeWRk_KThWkycg" y="5"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sIFgEeWKIdAlVGN13g" type="5014"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Ybc7sYFgEeWKIdAlVGN13g" type="8518">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Ybc7soFgEeWKIdAlVGN13g" y="5"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_vk4MU2LKEeWRk_KThWkycg" visible="false" type="7011">
- <styles xmi:type="notation:TitleStyle" xmi:id="_vk4MVGLKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_vk4MVWLKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_vk4MVmLKEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vk4MV2LKEeWRk_KThWkycg"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Ybc7s4FgEeWKIdAlVGN13g" visible="false" type="7011">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Ybc7tIFgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Ybc7tYFgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybc7toFgEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ybc7t4FgEeWKIdAlVGN13g"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_vk4MWGLKEeWRk_KThWkycg" visible="false" type="7012">
- <styles xmi:type="notation:TitleStyle" xmi:id="_vk4MWWLKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_vk4MWmLKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_vk4MW2LKEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vk4MXGLKEeWRk_KThWkycg"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_YbdiwIFgEeWKIdAlVGN13g" visible="false" type="7012">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_YbdiwYFgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_YbdiwoFgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Ybdiw4FgEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdixIFgEeWKIdAlVGN13g"/>
</children>
- <children xmi:type="notation:BasicCompartment" xmi:id="_vk4MXWLKEeWRk_KThWkycg" visible="false" type="7013">
- <styles xmi:type="notation:TitleStyle" xmi:id="_vk4MXmLKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_vk4MX2LKEeWRk_KThWkycg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_vk4MYGLKEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vk4MYWLKEeWRk_KThWkycg"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_YbdixYFgEeWKIdAlVGN13g" visible="false" type="7013">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_YbdixoFgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Ybdix4FgEeWKIdAlVGN13g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_YbdiyIFgEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbdiyYFgEeWKIdAlVGN13g"/>
</children>
<element xmi:type="uml:Class" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vk3lQWLKEeWRk_KThWkycg" x="106" y="14" width="153" height="69"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YbcUoYFgEeWKIdAlVGN13g" x="65" y="19" width="153" height="80"/>
</children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_sMJ9BGLKEeWRk_KThWkycg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sMJ9BWLKEeWRk_KThWkycg"/>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_PY-OkYFgEeWKIdAlVGN13g"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY-OkoFgEeWKIdAlVGN13g"/>
</children>
<element xmi:type="uml:Model" href="platform:/resource/org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sMJ9AWLKEeWRk_KThWkycg" x="351" y="15" width="365" height="161"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PY9AcYFgEeWKIdAlVGN13g" x="382" y="40" width="287" height="161"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_huVFMQnTEeW356xdbh3U2Q" name="diagram_compatibility_version" stringValue="1.1.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_huVFMgnTEeW356xdbh3U2Q"/>
@@ -255,29 +255,6 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gA29EeWIHrhJxYOO3w" id="(0.4576271186440678,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VSX4gQ29EeWIHrhJxYOO3w" id="(1.0,0.5125)"/>
</edges>
- <edges xmi:type="notation:Connector" xmi:id="_tpmycGLKEeWRk_KThWkycg" type="4008" source="_i7xvwAnTEeW356xdbh3U2Q" target="_sMJ9AGLKEeWRk_KThWkycg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_tpmyc2LKEeWRk_KThWkycg" type="6026">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tpmydGLKEeWRk_KThWkycg" y="40"/>
- </children>
- <children xmi:type="notation:DecorationNode" xmi:id="_tpmydWLKEeWRk_KThWkycg" type="6027">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tpnZgGLKEeWRk_KThWkycg" y="60"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_tpmycWLKEeWRk_KThWkycg"/>
- <element xmi:type="uml:Dependency" href="esfproperties_metamodel.uml#_tpYI8GLKEeWRk_KThWkycg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tpmycmLKEeWRk_KThWkycg" points="[154, 26, 63, 109]$[154, -42, 63, 41]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tqBpMGLKEeWRk_KThWkycg" id="(0.21205821205821207,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tqBpMWLKEeWRk_KThWkycg" id="(0.0,0.7453416149068323)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_zYaIUGLKEeWRk_KThWkycg" type="4002" source="_txmc8A28EeWIHrhJxYOO3w" target="_vk3lQGLKEeWRk_KThWkycg" routing="Rectilinear">
- <children xmi:type="notation:DecorationNode" xmi:id="_zYaIU2LKEeWRk_KThWkycg" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zYaIVGLKEeWRk_KThWkycg" y="40"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_zYaIUWLKEeWRk_KThWkycg"/>
- <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_zYJpoGLKEeWRk_KThWkycg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zYaIUmLKEeWRk_KThWkycg" points="[1, 0, 34, 120]$[1, -120, 34, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zY4pcGLKEeWRk_KThWkycg" id="(0.510556621880998,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zY4pcWLKEeWRk_KThWkycg" id="(0.22875816993464052,1.0)"/>
- </edges>
<edges xmi:type="notation:Connector" xmi:id="_sf_YUH8AEeW5YtCK2zP8qA" type="4002" source="_e5E2sH8AEeW5YtCK2zP8qA" target="_txmc8A28EeWIHrhJxYOO3w" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_sf__YH8AEeW5YtCK2zP8qA" type="6007">
<layoutConstraint xmi:type="notation:Location" xmi:id="_sf__YX8AEeW5YtCK2zP8qA" y="40"/>
@@ -288,4 +265,27 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMH8AEeW5YtCK2zP8qA" id="(0.3559322033898305,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sglOMX8AEeW5YtCK2zP8qA" id="(0.9328214971209213,1.0)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_RB7wcIFgEeWKIdAlVGN13g" type="4008" source="_i7xvwAnTEeW356xdbh3U2Q" target="_PY9AcIFgEeWKIdAlVGN13g" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_RB7wc4FgEeWKIdAlVGN13g" type="6026">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RB7wdIFgEeWKIdAlVGN13g" y="40"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_RB8XgIFgEeWKIdAlVGN13g" type="6027">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_RB8XgYFgEeWKIdAlVGN13g" y="60"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_RB7wcYFgEeWKIdAlVGN13g"/>
+ <element xmi:type="uml:Dependency" href="esfproperties_metamodel.uml#_RBhgwIFgEeWKIdAlVGN13g"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RB7wcoFgEeWKIdAlVGN13g" points="[-4, -13, 0, 116]$[-28, -135, -24, -6]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEIFgEeWKIdAlVGN13g" id="(0.37733887733887733,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RCfKEYFgEeWKIdAlVGN13g" id="(0.1289198606271777,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_daHOEIFgEeWKIdAlVGN13g" type="4002" source="_txmc8A28EeWIHrhJxYOO3w" target="_YbcUoIFgEeWKIdAlVGN13g" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_daHOE4FgEeWKIdAlVGN13g" type="6007">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_daHOFIFgEeWKIdAlVGN13g" y="40"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_daHOEYFgEeWKIdAlVGN13g"/>
+ <element xmi:type="uml:Generalization" href="esfproperties_metamodel.uml#_dZs-YIFgEeWKIdAlVGN13g"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_daHOEoFgEeWKIdAlVGN13g" points="[8, -13, 0, 127]$[-2, -123, -10, 17]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygIFgEeWKIdAlVGN13g" id="(0.46833013435700577,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daoygYFgEeWKIdAlVGN13g" id="(0.4117647058823529,1.0)"/>
+ </edges>
</notation:Diagram>
diff --git a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
index 71d297f..303f903 100644
--- a/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
+++ b/core/metamodel/org.polarsys.esf.core.metamodel.esfproperties/src/main/resources/metamodel/esfproperties_metamodel.uml
@@ -19,14 +19,14 @@
<generalization xmi:type="uml:Generalization" xmi:id="_rDEwMA53EeWvS4pMPcwguQ">
<general xmi:type="uml:Class" href="esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
</generalization>
- <generalization xmi:type="uml:Generalization" xmi:id="_zYJpoGLKEeWRk_KThWkycg">
+ <generalization xmi:type="uml:Generalization" xmi:id="_dZs-YIFgEeWKIdAlVGN13g">
<general xmi:type="uml:Class" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_gqod8NLoEeSb47LgOrWUpg"/>
</generalization>
</packagedElement>
- <packagedElement xmi:type="uml:Dependency" xmi:id="_tpYI8GLKEeWRk_KThWkycg" client="_-NKksAnQEeW356xdbh3U2Q">
- <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
- </packagedElement>
<packagedElement xmi:type="uml:DataType" xmi:id="_e45QgH8AEeW5YtCK2zP8qA" name="SProbability">
<generalization xmi:type="uml:Generalization" xmi:id="_sf0ZMH8AEeW5YtCK2zP8qA" general="_txjZoA28EeWIHrhJxYOO3w"/>
</packagedElement>
+ <packagedElement xmi:type="uml:Dependency" xmi:id="_RBhgwIFgEeWKIdAlVGN13g" client="_-NKksAnQEeW356xdbh3U2Q">
+ <supplier xmi:type="uml:Model" href="../../../../../org.polarsys.esf.core.metamodel.esfcore/src/main/resources/metamodel/esfcore_metamodel.uml#_VB4SINLoEeSb47LgOrWUpg"/>
+ </packagedElement>
</uml:Model>