diff options
Diffstat (limited to 'extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg')
| -rw-r--r-- | extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg | 1688 |
1 files changed, 1082 insertions, 606 deletions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg index 9f30268ce05..840357dd965 100644 --- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg +++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.examples/ClassDiagrams.dg @@ -4,49 +4,53 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="92.0" y="76.0" width="100.0" height="41.0"/> - </member> - <member xsi:type="dg:Text" data="Class1" anchor="middle"> - <bounds x="125.0" y="90.0" width="36.0" height="13.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> - <bounds x="536.0" y="72.0" width="100.0" height="41.0"/> + <bounds x="647.0" y="308.0" width="100.0" height="41.0"/> </member> - <member xsi:type="dg:Text" data="Class2" anchor="middle"> - <bounds x="569.0" y="86.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class5" anchor="middle"> + <bounds x="680.0" y="322.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="175.0" y="262.0" width="122.0" height="100.0"/> + <bounds x="88.0" y="262.0" width="209.0" height="100.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="176.0" y="279.0"/> - <end x="298.0" y="279.0"/> + <start x="88.0" y="324.0"/> + <end x="297.0" y="324.0"/> </member> </member> - <member xsi:type="dg:Text" data="AssociationClass1" anchor="middle"> - <bounds x="188.0" y="265.0" width="97.0" height="13.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="176.0" y="321.0"/> - <end x="298.0" y="321.0"/> + <start x="88.0" y="279.0"/> + <end x="297.0" y="279.0"/> + </member> + <member xsi:type="dg:Text" data="+Attribute1"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <bounds x="93.0" y="281.0" width="167.0" height="13.0"/> </member> </member> + <member xsi:type="dg:Text" data="AssociationClass1" anchor="middle"> + <bounds x="144.0" y="265.0" width="97.0" height="13.0"/> + </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Polygon"> + <point x="450.0" y="330.0"/> + <point x="460.0" y="320.0"/> + <point x="470.0" y="330.0"/> + <point x="460.0" y="340.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="348.0" y="374.0" width="100.0" height="42.0"/> + <bounds x="92.0" y="76.0" width="100.0" height="41.0"/> </member> - <member xsi:type="dg:Text" data="Class4" anchor="middle"> - <bounds x="381.0" y="388.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class1" anchor="middle"> + <bounds x="125.0" y="90.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -61,24 +65,36 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="647.0" y="308.0" width="100.0" height="41.0"/> + <bounds x="348.0" y="374.0" width="100.0" height="42.0"/> </member> - <member xsi:type="dg:Text" data="Class5" anchor="middle"> - <bounds x="680.0" y="322.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class4" anchor="middle"> + <bounds x="381.0" y="388.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Polygon"> - <point x="450.0" y="330.0"/> - <point x="460.0" y="320.0"/> - <point x="470.0" y="330.0"/> - <point x="460.0" y="340.0"/> + <member xsi:type="dg:Rectangle"> + <bounds x="536.0" y="72.0" width="100.0" height="41.0"/> + </member> + <member xsi:type="dg:Text" data="Class2" anchor="middle"> + <bounds x="569.0" y="86.0" width="36.0" height="13.0"/> + </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Path"> + <class>dotted</class> + <command xsi:type="dg:MoveTo"> + <point x="304.0" y="208.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="246.0" y="262.0"/> + </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.3" startMarker="/0/@definitions/@definition.13"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.6" startMarker="/0/@definitions/@definition.18"> <command xsi:type="dg:MoveTo"> <point x="192.0" y="91.0"/> </command> @@ -95,62 +111,33 @@ <member xsi:type="dg:Text" data="*" anchor="middle"> <bounds x="474.0" y="65.0" width="20.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class2" anchor="middle"> + <member xsi:type="dg:Text" data="+class2" anchor="middle"> <bounds x="460.0" y="105.0" width="49.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class1" anchor="middle"> + <member xsi:type="dg:Text" data="+class1" anchor="middle"> <bounds x="220.0" y="65.0" width="49.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.4"> <command xsi:type="dg:MoveTo"> - <point x="140.0" y="117.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="140.0" y="161.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="589.0" y="161.0"/> + <point x="460.0" y="320.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="589.0" y="113.0"/> + <point x="460.0" y="271.0"/> </command> </member> - <member xsi:type="dg:Text" data="class1_class2_2" anchor="middle"> - <bounds x="325.0" y="175.0" width="85.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="1..*" anchor="middle"> - <bounds x="95.0" y="130.0" width="34.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="0..1" anchor="middle"> - <bounds x="597.0" y="129.0" width="35.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="+ class2" anchor="middle"> - <bounds x="527.0" y="128.0" width="49.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="+ class1" anchor="middle"> - <bounds x="149.0" y="129.0" width="49.0" height="13.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.0"> - <command xsi:type="dg:MoveTo"> - <point x="354.0" y="161.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="354.0" y="91.0"/> - </command> + <member xsi:type="dg:Text" data="+class3" anchor="middle"> + <bounds x="394.0" y="276.0" width="49.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="" anchor="middle"> - <bounds x="394.0" y="126.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="*" anchor="middle"> + <bounds x="470.0" y="272.0" width="20.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.3" startMarker="/0/@definitions/@definition.14"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.6" startMarker="/0/@definitions/@definition.19"> <command xsi:type="dg:MoveTo"> <point x="142.0" y="76.0"/> </command> @@ -170,135 +157,152 @@ <member xsi:type="dg:Text" data="1" anchor="middle"> <bounds x="557.0" y="37.0" width="22.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class2" anchor="middle"> + <member xsi:type="dg:Text" data="+class2" anchor="middle"> <bounds x="600.0" y="38.0" width="49.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class1" anchor="middle"> + <member xsi:type="dg:Text" data="+class1" anchor="middle"> <bounds x="148.0" y="38.0" width="49.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.3"> + <member xsi:type="dg:Path"> <command xsi:type="dg:MoveTo"> - <point x="92.0" y="96.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="72.0" y="96.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="72.0" y="208.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="666.0" y="208.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="666.0" y="92.0"/> + <point x="455.0" y="334.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="636.0" y="92.0"/> + <point x="418.0" y="374.0"/> </command> </member> - <member xsi:type="dg:Text" data="+ /class2" anchor="middle"> - <bounds x="670.0" y="93.0" width="55.0" height="13.0"/> + <member xsi:type="dg:Text" data="+class4" anchor="middle"> + <bounds x="456.0" y="369.0" width="49.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class1" anchor="middle"> - <bounds x="17.0" y="95.0" width="49.0" height="13.0"/> + <member xsi:type="dg:Text" data="1..*" anchor="middle"> + <bounds x="380.0" y="349.0" width="34.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path"> - <class>dotted</class> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.6"> <command xsi:type="dg:MoveTo"> - <point x="320.0" y="208.0"/> + <point x="747.0" y="338.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="276.0" y="262.0"/> + <point x="809.0" y="338.0"/> </command> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.2"> - <command xsi:type="dg:MoveTo"> - <point x="460.0" y="320.0"/> + <command xsi:type="dg:LineTo"> + <point x="809.0" y="411.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="460.0" y="271.0"/> + <point x="722.0" y="411.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="703.0" y="349.0"/> </command> </member> - <member xsi:type="dg:Text" data="+ class3" anchor="middle"> - <bounds x="394.0" y="276.0" width="49.0" height="13.0"/> + <member xsi:type="dg:Text" data="1" anchor="middle"> + <bounds x="755.0" y="345.0" width="22.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="*" anchor="middle"> - <bounds x="470.0" y="272.0" width="20.0" height="13.0"/> + <member xsi:type="dg:Text" data="1" anchor="middle"> + <bounds x="678.0" y="376.0" width="22.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="+class52" anchor="middle"> + <bounds x="719.0" y="369.0" width="56.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="+class51" anchor="middle"> + <bounds x="752.0" y="316.0" width="56.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.4"> <command xsi:type="dg:MoveTo"> - <point x="455.0" y="334.0"/> + <point x="140.0" y="117.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="418.0" y="374.0"/> + <point x="140.0" y="161.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="589.0" y="161.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="589.0" y="113.0"/> </command> </member> - <member xsi:type="dg:Text" data="+ class4" anchor="middle"> - <bounds x="456.0" y="369.0" width="49.0" height="13.0"/> + <member xsi:type="dg:Text" data="class1_class2_2" anchor="middle"> + <bounds x="325.0" y="175.0" width="85.0" height="13.0"/> </member> <member xsi:type="dg:Text" data="1..*" anchor="middle"> - <bounds x="380.0" y="349.0" width="34.0" height="13.0"/> + <bounds x="95.0" y="130.0" width="34.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="0..1" anchor="middle"> + <bounds x="597.0" y="129.0" width="35.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="+class2" anchor="middle"> + <bounds x="527.0" y="128.0" width="49.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="+class1" anchor="middle"> + <bounds x="149.0" y="129.0" width="49.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.2" startMarker="/0/@definitions/@definition.13"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.0"> <command xsi:type="dg:MoveTo"> - <point x="465.0" y="328.0"/> + <point x="354.0" y="161.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="647.0" y="328.0"/> + <point x="354.0" y="91.0"/> </command> </member> - <member xsi:type="dg:Text" data="+ class5" anchor="middle"> - <bounds x="585.0" y="300.0" width="49.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="0..1" anchor="middle"> - <bounds x="592.0" y="341.0" width="35.0" height="13.0"/> + <member xsi:type="dg:Text" data="" anchor="middle"> + <bounds x="394.0" y="126.0" width="0.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.3"> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.6"> <command xsi:type="dg:MoveTo"> - <point x="747.0" y="338.0"/> + <point x="92.0" y="96.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="809.0" y="338.0"/> + <point x="72.0" y="96.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="809.0" y="411.0"/> + <point x="72.0" y="208.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="722.0" y="411.0"/> + <point x="666.0" y="208.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="703.0" y="349.0"/> + <point x="666.0" y="92.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="636.0" y="92.0"/> </command> </member> - <member xsi:type="dg:Text" data="1" anchor="middle"> - <bounds x="755.0" y="345.0" width="22.0" height="13.0"/> + <member xsi:type="dg:Text" data="+/class2" anchor="middle"> + <bounds x="670.0" y="93.0" width="55.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="1" anchor="middle"> - <bounds x="678.0" y="376.0" width="22.0" height="13.0"/> + <member xsi:type="dg:Text" data="+class1" anchor="middle"> + <bounds x="17.0" y="95.0" width="49.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ class52" anchor="middle"> - <bounds x="719.0" y="369.0" width="56.0" height="13.0"/> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Path" endMarker="/0/@definitions/@definition.4" startMarker="/0/@definitions/@definition.18"> + <command xsi:type="dg:MoveTo"> + <point x="465.0" y="328.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="647.0" y="328.0"/> + </command> </member> - <member xsi:type="dg:Text" data="+ class51" anchor="middle"> - <bounds x="752.0" y="316.0" width="56.0" height="13.0"/> + <member xsi:type="dg:Text" data="+class5" anchor="middle"> + <bounds x="585.0" y="300.0" width="49.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="0..1" anchor="middle"> + <bounds x="592.0" y="341.0" width="35.0" height="13.0"/> </member> </member> <definitions> @@ -326,6 +330,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -335,6 +363,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -350,6 +387,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -508,6 +563,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -679,82 +744,75 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="22.0" y="21.0" width="181.0" height="148.0"/> + <bounds x="505.0" y="278.0" width="153.0" height="100.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="23.0" y="71.0"/> - <end x="204.0" y="71.0"/> + <start x="505.0" y="309.0"/> + <end x="658.0" y="309.0"/> </member> - <member xsi:type="dg:Text" data="+ Operation1 ()"> + <member xsi:type="dg:Text" data="EnumerationLiteral1"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="28.0" y="73.0" width="83.0" height="13.0"/> + <bounds x="510.0" y="311.0" width="108.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="+ Operation2 () : String [0..1]"> + <member xsi:type="dg:Text" data="EnumerationLiteral2"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="28.0" y="86.0" width="122.0" height="13.0"/> + <bounds x="510.0" y="324.0" width="108.0" height="13.0"/> </member> </member> - <member xsi:type="dg:Text" data="Class1" anchor="middle"> - <bounds x="95.0" y="24.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="«enumeration»
Enumeration1" anchor="middle"> + <bounds x="542.0" y="281.0" width="79.0" height="27.0"/> </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Segoe UI"/> <member xsi:type="dg:Group"> - <member xsi:type="dg:Line"> - <start x="23.0" y="120.0"/> - <end x="204.0" y="120.0"/> - </member> - <member xsi:type="dg:Text" data="Class11"> - <style fontSize="11.0" fontName="Segoe UI"/> - <bounds x="28.0" y="122.0" width="42.0" height="13.0"/> + <member xsi:type="dg:Rectangle"> + <bounds x="320.0" y="151.0" width="100.0" height="100.0"/> </member> - <member xsi:type="dg:Text" data="Interface12"> - <style fontSize="11.0" fontName="Segoe UI"/> - <bounds x="28.0" y="135.0" width="61.0" height="13.0"/> + <member xsi:type="dg:Rectangle"> + <bounds x="325.0" y="151.0" width="90.0" height="100.0"/> </member> </member> - <member xsi:type="dg:Group"> - <member xsi:type="dg:Line"> - <start x="23.0" y="38.0"/> - <end x="204.0" y="38.0"/> - </member> - <member xsi:type="dg:Text" data="+ Attribute1 : Integer [1]"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="28.0" y="40.0" width="133.0" height="13.0"/> - </member> + <member xsi:type="dg:Text" data="Class7" anchor="middle"> + <style fontItalic="true"/> + <bounds x="351.0" y="194.0" width="39.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="463.0" y="20.0" width="178.0" height="100.0"/> + <bounds x="439.0" y="149.0" width="241.0" height="119.0"/> + </member> + <member xsi:type="dg:Text" data="«primitive»
PrimitiveType1" anchor="middle"> + <bounds x="517.0" y="152.0" width="84.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="464.0" y="51.0"/> - <end x="642.0" y="51.0"/> + <start x="439.0" y="180.0"/> + <end x="680.0" y="180.0"/> </member> - <member xsi:type="dg:Text" data="+ /Attribute3 : String [0..1]"> + <member xsi:type="dg:Text" data="+Attribute5[2]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="469.0" y="53.0" width="146.0" height="13.0"/> + <bounds x="444.0" y="182.0" width="167.0" height="13.0"/> </member> - </member> - <member xsi:type="dg:Text" data="«component»
Component1" anchor="middle"> - <bounds x="464.0" y="23.0" width="178.0" height="27.0"/> - </member> - <member xsi:type="dg:Group"> - <member xsi:type="dg:Line"> - <start x="464.0" y="75.0"/> - <end x="642.0" y="75.0"/> + <member xsi:type="dg:Text" data="+Attribute6:Integer[1]=5"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <bounds x="444.0" y="195.0" width="133.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="# Operation4 (in p : String)"> + <member xsi:type="dg:Text" data="+Attribute7:String[1]="hello""> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="469.0" y="77.0" width="147.0" height="13.0"/> + <bounds x="444.0" y="208.0" width="127.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="464.0" y="99.0"/> - <end x="642.0" y="99.0"/> + <start x="439.0" y="239.0"/> + <end x="680.0" y="239.0"/> + </member> + <member xsi:type="dg:Text" data="+Operation6(inout p:String):Real"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <bounds x="444.0" y="241.0" width="196.0" height="13.0"/> </member> </member> </member> @@ -765,163 +823,170 @@ </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="221.0" y="51.0"/> - <end x="442.0" y="51.0"/> + <start x="220.0" y="86.0"/> + <end x="441.0" y="86.0"/> </member> - <member xsi:type="dg:Text" data="~ Attribute4 : Real [1..*]"> + <member xsi:type="dg:Text" data="+Operation5(out p:Real[0..1])"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="226.0" y="53.0" width="128.0" height="13.0"/> + <bounds x="225.0" y="88.0" width="148.0" height="13.0"/> </member> </member> <member xsi:type="dg:Text" data="«datatype»
DataType1" anchor="middle"> - <bounds x="221.0" y="23.0" width="221.0" height="27.0"/> + <bounds x="299.0" y="23.0" width="62.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="221.0" y="86.0"/> - <end x="442.0" y="86.0"/> + <start x="220.0" y="51.0"/> + <end x="441.0" y="51.0"/> </member> - <member xsi:type="dg:Text" data="+ Operation5 (out p : Real [0..1])"> + <member xsi:type="dg:Text" data="~Attribute4:Real[1..*]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="226.0" y="88.0" width="148.0" height="13.0"/> + <bounds x="225.0" y="53.0" width="128.0" height="13.0"/> </member> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="505.0" y="278.0" width="153.0" height="100.0"/> + <bounds x="463.0" y="20.0" width="178.0" height="107.0"/> </member> - <member xsi:type="dg:Text" data="«enumeration»
Enumeration1" anchor="middle"> - <bounds x="506.0" y="281.0" width="153.0" height="27.0"/> + <member xsi:type="dg:Group"> + <member xsi:type="dg:Line"> + <start x="463.0" y="105.0"/> + <end x="641.0" y="105.0"/> + </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="506.0" y="309.0"/> - <end x="659.0" y="309.0"/> + <start x="463.0" y="78.0"/> + <end x="641.0" y="78.0"/> </member> - <member xsi:type="dg:Text" data="EnumerationLiteral1"> + <member xsi:type="dg:Text" data="#Operation4(p:String)"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="511.0" y="311.0" width="108.0" height="13.0"/> + <bounds x="468.0" y="80.0" width="147.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="EnumerationLiteral2"> + </member> + <member xsi:type="dg:Group"> + <member xsi:type="dg:Line"> + <start x="463.0" y="51.0"/> + <end x="641.0" y="51.0"/> + </member> + <member xsi:type="dg:Text" data="+/Attribute3:String[0..1]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="511.0" y="324.0" width="108.0" height="13.0"/> + <bounds x="468.0" y="53.0" width="146.0" height="13.0"/> </member> </member> + <member xsi:type="dg:Text" data="«component»
Component1" anchor="middle"> + <bounds x="515.0" y="23.0" width="74.0" height="27.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="20.0" y="184.0" width="281.0" height="157.0"/> - </member> - <member xsi:type="dg:Text" data="«interface»
Interface1" anchor="middle"> - <bounds x="21.0" y="187.0" width="281.0" height="27.0"/> + <bounds x="22.0" y="21.0" width="181.0" height="148.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="21.0" y="287.0"/> - <end x="302.0" y="287.0"/> + <start x="22.0" y="38.0"/> + <end x="203.0" y="38.0"/> </member> - <member xsi:type="dg:Text" data="Interface13"> - <style fontSize="11.0" fontName="Segoe UI"/> - <bounds x="26.0" y="289.0" width="61.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="Class14"> - <style fontSize="11.0" fontName="Segoe UI"/> - <bounds x="26.0" y="302.0" width="42.0" height="13.0"/> + <member xsi:type="dg:Text" data="+Attribute1:Integer[1]"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <bounds x="27.0" y="40.0" width="133.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="21.0" y="251.0"/> - <end x="302.0" y="251.0"/> + <start x="22.0" y="71.0"/> + <end x="203.0" y="71.0"/> </member> - <member xsi:type="dg:Text" data="+ «signal» Signal1 (in Attribute7 : Real [3..4])"> + <member xsi:type="dg:Text" data="+Operation1()"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="26.0" y="253.0" width="87.0" height="13.0"/> + <bounds x="27.0" y="73.0" width="83.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="+Operation2():String[0..1]"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <bounds x="27.0" y="86.0" width="122.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="21.0" y="215.0"/> - <end x="302.0" y="215.0"/> + <start x="22.0" y="120.0"/> + <end x="203.0" y="120.0"/> </member> - <member xsi:type="dg:Text" data="- Attribute2 : Boolean [*]"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="26.0" y="217.0" width="133.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class11"> + <style fontSize="11.0" fontName="Segoe UI"/> + <bounds x="27.0" y="122.0" width="42.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="Interface12"> + <style fontSize="11.0" fontName="Segoe UI"/> + <bounds x="27.0" y="135.0" width="61.0" height="13.0"/> </member> </member> + <member xsi:type="dg:Text" data="Class1" anchor="middle"> + <bounds x="94.0" y="24.0" width="36.0" height="13.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="439.0" y="149.0" width="241.0" height="119.0"/> + <bounds x="325.0" y="279.0" width="151.0" height="100.0"/> </member> - <member xsi:type="dg:Text" data="«primitive»
PrimitiveType1" anchor="middle"> - <bounds x="440.0" y="152.0" width="241.0" height="27.0"/> + <member xsi:type="dg:Text" data="«signal»
Signal1" anchor="middle"> + <bounds x="378.0" y="282.0" width="44.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="440.0" y="180.0"/> - <end x="681.0" y="180.0"/> + <start x="325.0" y="310.0"/> + <end x="476.0" y="310.0"/> </member> - <member xsi:type="dg:Text" data="+ Attribute5 [2]"> + <member xsi:type="dg:Text" data="+Attribute7:Real[3..4]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="445.0" y="182.0" width="167.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="+ Attribute6 : Integer [1] = 5"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="445.0" y="195.0" width="133.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="+ Attribute7 : String [1] = "hello""> - <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="445.0" y="208.0" width="127.0" height="13.0"/> + <bounds x="330.0" y="312.0" width="131.0" height="13.0"/> </member> </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Rectangle"> + <bounds x="20.0" y="184.0" width="281.0" height="157.0"/> + </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="440.0" y="239.0"/> - <end x="681.0" y="239.0"/> + <start x="20.0" y="215.0"/> + <end x="301.0" y="215.0"/> </member> - <member xsi:type="dg:Text" data="+ Operation6 (inout p : String) : Real"> + <member xsi:type="dg:Text" data="-Attribute2:Boolean[*]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="445.0" y="241.0" width="196.0" height="13.0"/> + <bounds x="25.0" y="217.0" width="133.0" height="13.0"/> </member> </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> - <bounds x="325.0" y="279.0" width="151.0" height="100.0"/> - </member> - <member xsi:type="dg:Text" data="«signal»
Signal1" anchor="middle"> - <bounds x="326.0" y="282.0" width="151.0" height="27.0"/> + <member xsi:type="dg:Text" data="«interface»
Interface1" anchor="middle"> + <bounds x="131.0" y="187.0" width="59.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="326.0" y="310.0"/> - <end x="477.0" y="310.0"/> + <start x="20.0" y="251.0"/> + <end x="301.0" y="251.0"/> </member> - <member xsi:type="dg:Text" data="+ Attribute7 : Real [3..4]"> + <member xsi:type="dg:Text" data="«signal»+Signal1(Attribute7:Real[3..4])"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="331.0" y="312.0" width="131.0" height="13.0"/> + <bounds x="25.0" y="253.0" width="87.0" height="13.0"/> </member> </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Segoe UI"/> <member xsi:type="dg:Group"> - <member xsi:type="dg:Rectangle"> - <bounds x="320.0" y="151.0" width="100.0" height="100.0"/> + <member xsi:type="dg:Line"> + <start x="20.0" y="287.0"/> + <end x="301.0" y="287.0"/> </member> - <member xsi:type="dg:Rectangle"> - <bounds x="325.0" y="151.0" width="90.0" height="100.0"/> + <member xsi:type="dg:Text" data="Interface13"> + <style fontSize="11.0" fontName="Segoe UI"/> + <bounds x="25.0" y="289.0" width="61.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="Class14"> + <style fontSize="11.0" fontName="Segoe UI"/> + <bounds x="25.0" y="302.0" width="42.0" height="13.0"/> </member> - </member> - <member xsi:type="dg:Text" data="Class7" anchor="middle"> - <style fontItalic="true"/> - <bounds x="353.0" y="194.0" width="36.0" height="13.0"/> </member> </member> <definitions> @@ -949,6 +1014,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -958,6 +1047,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -973,6 +1071,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -1131,6 +1247,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -1301,46 +1427,37 @@ <dg:RootCanvas id="Constraints"> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> - <bounds x="74.0" y="62.0" width="100.0" height="40.0"/> - </member> - <member xsi:type="dg:Text" data="Class2" anchor="middle"> - <bounds x="107.0" y="75.0" width="36.0" height="13.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Path"> <command xsi:type="dg:MoveTo"> - <point x="373.0" y="50.0"/> + <point x="251.0" y="167.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="492.0" y="50.0"/> + <point x="447.0" y="167.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="502.0" y="60.0"/> + <point x="457.0" y="177.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="502.0" y="110.0"/> + <point x="457.0" y="227.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="373.0" y="110.0"/> + <point x="251.0" y="227.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="373.0" y="50.0"/> + <point x="251.0" y="167.0"/> </command> <command xsi:type="dg:MoveTo"> - <point x="492.0" y="50.0"/> + <point x="447.0" y="167.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="492.0" y="60.0"/> + <point x="447.0" y="177.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="502.0" y="60.0"/> + <point x="457.0" y="177.0"/> </command> </member> - <member xsi:type="dg:Text" data="This is a comment"> - <bounds x="373.0" y="50.0" width="129.0" height="60.0"/> + <member xsi:type="dg:Text" data="{Constraint2:{OCL} self.attribute1.operation2()}"> + <bounds x="252.0" y="168.0" width="196.0" height="50.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -1374,49 +1491,52 @@ <point x="175.0" y="254.0"/> </command> </member> - <member xsi:type="dg:Text" data="Constraint1" anchor="middle"> - <bounds x="89.0" y="250.0" width="63.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data=""> - <bounds x="81.0" y="263.0" width="79.0" height="13.0"/> + <member xsi:type="dg:Text" data="{Constraint1:}"> + <bounds x="76.0" y="245.0" width="90.0" height="50.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Path"> <command xsi:type="dg:MoveTo"> - <point x="251.0" y="167.0"/> + <point x="373.0" y="50.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="447.0" y="167.0"/> + <point x="492.0" y="50.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="457.0" y="177.0"/> + <point x="502.0" y="60.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="457.0" y="227.0"/> + <point x="502.0" y="110.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="251.0" y="227.0"/> + <point x="373.0" y="110.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="251.0" y="167.0"/> + <point x="373.0" y="50.0"/> </command> <command xsi:type="dg:MoveTo"> - <point x="447.0" y="167.0"/> + <point x="492.0" y="50.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="447.0" y="177.0"/> + <point x="492.0" y="60.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="457.0" y="177.0"/> + <point x="502.0" y="60.0"/> </command> </member> - <member xsi:type="dg:Text" data="Constraint2" anchor="middle"> - <bounds x="318.0" y="173.0" width="63.0" height="13.0"/> + <member xsi:type="dg:Text" data="This is a comment"> + <bounds x="373.0" y="50.0" width="129.0" height="60.0"/> + </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Rectangle"> + <bounds x="74.0" y="62.0" width="100.0" height="40.0"/> </member> - <member xsi:type="dg:Text" data="{{OCL} self.attribute1.operation2()}"> - <bounds x="257.0" y="186.0" width="185.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class2" anchor="middle"> + <bounds x="107.0" y="75.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -1424,10 +1544,10 @@ <member xsi:type="dg:Path"> <class>dotted</class> <command xsi:type="dg:MoveTo"> - <point x="373.0" y="82.0"/> + <point x="294.0" y="167.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="174.0" y="82.0"/> + <point x="164.0" y="102.0"/> </command> </member> </member> @@ -1436,10 +1556,10 @@ <member xsi:type="dg:Path"> <class>dotted</class> <command xsi:type="dg:MoveTo"> - <point x="124.0" y="244.0"/> + <point x="373.0" y="82.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="124.0" y="102.0"/> + <point x="174.0" y="82.0"/> </command> </member> </member> @@ -1448,10 +1568,10 @@ <member xsi:type="dg:Path"> <class>dotted</class> <command xsi:type="dg:MoveTo"> - <point x="294.0" y="167.0"/> + <point x="124.0" y="244.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="164.0" y="102.0"/> + <point x="124.0" y="102.0"/> </command> </member> </member> @@ -1480,6 +1600,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -1489,6 +1633,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -1504,6 +1657,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -1662,6 +1833,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -1833,10 +2014,10 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="20.0" y="80.0" width="100.0" height="43.0"/> + <bounds x="252.0" y="217.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class2" anchor="middle"> - <bounds x="53.0" y="95.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class1" anchor="middle"> + <bounds x="285.0" y="232.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -1851,10 +2032,10 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="260.0" y="80.0" width="100.0" height="43.0"/> + <bounds x="20.0" y="219.0" width="100.0" height="41.0"/> </member> - <member xsi:type="dg:Text" data="Class3" anchor="middle"> - <bounds x="293.0" y="95.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class5" anchor="middle"> + <bounds x="53.0" y="233.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -1863,25 +2044,25 @@ <bounds x="506.0" y="214.0" width="100.0" height="48.0"/> </member> <member xsi:type="dg:Text" data="«interface»
Interface1" anchor="middle"> - <bounds x="507.0" y="225.0" width="100.0" height="27.0"/> + <bounds x="527.0" y="225.0" width="59.0" height="27.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="252.0" y="217.0" width="100.0" height="43.0"/> + <bounds x="260.0" y="80.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class1" anchor="middle"> - <bounds x="285.0" y="232.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class3" anchor="middle"> + <bounds x="293.0" y="95.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="20.0" y="219.0" width="100.0" height="41.0"/> + <bounds x="20.0" y="80.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class5" anchor="middle"> - <bounds x="53.0" y="233.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class2" anchor="middle"> + <bounds x="53.0" y="95.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -1896,55 +2077,64 @@ </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="360.0" y="99.0"/> + <point x="556.0" y="120.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="512.0" y="99.0"/> + <point x="556.0" y="214.0"/> </command> </member> - <member xsi:type="dg:Text" data="«use»
Usage1" anchor="middle"> - <bounds x="428.0" y="64.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="«abstraction»
Abstraction1" anchor="middle"> + <bounds x="573.0" y="147.0" width="72.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="556.0" y="120.0"/> + <point x="360.0" y="99.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="556.0" y="214.0"/> + <point x="512.0" y="99.0"/> </command> </member> - <member xsi:type="dg:Text" data="«abstraction»
Abstraction1" anchor="middle"> - <bounds x="609.0" y="153.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="«use»
Usage1" anchor="middle"> + <bounds x="413.0" y="58.0" width="31.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.0"> + <style fontSize="11.0" fontName="Segoe UI"/> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="310.0" y="217.0"/> + <point x="523.0" y="120.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="310.0" y="123.0"/> + <point x="347.0" y="217.0"/> </command> </member> + <member xsi:type="dg:Text" data="«substitute»
Substitution1" anchor="middle"> + <bounds x="433.0" y="187.0" width="72.0" height="13.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.0"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="352.0" y="238.0"/> + <point x="190.0" y="110.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="506.0" y="238.0"/> + <point x="190.0" y="161.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="84.0" y="161.0"/> + </command> + <command xsi:type="dg:LineTo"> + <point x="84.0" y="219.0"/> </command> </member> </member> @@ -1962,60 +2152,51 @@ </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.0"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="199.0" y="100.0"/> + <point x="310.0" y="217.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="260.0" y="100.0"/> + <point x="310.0" y="123.0"/> </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="190.0" y="110.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="190.0" y="161.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="84.0" y="161.0"/> + <point x="199.0" y="100.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="84.0" y="219.0"/> + <point x="260.0" y="100.0"/> </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.0"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="120.0" y="238.0"/> + <point x="352.0" y="238.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="252.0" y="238.0"/> + <point x="506.0" y="238.0"/> </command> </member> </member> <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Segoe UI"/> - <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.2"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Path" endMarker="/3/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="523.0" y="120.0"/> + <point x="120.0" y="238.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="347.0" y="217.0"/> + <point x="252.0" y="238.0"/> </command> </member> - <member xsi:type="dg:Text" data="«substitute»
Substitution1" anchor="middle"> - <bounds x="433.0" y="187.0" width="72.0" height="13.0"/> - </member> </member> <definitions> <definition xsi:type="dg:Marker" id="endHollowClosedArrow"> @@ -2042,6 +2223,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -2051,6 +2256,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -2066,6 +2280,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -2224,6 +2456,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -2404,85 +2646,85 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="28.0" y="193.0" width="100.0" height="43.0"/> + <bounds x="380.0" y="192.0" width="100.0" height="42.0"/> </member> - <member xsi:type="dg:Text" data="Class2" anchor="middle"> - <bounds x="61.0" y="208.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class4" anchor="middle"> + <bounds x="413.0" y="206.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="208.0" y="192.0" width="100.0" height="43.0"/> + <bounds x="28.0" y="193.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class3" anchor="middle"> - <bounds x="241.0" y="207.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class2" anchor="middle"> + <bounds x="61.0" y="208.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="380.0" y="192.0" width="100.0" height="42.0"/> + <bounds x="208.0" y="192.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class4" anchor="middle"> - <bounds x="413.0" y="206.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class3" anchor="middle"> + <bounds x="241.0" y="207.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Path" endMarker="/4/@definitions/@definition.0"> <command xsi:type="dg:MoveTo"> - <point x="102.0" y="193.0"/> + <point x="416.0" y="192.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="225.0" y="84.0"/> + <point x="300.0" y="84.0"/> </command> </member> <member xsi:type="dg:Text" data="" anchor="middle"> - <bounds x="189.0" y="168.0" width="0.0" height="13.0"/> + <bounds x="385.0" y="109.0" width="0.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/4/@definitions/@definition.0"> + <member xsi:type="dg:Path"> + <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="250.0" y="192.0"/> + <point x="154.0" y="146.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="250.0" y="84.0"/> + <point x="366.0" y="146.0"/> </command> </member> - <member xsi:type="dg:Text" data="" anchor="middle"> - <bounds x="290.0" y="138.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="{incomplete,overlapping}" anchor="middle"> + <bounds x="180.0" y="163.0" width="137.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Path" endMarker="/4/@definitions/@definition.0"> <command xsi:type="dg:MoveTo"> - <point x="416.0" y="192.0"/> + <point x="250.0" y="192.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="300.0" y="84.0"/> + <point x="250.0" y="84.0"/> </command> </member> <member xsi:type="dg:Text" data="" anchor="middle"> - <bounds x="385.0" y="109.0" width="0.0" height="13.0"/> + <bounds x="290.0" y="138.0" width="0.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path"> - <class>dashed</class> + <member xsi:type="dg:Path" endMarker="/4/@definitions/@definition.0"> <command xsi:type="dg:MoveTo"> - <point x="154.0" y="146.0"/> + <point x="102.0" y="193.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="366.0" y="146.0"/> + <point x="225.0" y="84.0"/> </command> </member> - <member xsi:type="dg:Text" data="{incomplete, overlapping}" anchor="middle"> - <bounds x="180.0" y="163.0" width="137.0" height="13.0"/> + <member xsi:type="dg:Text" data="" anchor="middle"> + <bounds x="189.0" y="168.0" width="0.0" height="13.0"/> </member> </member> <definitions> @@ -2510,6 +2752,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -2519,6 +2785,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -2534,6 +2809,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -2692,6 +2985,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -2862,38 +3165,36 @@ <dg:RootCanvas id="InformationFlows"> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> - <bounds x="265.0" y="211.0" width="100.0" height="42.0"/> - </member> - <member xsi:type="dg:Text" data="Class4" anchor="middle"> - <bounds x="298.0" y="225.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Group"/> + <member xsi:type="dg:Text" data="DurationObservation1" anchor="middle"> + <bounds x="493.0" y="212.0" width="122.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="267.0" y="70.0" width="100.0" height="43.0"/> + <bounds x="41.0" y="66.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="Class3" anchor="middle"> - <bounds x="300.0" y="85.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class2" anchor="middle"> + <bounds x="74.0" y="81.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="41.0" y="66.0" width="100.0" height="43.0"/> + <bounds x="35.0" y="154.0" width="117.0" height="40.0"/> </member> - <member xsi:type="dg:Text" data="Class2" anchor="middle"> - <bounds x="74.0" y="81.0" width="36.0" height="13.0"/> + <member xsi:type="dg:Text" data="«information»
InformationItem1" anchor="middle"> + <bounds x="47.0" y="161.0" width="94.0" height="27.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="35.0" y="154.0" width="117.0" height="40.0"/> + <bounds x="265.0" y="211.0" width="100.0" height="42.0"/> </member> - <member xsi:type="dg:Text" data="«information»
InformationItem1" anchor="middle"> - <bounds x="36.0" y="161.0" width="117.0" height="27.0"/> + <member xsi:type="dg:Text" data="Class4" anchor="middle"> + <bounds x="298.0" y="225.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> @@ -2902,48 +3203,40 @@ <bounds x="35.0" y="254.0" width="114.0" height="40.0"/> </member> <member xsi:type="dg:Text" data="«information»
InformationItem2" anchor="middle"> - <bounds x="36.0" y="261.0" width="114.0" height="27.0"/> + <bounds x="46.0" y="261.0" width="94.0" height="27.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="494.0" y="227.0" width="20.0" height="20.0"/> + <bounds x="267.0" y="70.0" width="100.0" height="43.0"/> </member> - <member xsi:type="dg:Text" data="DurationObservation1" anchor="middle"> - <bounds x="449.0" y="252.0" width="122.0" height="13.0"/> + <member xsi:type="dg:Text" data="Class3" anchor="middle"> + <bounds x="300.0" y="85.0" width="36.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> - <bounds x="434.0" y="82.0" width="20.0" height="20.0"/> - </member> + <member xsi:type="dg:Group"/> <member xsi:type="dg:Text" data="TimeObservation1" anchor="middle"> - <bounds x="459.0" y="85.0" width="102.0" height="13.0"/> + <bounds x="433.0" y="69.0" width="102.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/5/@definitions/@definition.2"> - <class>dashed</class> + <member xsi:type="dg:Path"> + <class>dotted</class> <command xsi:type="dg:MoveTo"> - <point x="141.0" y="91.0"/> + <point x="434.0" y="94.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="267.0" y="91.0"/> + <point x="367.0" y="94.0"/> </command> </member> - <member xsi:type="dg:Text" data="«flow»
InformationFlow1" anchor="middle"> - <bounds x="185.0" y="65.0" width="34.0" height="13.0"/> - </member> - <member xsi:type="dg:Text" data="DataType1" anchor="middle"> - <bounds x="170.0" y="102.0" width="58.0" height="13.0"/> - </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/5/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/5/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> <point x="315.0" y="113.0"/> @@ -2953,9 +3246,9 @@ </command> </member> <member xsi:type="dg:Text" data="«flow»
InformationFlow1" anchor="middle"> - <bounds x="240.0" y="162.0" width="34.0" height="13.0"/> + <bounds x="257.0" y="168.0" width="0.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="InformationItem1, DataType1" anchor="middle"> + <member xsi:type="dg:Text" data="DataType1, InformationItem1" anchor="middle"> <bounds x="321.0" y="163.0" width="158.0" height="13.0"/> </member> </member> @@ -2964,24 +3257,30 @@ <member xsi:type="dg:Path"> <class>dotted</class> <command xsi:type="dg:MoveTo"> - <point x="434.0" y="94.0"/> + <point x="494.0" y="232.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="367.0" y="94.0"/> + <point x="365.0" y="232.0"/> </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path"> - <class>dotted</class> + <member xsi:type="dg:Path" endMarker="/5/@definitions/@definition.4"> + <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="494.0" y="232.0"/> + <point x="141.0" y="91.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="365.0" y="232.0"/> + <point x="267.0" y="91.0"/> </command> </member> + <member xsi:type="dg:Text" data="«flow»
InformationFlow1" anchor="middle"> + <bounds x="202.0" y="71.0" width="0.0" height="13.0"/> + </member> + <member xsi:type="dg:Text" data="DataType1" anchor="middle"> + <bounds x="170.0" y="102.0" width="58.0" height="13.0"/> + </member> </member> <definitions> <definition xsi:type="dg:Marker" id="endHollowClosedArrow"> @@ -3008,6 +3307,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -3017,6 +3340,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -3032,6 +3364,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -3190,6 +3540,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -3360,16 +3720,25 @@ <dg:RootCanvas id="Packages"> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Rectangle"> + <bounds x="433.0" y="339.0" width="100.0" height="50.0"/> + </member> + <member xsi:type="dg:Text" data="Class3" anchor="middle"> + <bounds x="466.0" y="357.0" width="36.0" height="13.0"/> + </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> - <bounds x="23.0" y="14.0" width="71.0" height="19.0"/> + <bounds x="23.0" y="33.0" width="783.0" height="234.0"/> </member> <member xsi:type="dg:Rectangle"> - <bounds x="23.0" y="33.0" width="783.0" height="235.0"/> + <bounds x="23.0" y="14.0" width="62.0" height="19.0"/> </member> </member> <member xsi:type="dg:Text" data="Package1" anchor="middle"> - <bounds x="33.0" y="19.0" width="51.0" height="13.0"/> + <bounds x="28.0" y="17.0" width="51.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> @@ -3381,19 +3750,19 @@ <member xsi:type="dg:Rectangle"> <bounds x="50.0" y="52.0" width="100.0" height="100.0"/> </member> + <member xsi:type="dg:Text" data="Class1" anchor="middle"> + <bounds x="82.0" y="55.0" width="36.0" height="13.0"/> + </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="51.0" y="111.0"/> - <end x="151.0" y="111.0"/> + <start x="50.0" y="111.0"/> + <end x="150.0" y="111.0"/> </member> </member> - <member xsi:type="dg:Text" data="Class1" anchor="middle"> - <bounds x="83.0" y="55.0" width="36.0" height="13.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="51.0" y="69.0"/> - <end x="151.0" y="69.0"/> + <start x="50.0" y="69.0"/> + <end x="150.0" y="69.0"/> </member> </member> </member> @@ -3403,18 +3772,18 @@ <bounds x="162.0" y="50.0" width="100.0" height="100.0"/> </member> <member xsi:type="dg:Text" data="«component»
Component1" anchor="middle"> - <bounds x="163.0" y="53.0" width="100.0" height="27.0"/> + <bounds x="175.0" y="53.0" width="74.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="163.0" y="81.0"/> - <end x="263.0" y="81.0"/> + <start x="162.0" y="116.0"/> + <end x="262.0" y="116.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="163.0" y="116.0"/> - <end x="263.0" y="116.0"/> + <start x="162.0" y="81.0"/> + <end x="262.0" y="81.0"/> </member> </member> </member> @@ -3423,19 +3792,19 @@ <member xsi:type="dg:Rectangle"> <bounds x="279.0" y="50.0" width="100.0" height="100.0"/> </member> - <member xsi:type="dg:Text" data="«datatype»
DataType1" anchor="middle"> - <bounds x="280.0" y="53.0" width="100.0" height="27.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="280.0" y="116.0"/> - <end x="380.0" y="116.0"/> + <start x="279.0" y="116.0"/> + <end x="379.0" y="116.0"/> </member> </member> + <member xsi:type="dg:Text" data="«datatype»
DataType1" anchor="middle"> + <bounds x="298.0" y="53.0" width="62.0" height="27.0"/> + </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="280.0" y="81.0"/> - <end x="380.0" y="81.0"/> + <start x="279.0" y="81.0"/> + <end x="379.0" y="81.0"/> </member> </member> </member> @@ -3444,34 +3813,34 @@ <member xsi:type="dg:Rectangle"> <bounds x="395.0" y="51.0" width="100.0" height="100.0"/> </member> - <member xsi:type="dg:Text" data="«enumeration»
Enumeration1" anchor="middle"> - <bounds x="396.0" y="54.0" width="100.0" height="27.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="396.0" y="82.0"/> - <end x="496.0" y="82.0"/> + <start x="395.0" y="82.0"/> + <end x="495.0" y="82.0"/> </member> </member> + <member xsi:type="dg:Text" data="«enumeration»
Enumeration1" anchor="middle"> + <bounds x="405.0" y="54.0" width="79.0" height="27.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> <bounds x="517.0" y="57.0" width="100.0" height="100.0"/> </member> + <member xsi:type="dg:Text" data="«interface»
Interface1" anchor="middle"> + <bounds x="537.0" y="60.0" width="59.0" height="27.0"/> + </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="518.0" y="123.0"/> - <end x="618.0" y="123.0"/> + <start x="517.0" y="123.0"/> + <end x="617.0" y="123.0"/> </member> </member> - <member xsi:type="dg:Text" data="«interface»
Interface1" anchor="middle"> - <bounds x="518.0" y="60.0" width="100.0" height="27.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="518.0" y="88.0"/> - <end x="618.0" y="88.0"/> + <start x="517.0" y="88.0"/> + <end x="617.0" y="88.0"/> </member> </member> </member> @@ -3482,33 +3851,33 @@ </member> <member xsi:type="dg:Text" data="InstanceSpecification1" anchor="middle"> <class>underlined</class> - <bounds x="648.0" y="59.0" width="119.0" height="13.0"/> + <bounds x="647.0" y="59.0" width="119.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="641.0" y="73.0"/> - <end x="775.0" y="73.0"/> + <start x="640.0" y="73.0"/> + <end x="774.0" y="73.0"/> </member> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="221.0" y="164.0" width="100.0" height="50.0"/> + <bounds x="221.0" y="164.0" width="100.0" height="77.0"/> </member> <member xsi:type="dg:Text" data="«primitive»
PrimitiveType1" anchor="middle"> - <bounds x="222.0" y="167.0" width="100.0" height="27.0"/> + <bounds x="229.0" y="167.0" width="84.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="222.0" y="205.0"/> - <end x="322.0" y="205.0"/> + <start x="221.0" y="219.0"/> + <end x="321.0" y="219.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="222.0" y="195.0"/> - <end x="322.0" y="195.0"/> + <start x="221.0" y="195.0"/> + <end x="321.0" y="195.0"/> </member> </member> </member> @@ -3516,28 +3885,28 @@ <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> - <bounds x="37.0" y="187.0" width="75.0" height="19.0"/> + <bounds x="37.0" y="206.0" width="149.0" height="46.0"/> </member> <member xsi:type="dg:Rectangle"> - <bounds x="37.0" y="206.0" width="149.0" height="47.0"/> + <bounds x="37.0" y="187.0" width="66.0" height="19.0"/> </member> <member xsi:type="dg:Path"> <command xsi:type="dg:MoveTo"> - <point x="102.0" y="192.0"/> + <point x="92.0" y="192.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="97.0" y="200.0"/> + <point x="87.0" y="200.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="107.0" y="200.0"/> + <point x="97.0" y="200.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="102.0" y="192.0"/> + <point x="92.0" y="192.0"/> </command> </member> </member> <member xsi:type="dg:Text" data="Model1" anchor="middle"> - <bounds x="47.0" y="192.0" width="40.0" height="13.0"/> + <bounds x="42.0" y="190.0" width="40.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> @@ -3550,14 +3919,14 @@ <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> - <bounds x="358.0" y="189.0" width="71.0" height="19.0"/> + <bounds x="358.0" y="208.0" width="181.0" height="43.0"/> </member> <member xsi:type="dg:Rectangle"> - <bounds x="358.0" y="208.0" width="181.0" height="44.0"/> + <bounds x="358.0" y="189.0" width="62.0" height="19.0"/> </member> </member> <member xsi:type="dg:Text" data="Package1" anchor="middle"> - <bounds x="368.0" y="194.0" width="51.0" height="13.0"/> + <bounds x="363.0" y="192.0" width="51.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> @@ -3571,15 +3940,15 @@ <member xsi:type="dg:Rectangle"> <bounds x="666.0" y="179.0" width="112.0" height="69.0"/> </member> + <member xsi:type="dg:Text" data="«signal»
Signal1" anchor="middle"> + <bounds x="700.0" y="182.0" width="44.0" height="27.0"/> + </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="667.0" y="210.0"/> - <end x="779.0" y="210.0"/> + <start x="666.0" y="210.0"/> + <end x="778.0" y="210.0"/> </member> </member> - <member xsi:type="dg:Text" data="«signal»
Signal1" anchor="middle"> - <bounds x="667.0" y="182.0" width="112.0" height="27.0"/> - </member> </member> </member> </member> @@ -3587,28 +3956,28 @@ <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> - <bounds x="24.0" y="337.0" width="75.0" height="19.0"/> + <bounds x="24.0" y="356.0" width="256.0" height="64.0"/> </member> <member xsi:type="dg:Rectangle"> - <bounds x="24.0" y="356.0" width="256.0" height="65.0"/> + <bounds x="24.0" y="337.0" width="66.0" height="19.0"/> </member> <member xsi:type="dg:Path"> <command xsi:type="dg:MoveTo"> - <point x="89.0" y="342.0"/> + <point x="79.0" y="342.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="84.0" y="350.0"/> + <point x="74.0" y="350.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="94.0" y="350.0"/> + <point x="84.0" y="350.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="89.0" y="342.0"/> + <point x="79.0" y="342.0"/> </command> </member> </member> <member xsi:type="dg:Text" data="Model1" anchor="middle"> - <bounds x="34.0" y="342.0" width="40.0" height="13.0"/> + <bounds x="29.0" y="340.0" width="40.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> @@ -3620,15 +3989,6 @@ <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="433.0" y="339.0" width="100.0" height="50.0"/> - </member> - <member xsi:type="dg:Text" data="Class3" anchor="middle"> - <bounds x="466.0" y="357.0" width="36.0" height="13.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Rectangle"> <bounds x="435.0" y="400.0" width="100.0" height="50.0"/> </member> <member xsi:type="dg:Text" data="Class4" anchor="middle"> @@ -3637,51 +3997,34 @@ </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" startMarker="/6/@definitions/@definition.10"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.0"> + <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="278.0" y="366.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="297.0" y="366.0"/> + <point x="690.0" y="248.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="433.0" y="366.0"/> + <point x="533.0" y="352.0"/> </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="461.0" y="267.0"/> + <point x="666.0" y="218.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="477.0" y="339.0"/> - </command> - </member> - <member xsi:type="dg:Text" data="«import»

