← Back to team overview

mlhim-owners team mailing list archive

[Branch ~mlhim-specs-dev/mlhim-specs/mlhim-emf] Rev 21: Combined QDT and NQDT into Datatypes package.

 

------------------------------------------------------------
revno: 21
committer: Tim Cook <timothywayne.cook@xxxxxxxxx>
branch nick: mlhim-emf
timestamp: Thu 2011-03-03 17:14:37 -0300
message:
  Combined QDT and NQDT into Datatypes package.
modified:
  org.mlhim.rm/model/mlhim2.ecore
  org.mlhim.rm/model/mlhim2.ecorediag


--
lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf
https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf

Your team Multi-level Healthcare Information Modelling Owners is subscribed to branch lp:~mlhim-specs-dev/mlhim-specs/mlhim-emf.
To unsubscribe from this branch go to https://code.launchpad.net/~mlhim-specs-dev/mlhim-specs/mlhim-emf/+edit-subscription
=== modified file 'org.mlhim.rm/model/mlhim2.ecore'
--- org.mlhim.rm/model/mlhim2.ecore	2011-03-03 20:01:20 +0000
+++ org.mlhim.rm/model/mlhim2.ecore	2011-03-03 20:14:37 +0000
@@ -23,18 +23,22 @@
     <eClassifiers xsi:type="ecore:EClass" name="NASK" eSuperTypes="#//Support/UNK"/>
     <eClassifiers xsi:type="ecore:EClass" name="NAV" eSuperTypes="#//Support/ASKU"/>
   </eSubpackages>
-  <eSubpackages name="QDT"/>
-  <eSubpackages name="NQDT">
-    <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvURI" eSuperTypes="#//NQDT/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//NQDT/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvText" eSuperTypes="#//NQDT/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvEncapsulated" abstract="true" eSuperTypes="#//NQDT/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//NQDT/DvAny"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//NQDT/DvText"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvCodedText" eSuperTypes="#//NQDT/DvText"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//NQDT/DvEncapsulated"/>
-    <eClassifiers xsi:type="ecore:EClass" name="DvMultimedia" eSuperTypes="#//NQDT/DvEncapsulated"/>
+  <eSubpackages name="QDT">
+    <eClassifiers xsi:type="ecore:EClass" name="DvOrdered" abstract="true" eSuperTypes="#//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvInterval" abstract="true" eSuperTypes="#//Datatypes/DvAny.1"/>
+  </eSubpackages>
+  <eSubpackages name="Datatypes">
+    <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvURI" eSuperTypes="#//Datatypes/DvAny #//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvBoolean" eSuperTypes="#//Datatypes/DvAny #//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvText" eSuperTypes="#//Datatypes/DvAny #//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvEncapsulated" abstract="true" eSuperTypes="#//Datatypes/DvAny #//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvParagraph" eSuperTypes="#//Datatypes/DvAny #//Datatypes/DvAny.1"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvIdentifier" eSuperTypes="#//Datatypes/DvText"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvCodedText" eSuperTypes="#//Datatypes/DvText"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvParsable" eSuperTypes="#//Datatypes/DvEncapsulated"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvMultimedia" eSuperTypes="#//Datatypes/DvEncapsulated"/>
+    <eClassifiers xsi:type="ecore:EClass" name="DvAny" abstract="true"/>
   </eSubpackages>
   <eSubpackages name="Structures"/>
   <eSubpackages name="Content"/>

=== modified file 'org.mlhim.rm/model/mlhim2.ecorediag'
--- org.mlhim.rm/model/mlhim2.ecorediag	2011-03-03 20:01:20 +0000
+++ org.mlhim.rm/model/mlhim2.ecorediag	2011-03-03 20:14:37 +0000
@@ -300,34 +300,6 @@
     <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//Support"/>
     <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ovcEU0XLEeCTG6Rypkx8FQ" width="111" height="99"/>
   </children>
-  <children xmi:type="notation:Node" xmi:id="_tRyOIEXLEeCTG6Rypkx8FQ" type="1002">
-    <children xmi:type="notation:Node" xmi:id="_tR0qYEXLEeCTG6Rypkx8FQ" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_tR1RcEXLEeCTG6Rypkx8FQ" type="5003">
-      <children xmi:type="notation:Node" xmi:id="_zYQq4EXQEeCTG6Rypkx8FQ" type="2003">
-        <children xmi:type="notation:Node" xmi:id="_zYQq4UXQEeCTG6Rypkx8FQ" type="4002"/>
-        <children xmi:type="notation:Node" xmi:id="_zYQq4kXQEeCTG6Rypkx8FQ" type="5004">
-          <styles xmi:type="notation:DrawerStyle" xmi:id="_zYQq40XQEeCTG6Rypkx8FQ"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_zYQq5EXQEeCTG6Rypkx8FQ"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_zYQq5UXQEeCTG6Rypkx8FQ"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_zYQq5kXQEeCTG6Rypkx8FQ" type="5005">
-          <styles xmi:type="notation:DrawerStyle" xmi:id="_zYQq50XQEeCTG6Rypkx8FQ"/>
-          <styles xmi:type="notation:SortingStyle" xmi:id="_zYQq6EXQEeCTG6Rypkx8FQ"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_zYQq6UXQEeCTG6Rypkx8FQ"/>
-        </children>
-        <styles xmi:type="notation:ShapeStyle" xmi:id="_zYQq6kXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvAny"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zYQq60XQEeCTG6Rypkx8FQ" x="487" y="3"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_tR1RcUXLEeCTG6Rypkx8FQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_tR1RckXLEeCTG6Rypkx8FQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tR1Rc0XLEeCTG6Rypkx8FQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_tRyOIUXLEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
-    <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_tRyOIkXLEeCTG6Rypkx8FQ"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//QDT"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tRyOI0XLEeCTG6Rypkx8FQ" x="48" y="144" width="1131" height="483"/>
-  </children>
   <children xmi:type="notation:Node" xmi:id="_u1Fz8EXLEeCTG6Rypkx8FQ" type="1002">
     <children xmi:type="notation:Node" xmi:id="_u1HpIEXLEeCTG6Rypkx8FQ" type="4006"/>
     <children xmi:type="notation:Node" xmi:id="_u1IQMEXLEeCTG6Rypkx8FQ" type="5003">
@@ -344,7 +316,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_meA3c0XPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_md-bMEXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvAny"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvAny.1"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_md-bMUXPEeCTG6Rypkx8FQ" x="391" y="15"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_tHjXQEXPEeCTG6Rypkx8FQ" type="2003">
@@ -360,7 +332,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_tHmakkXPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_tHj-UEXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvURI"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvURI"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tHj-UUXPEeCTG6Rypkx8FQ" x="35" y="100"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_u-Wg0EXPEeCTG6Rypkx8FQ" type="2003">
@@ -376,7 +348,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_u-Y9E0XPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_u-Wg0UXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvBoolean"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvBoolean"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-Wg0kXPEeCTG6Rypkx8FQ" x="199" y="100"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_we8J0EXPEeCTG6Rypkx8FQ" type="2003">
@@ -392,7 +364,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_we-mE0XPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_we8J0UXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvText"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvText"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_we8J0kXPEeCTG6Rypkx8FQ" x="355" y="99"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_ysjQ4EXPEeCTG6Rypkx8FQ" type="2003">
@@ -408,7 +380,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_ysltI0XPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_ysjQ4UXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvEncapsulated"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvEncapsulated"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ysjQ4kXPEeCTG6Rypkx8FQ" x="511" y="99" width="147" height="39"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_3E38AEXPEeCTG6Rypkx8FQ" type="2003">
@@ -424,7 +396,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_3E6YQ0XPEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_3E38AUXPEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvParagraph"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvParagraph"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3E38AkXPEeCTG6Rypkx8FQ" x="715" y="99" width="123" height="39"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_EWFTYEXQEeCTG6Rypkx8FQ" type="2003">
@@ -440,7 +412,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_EWJk00XQEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_EWF6cEXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvIdentifier"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvIdentifier"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EWF6cUXQEeCTG6Rypkx8FQ" x="177" y="266"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_GgiYwEXQEeCTG6Rypkx8FQ" type="2003">
@@ -456,7 +428,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_Ggk1A0XQEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_GgiYwUXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvCodedText"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvCodedText"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GgiYwkXQEeCTG6Rypkx8FQ" x="343" y="267"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_e2wVsEXQEeCTG6Rypkx8FQ" type="2003">
@@ -472,7 +444,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_e2yx80XQEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_e2wVsUXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvParsable"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvParsable"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2wVskXQEeCTG6Rypkx8FQ" x="515" y="269"/>
       </children>
       <children xmi:type="notation:Node" xmi:id="_hgTK0EXQEeCTG6Rypkx8FQ" type="2003">