Class33" anchor="middle"> - <bounds x="505.0" y="300.0" width="0.0" height="13.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> - <class>dashed</class> - <command xsi:type="dg:MoveTo"> - <point x="59.0" y="267.0"/> + <point x="567.0" y="218.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="84.0" y="337.0"/> + <point x="567.0" y="157.0"/> </command> </member> - <member xsi:type="dg:Text" data="«import»
" anchor="middle"> - <bounds x="42.0" y="309.0" width="0.0" height="13.0"/> - </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> <point x="234.0" y="267.0"/> @@ -3691,96 +4034,107 @@ </command> </member> <member xsi:type="dg:Text" data="«merge»
" anchor="middle"> - <bounds x="266.0" y="303.0" width="0.0" height="13.0"/> + <bounds x="243.0" y="297.0" width="46.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" startMarker="/6/@definitions/@definition.10"> + <style fontSize="9.0" fontName="Segoe UI"/> + <member xsi:type="dg:Path" startMarker="/6/@definitions/@definition.14"> <command xsi:type="dg:MoveTo"> - <point x="279.0" y="399.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="298.0" y="402.0"/> + <point x="280.0" y="401.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="435.0" y="418.0"/> + <point x="435.0" y="416.0"/> </command> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="692.0" y="267.0"/> + <point x="442.0" y="339.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="692.0" y="424.0"/> - </command> - <command xsi:type="dg:LineTo"> - <point x="535.0" y="424.0"/> + <point x="285.0" y="241.0"/> </command> </member> - <member xsi:type="dg:Text" data="«access»