@@ -488,7 +460,7 @@
           <styles xmi:type="notation:FilteringStyle" xmi:id="_hgVnE0XQEeCTG6Rypkx8FQ"/>
         </children>
         <styles xmi:type="notation:ShapeStyle" xmi:id="_hgTK0UXQEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
-        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//NQDT/DvMultimedia"/>
+        <element xmi:type="ecore:EClass" href="mlhim2.ecore#//Datatypes/DvMultimedia"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hgTK0kXQEeCTG6Rypkx8FQ" x="681" y="274"/>
       </children>
       <styles xmi:type="notation:DrawerStyle" xmi:id="_u1IQMUXLEeCTG6Rypkx8FQ"/>
@@ -497,8 +469,8 @@
     </children>
     <styles xmi:type="notation:ShapeStyle" xmi:id="_u1Fz8UXLEeCTG6Rypkx8FQ" fontColor="4210752" fontName="DejaVu Sans" fontHeight="10" fillColor="13150135" lineColor="4210752"/>
     <styles xmi:type="notation:MultiDiagramLinkStyle" xmi:id="_u1Fz8kXLEeCTG6Rypkx8FQ"/>
-    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//NQDT"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u1Fz80XLEeCTG6Rypkx8FQ" x="120" width="147" height="111"/>
+    <element xmi:type="ecore:EPackage" href="mlhim2.ecore#//Datatypes"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u1Fz80XLEeCTG6Rypkx8FQ" x="48" y="120" width="1131" height="507"/>
   </children>
   <children xmi:type="notation:Node" xmi:id="_wToOgEXLEeCTG6Rypkx8FQ" type="1002">
     <children xmi:type="notation:Node" xmi:id="_wTpcoEXLEeCTG6Rypkx8FQ" type="4006"/>