Class44" anchor="middle"> - <bounds x="638.0" y="386.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="«abstraction»
Abstraction2" anchor="middle"> + <bounds x="305.0" y="295.0" width="72.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="152.0" y="267.0"/> + <point x="59.0" y="267.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="152.0" y="356.0"/> + <point x="84.0" y="336.0"/> </command> </member> - <member xsi:type="dg:Text" data="«element import»

Model1" anchor="middle"> - <bounds x="186.0" y="301.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="«import»
" anchor="middle"> + <bounds x="43.0" y="309.0" width="0.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> - <class>dashed</class> + <style fontSize="9.0" fontName="Segoe UI"/> + <member xsi:type="dg:Path" startMarker="/6/@definitions/@definition.14"> <command xsi:type="dg:MoveTo"> - <point x="666.0" y="218.0"/> + <point x="280.0" y="372.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="567.0" y="218.0"/> + <point x="433.0" y="362.0"/> + </command> + </member> + </member> + <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Lucida Grande"/> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> + <class>dashed</class> + <command xsi:type="dg:MoveTo"> + <point x="152.0" y="267.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="567.0" y="157.0"/> + <point x="152.0" y="356.0"/> </command> </member> + <member xsi:type="dg:Text" data="«element import»
Model1" anchor="middle"> + <bounds x="162.0" y="295.0" width="48.0" height="13.0"/> + </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.2"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="449.0" y="339.0"/> + <point x="461.0" y="267.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="284.0" y="214.0"/> + <point x="477.0" y="339.0"/> </command> </member> - <member xsi:type="dg:Text" data="«abstraction»
Abstraction2" anchor="middle"> - <bounds x="342.0" y="285.0" width="0.0" height="13.0"/> + <member xsi:type="dg:Text" data="«import»
Class33" anchor="middle"> + <bounds x="481.0" y="294.0" width="48.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> - <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.0"> + <member xsi:type="dg:Path" endMarker="/6/@definitions/@definition.4"> <class>dashed</class> <command xsi:type="dg:MoveTo"> - <point x="690.0" y="248.0"/> + <point x="692.0" y="267.0"/> </command> <command xsi:type="dg:LineTo"> - <point x="533.0" y="352.0"/> + <point x="692.0" y="424.0"/> </command> + <command xsi:type="dg:LineTo"> + <point x="535.0" y="424.0"/> + </command> + </member> + <member xsi:type="dg:Text" data="«access»
Class44" anchor="middle"> + <bounds x="614.0" y="380.0" width="48.0" height="13.0"/> </member> </member> <definitions> @@ -3808,6 +4162,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -3817,6 +4195,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -3832,6 +4219,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -3990,6 +4395,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -4159,53 +4574,62 @@ </dg:RootCanvas> <dg:RootCanvas id="Templates"> <member xsi:type="dg:Group"> + <style fontSize="11.0" fontName="Segoe UI"/> + <member xsi:type="dg:Rectangle"> + <bounds x="429.0" y="284.0" width="100.0" height="47.0"/> + </member> + <member xsi:type="dg:Text" data="«interface»
Interface2" anchor="middle"> + <bounds x="450.0" y="294.0" width="59.0" height="27.0"/> + </member> + </member> + <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Rectangle"> - <bounds x="42.0" y="58.0" width="183.0" height="100.0"/> + <bounds x="49.0" y="55.0" width="183.0" height="100.0"/> + </member> + <member xsi:type="dg:Text" data="Class6" anchor="middle"> + <bounds x="122.0" y="58.0" width="36.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="43.0" y="75.0"/> - <end x="226.0" y="75.0"/> + <start x="49.0" y="72.0"/> + <end x="232.0" y="72.0"/> </member> - <member xsi:type="dg:Text" data="+ Attribute1 : Integer [1] = p"> + <member xsi:type="dg:Text" data="+Attribute1:Integer[1]=4"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="48.0" y="77.0" width="133.0" height="13.0"/> + <bounds x="54.0" y="74.0" width="133.0" height="13.0"/> </member> </member> - <member xsi:type="dg:Text" data="Class6" anchor="middle"> - <bounds x="116.0" y="61.0" width="36.0" height="13.0"/> - </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="43.0" y="108.0"/> - <end x="226.0" y="108.0"/> + <start x="49.0" y="105.0"/> + <end x="232.0" y="105.0"/> </member> - <member xsi:type="dg:Text" data="+ Operation1 ()"> + <member xsi:type="dg:Text" data="+Operation1()"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="48.0" y="110.0" width="83.0" height="13.0"/> + <bounds x="54.0" y="107.0" width="83.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="~ Operation2 () : Real"> + <member xsi:type="dg:Text" data="~Operation2():Real"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="48.0" y="123.0" width="111.0" height="13.0"/> + <bounds x="54.0" y="120.0" width="111.0" height="13.0"/> </member> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> <class>dashed</class> - <bounds x="211.0" y="48.0" width="123.0" height="48.0"/> + <bounds x="159.0" y="27.0" width="123.0" height="48.0"/> </member> - <member xsi:type="dg:Text" data="p : LiteralInteger"> + <member xsi:type="dg:Text" data="p:LiteralInteger"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="216.0" y="50.0" width="85.0" height="13.0"/> + <bounds x="164.0" y="29.0" width="85.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="Operation1 () : Operation"> + <member xsi:type="dg:Text" data="Operation1():Operation"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="216.0" y="63.0" width="68.0" height="13.0"/> + <bounds x="164.0" y="42.0" width="68.0" height="13.0"/> </member> - <member xsi:type="dg:Text" data="Attribute1 : Property"> + <member xsi:type="dg:Text" data="Attribute1:Property"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="216.0" y="76.0" width="107.0" height="13.0"/> + <bounds x="164.0" y="55.0" width="107.0" height="13.0"/> </member> </member> </member> @@ -4213,14 +4637,14 @@ <style fontSize="11.0" fontName="Lucida Grande"/> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> - <bounds x="46.0" y="205.0" width="71.0" height="19.0"/> + <bounds x="46.0" y="224.0" width="200.0" height="81.0"/> </member> <member xsi:type="dg:Rectangle"> - <bounds x="46.0" y="224.0" width="200.0" height="82.0"/> + <bounds x="46.0" y="205.0" width="62.0" height="19.0"/> </member> </member> <member xsi:type="dg:Text" data="Package1" anchor="middle"> - <bounds x="56.0" y="210.0" width="51.0" height="13.0"/> + <bounds x="51.0" y="208.0" width="51.0" height="13.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> @@ -4231,11 +4655,11 @@ <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> <class>dashed</class> - <bounds x="236.0" y="205.0" width="124.0" height="36.0"/> + <bounds x="172.0" y="198.0" width="124.0" height="36.0"/> </member> - <member xsi:type="dg:Text" data="Interface1 : Interface"> + <member xsi:type="dg:Text" data="Interface1:Interface"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="241.0" y="207.0" width="108.0" height="13.0"/> + <bounds x="177.0" y="200.0" width="108.0" height="13.0"/> </member> </member> </member> @@ -4246,39 +4670,30 @@ </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Line"> - <start x="386.0" y="106.0"/> - <end x="573.0" y="106.0"/> + <start x="385.0" y="106.0"/> + <end x="572.0" y="106.0"/> </member> - <member xsi:type="dg:Text" data="+ Attribute1 : Integer [0..max]"> + <member xsi:type="dg:Text" data="+Attribute1:Integer[0..1]"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="391.0" y="108.0" width="147.0" height="13.0"/> + <bounds x="390.0" y="108.0" width="147.0" height="13.0"/> </member> </member> <member xsi:type="dg:Text" data="«component»
Component2" anchor="middle"> - <bounds x="386.0" y="78.0" width="187.0" height="27.0"/> + <bounds x="441.0" y="78.0" width="74.0" height="27.0"/> </member> <member xsi:type="dg:Group"> <member xsi:type="dg:Rectangle"> <class>dashed</class> - <bounds x="562.0" y="72.0" width="170.0" height="36.0"/> + <bounds x="471.0" y="45.0" width="170.0" height="36.0"/> </member> - <member xsi:type="dg:Text" data="max : LiteralUnlimitedNatural"> + <member xsi:type="dg:Text" data="max:LiteralUnlimitedNatural"> <style fontSize="11.0" fontName="Lucida Grande"/> - <bounds x="567.0" y="74.0" width="154.0" height="13.0"/> + <bounds x="476.0" y="47.0" width="154.0" height="13.0"/> </member> </member> </member> <member xsi:type="dg:Group"> <style fontSize="11.0" fontName="Segoe UI"/> - <member xsi:type="dg:Rectangle"> - <bounds x="429.0" y="284.0" width="100.0" height="47.0"/> - </member> - <member xsi:type="dg:Text" data="«interface»
Interface2" anchor="middle"> - <bounds x="430.0" y="294.0" width="100.0" height="27.0"/> - </member> - </member> - <member xsi:type="dg:Group"> - <style fontSize="11.0" fontName="Segoe UI"/> <member xsi:type="dg:Path" endMarker="/7/@definitions/@definition.0"> <class>dashed</class> <command xsi:type="dg:MoveTo"> @@ -4288,7 +4703,7 @@ <point x="246.0" y="279.0"/> </command> </member> - <member xsi:type="dg:Text" data="«bind»