@@ -678,46 +650,6 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZatIEXPEeCTG6Rypkx8FQ" id="(0.5784313725490197,0.16279069767441862)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MZatIUXPEeCTG6Rypkx8FQ" id="(0.5588235294117647,0.7906976744186046)"/>
   </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_l4J74EXQEeCTG6Rypkx8FQ" type="3003" source="_tHjXQEXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_l4J74UXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_l4J74kXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l4J740XQEeCTG6Rypkx8FQ" points="[21, -5, -273, 76]$[295, -90, 1, -9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4PbcEXQEeCTG6Rypkx8FQ" id="(0.6568627450980392,0.13953488372093023)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l4QCgEXQEeCTG6Rypkx8FQ" id="(0.0392156862745098,0.23255813953488372)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_nIPqwEXQEeCTG6Rypkx8FQ" type="3003" source="_u-Wg0EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_nIPqwUXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_nIPqwkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nIPqw0XQEeCTG6Rypkx8FQ" points="[19, -8, -129, 62]$[149, -52, 1, 18]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nIT8MEXQEeCTG6Rypkx8FQ" id="(0.5098039215686274,0.20930232558139536)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nIT8MUXQEeCTG6Rypkx8FQ" id="(0.06862745098039216,0.5813953488372093)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_oJAkMEXQEeCTG6Rypkx8FQ" type="3003" source="_we8J0EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_oJAkMUXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_oJAkMkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oJAkM0XQEeCTG6Rypkx8FQ" points="[3, -1, 1, 52]$[3, -44, 1, 9]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oJE1oEXQEeCTG6Rypkx8FQ" id="(0.5882352941176471,0.046511627906976744)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oJE1oUXQEeCTG6Rypkx8FQ" id="(0.24509803921568626,0.7906976744186046)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_paRXwEXQEeCTG6Rypkx8FQ" type="3003" source="_ysjQ4EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_paRXwUXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_paRXwkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_paRXw0XQEeCTG6Rypkx8FQ" points="[-2, -1, 57, 55]$[-57, -44, 2, 12]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_paVpMEXQEeCTG6Rypkx8FQ" id="(0.22448979591836735,0.05128205128205128)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_paVpMUXQEeCTG6Rypkx8FQ" id="(0.9313725490196079,0.7209302325581395)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_qlMSwEXQEeCTG6Rypkx8FQ" type="3003" source="_3E38AEXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_qlMSwUXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_qlMSwkXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qlMSw0XQEeCTG6Rypkx8FQ" points="[-27, -7, 262, 77]$[-287, -91, 2, -7]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qlQkMEXQEeCTG6Rypkx8FQ" id="(0.4715447154471545,0.20512820512820512)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qlQkMUXQEeCTG6Rypkx8FQ" id="(0.9215686274509803,0.18604651162790697)"/>
-  </edges>
   <edges xmi:type="notation:Edge" xmi:id="_sJ6N0EXQEeCTG6Rypkx8FQ" type="3003" source="_EWFTYEXQEeCTG6Rypkx8FQ" target="_we8J0EXPEeCTG6Rypkx8FQ">
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_sJ6N0UXQEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
     <styles xmi:type="notation:FontStyle" xmi:id="_sJ6N0kXQEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
@@ -750,4 +682,43 @@
     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vbjkwEXQEeCTG6Rypkx8FQ" id="(0.22123893805309736,0.13953488372093023)"/>
     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vbjkwUXQEeCTG6Rypkx8FQ" id="(0.8503401360544217,0.6923076923076923)"/>
   </edges>
+  <edges xmi:type="notation:Edge" xmi:id="__DH6EEXREeCTG6Rypkx8FQ" type="3003" source="_tHjXQEXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="__DH6EUXREeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="__DH6EkXREeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__DH6E0XREeCTG6Rypkx8FQ" points="[32, -9, -264, 80]$[296, -88, 0, 1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__DNZoEXREeCTG6Rypkx8FQ" id="(0.6078431372549019,0.23255813953488372)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__DNZoUXREeCTG6Rypkx8FQ" id="(0.0,0.13953488372093023)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="__vQnUEXREeCTG6Rypkx8FQ" type="3003" source="_u-Wg0EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="__vQnUUXREeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="__vQnUkXREeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__vQnU0XREeCTG6Rypkx8FQ" points="[35, -20, -112, 65]$[148, -64, 1, 21]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__vU4wEXREeCTG6Rypkx8FQ" id="(0.058823529411764705,0.4883720930232558)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_AXGDYEXSEeCTG6Rypkx8FQ" type="3003" source="_we8J0EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_AXGDYUXSEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AXGDYkXSEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AXGDY0XSEeCTG6Rypkx8FQ" points="[0, -3, 1, 52]$[0, -46, 1, 9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AXKU0EXSEeCTG6Rypkx8FQ" id="(0.7254901960784313,0.09302325581395349)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AXKU0UXSEeCTG6Rypkx8FQ" id="(0.35294117647058826,0.7906976744186046)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_BI1pYEXSEeCTG6Rypkx8FQ" type="3003" source="_ysjQ4EXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_BI1pYUXSEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_BI1pYkXSEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BI1pY0XSEeCTG6Rypkx8FQ" points="[-2, -2, 51, 54]$[-51, -45, 2, 11]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BI5TwEXSEeCTG6Rypkx8FQ" id="(0.1360544217687075,0.07692307692307693)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BI560EXSEeCTG6Rypkx8FQ" id="(0.8627450980392157,0.7441860465116279)"/>
+  </edges>
+  <edges xmi:type="notation:Edge" xmi:id="_CbY2YEXSEeCTG6Rypkx8FQ" type="3003" source="_3E38AEXPEeCTG6Rypkx8FQ" target="_md90IEXPEeCTG6Rypkx8FQ">
+    <styles xmi:type="notation:ConnectorStyle" xmi:id="_CbY2YUXSEeCTG6Rypkx8FQ" routing="Rectilinear" lineColor="4210752"/>
+    <styles xmi:type="notation:FontStyle" xmi:id="_CbY2YkXSEeCTG6Rypkx8FQ" fontName="DejaVu Sans"/>
+    <element xsi:nil="true"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CbZdcEXSEeCTG6Rypkx8FQ" points="[-16, -4, 265, 78]$[-279, -88, 2, -6]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbdH0EXSEeCTG6Rypkx8FQ" id="(0.34959349593495936,0.1282051282051282)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CbdH0UXSEeCTG6Rypkx8FQ" id="(0.8529411764705882,0.16279069767441862)"/>
+  </edges>
 </notation:Diagram>