Interface1 -> Interface2" anchor="middle"> + <member xsi:type="dg:Text" data="«bind»
Interface1->Interface2" anchor="middle"> <bounds x="272.0" y="301.0" width="130.0" height="26.0"/> </member> </member> @@ -4317,6 +4732,30 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="midSolidClosedArrow"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="12.0" height="12.0"/> + <reference x="6.0" y="6.0"/> + </definition> + <definition xsi:type="dg:Marker" id="endSolidClosedArrowSmall"> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endOpenArrow"> <member xsi:type="dg:Polyline"> <point x="1.0" y="1.0"/> @@ -4326,6 +4765,15 @@ <size width="12.0" height="12.0"/> <reference x="12.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endOpenArrowSmall"> + <member xsi:type="dg:Polyline"> + <point x="1.0" y="1.0"/> + <point x="8.0" y="4.0"/> + <point x="1.0" y="7.0"/> + </member> + <size width="8.0" height="8.0"/> + <reference x="8.0" y="4.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidCircleOpenArrow"> <member xsi:type="dg:Circle" radius="3.0"> <style> @@ -4341,6 +4789,24 @@ <size width="20.0" height="12.0"/> <reference x="20.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="endSolidCircleSolidClosedArrow"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="16.0" y="6.0"/> + </member> + <member xsi:type="dg:Polygon"> + <style> + <fill color="#000000"/> + </style> + <point x="1.0" y="1.0"/> + <point x="12.0" y="6.0"/> + <point x="1.0" y="11.0"/> + </member> + <size width="20.0" height="12.0"/> + <reference x="20.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="endSolidDiamond"> <member xsi:type="dg:Polygon"> <style> @@ -4499,6 +4965,16 @@ <size width="20.0" height="12.0"/> <reference x="0.0" y="6.0"/> </definition> + <definition xsi:type="dg:Marker" id="startSolidCircle"> + <member xsi:type="dg:Circle" radius="3.0"> + <style> + <fill color="#000000"/> + </style> + <center x="3.0" y="6.0"/> + </member> + <size width="7.0" height="12.0"/> + <reference x="0.0" y="6.0"/> + </definition> <definition xsi:type="dg:Marker" id="startSolidDiamond"> <member xsi:type="dg:Polygon"> <style> |