[dia] Updated diagram to make it look better with dia-0-97
- From: Hans Breuer <hans src gnome org>
- To: svn-commits-list gnome org
- Subject: [dia] Updated diagram to make it look better with dia-0-97
- Date: Sat, 6 Jun 2009 14:03:58 -0400 (EDT)
commit 2f5b6b526c1272c65c71701d93efa9d5e3dc65ce
Author: Hans Breuer <hans breuer org>
Date: Sat Jun 6 20:05:19 2009 +0200
Updated diagram to make it look better with dia-0-97
---
samples/Self/umlclass.dia | 1367 ++++++++++++++++++++++++---------------------
1 files changed, 736 insertions(+), 631 deletions(-)
diff --git a/samples/Self/umlclass.dia b/samples/Self/umlclass.dia
index d7c3263..579f7c4 100644
--- a/samples/Self/umlclass.dia
+++ b/samples/Self/umlclass.dia
@@ -62,22 +62,22 @@
</dia:composite>
</dia:attribute>
</dia:diagramdata>
- <dia:layer name="Background" visible="true">
+ <dia:layer name="Background" visible="true" active="true">
<dia:object type="UML - Class" version="0" id="O0">
<dia:attribute name="obj_pos">
<dia:point val="2,18"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1.95,17.95;22.15,31.05"/>
+ <dia:rectangle val="1.95,17.95;21.31,29.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="2,18"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="20.100000000000001"/>
+ <dia:real val="19.259999999999998"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="13"/>
+ <dia:real val="11.600000000000001"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#UMLClass#</dia:string>
@@ -112,9 +112,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -125,31 +131,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -610,16 +616,16 @@
<dia:point val="28.1,19"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="28.05,18.95;40.9,24.25"/>
+ <dia:rectangle val="28.05,18.95;40.375,23.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="28.1,19"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="12.75"/>
+ <dia:real val="12.225"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="5.2000000000000011"/>
+ <dia:real val="4.8000000000000007"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#UMLAttribute#</dia:string>
@@ -654,9 +660,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -667,31 +679,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -807,16 +819,16 @@
<dia:point val="46,16"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.95,15.95;57.05,21.25"/>
+ <dia:rectangle val="45.95,15.95;56.6,20.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="46,16"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11"/>
+ <dia:real val="10.550000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="5.2000000000000011"/>
+ <dia:real val="4.8000000000000007"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#ConnectionPoint#</dia:string>
@@ -851,9 +863,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -864,31 +882,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1004,16 +1022,16 @@
<dia:point val="28,26"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,25.95;40.8,31.25"/>
+ <dia:rectangle val="27.95,25.95;40.275,30.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="28,26"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="12.75"/>
+ <dia:real val="12.225"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="5.2000000000000011"/>
+ <dia:real val="4.8000000000000007"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#UMLOperation#</dia:string>
@@ -1048,9 +1066,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1061,31 +1085,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1201,16 +1225,16 @@
<dia:point val="28,33"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,32.95;36.85,36.65"/>
+ <dia:rectangle val="27.95,32.95;36.8625,36.45"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="28,33"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="8.8000000000000007"/>
+ <dia:real val="8.8125"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="3.6000000000000001"/>
+ <dia:real val="3.3999999999999999"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#UMLFormalParameter#</dia:string>
@@ -1245,9 +1269,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1258,31 +1288,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1352,13 +1382,13 @@
<dia:point val="30,12"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.95,11.95;36.8,14.25"/>
+ <dia:rectangle val="29.95,11.95;36.8075,14.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="30,12"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.75"/>
+ <dia:real val="6.7575000000000003"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="2.1999999999999997"/>
@@ -1396,9 +1426,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1409,31 +1445,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1456,16 +1492,16 @@
<dia:point val="28,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,4.95;40.1,9.45"/>
+ <dia:rectangle val="27.95,4.95;39.605,9.15"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="28,5"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="12.050000000000001"/>
+ <dia:real val="11.555"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="4.4000000000000004"/>
+ <dia:real val="4.1000000000000005"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#OrthConn#</dia:string>
@@ -1500,9 +1536,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1513,31 +1555,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1627,16 +1669,19 @@
</dia:object>
<dia:object type="UML - Generalization" version="1" id="O7">
<dia:attribute name="obj_pos">
- <dia:point val="34.025,9.4"/>
+ <dia:point val="33.7775,9.1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="33.175,9.35;34.875,12.05"/>
+ <dia:rectangle val="32.9275,9.05;34.6275,12.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="34.025,9.4"/>
- <dia:point val="34.025,11"/>
- <dia:point val="33.375,11"/>
- <dia:point val="33.375,12"/>
+ <dia:point val="33.7775,9.1"/>
+ <dia:point val="33.7775,11"/>
+ <dia:point val="33.3787,11"/>
+ <dia:point val="33.3787,12"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -1646,6 +1691,9 @@
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1665,16 +1713,16 @@
<dia:point val="46,4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="45.95,3.95;57.75,10.05"/>
+ <dia:rectangle val="45.95,3.95;57.27,9.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="46,4"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.699999999999999"/>
+ <dia:real val="11.220000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="6"/>
+ <dia:real val="5.5000000000000009"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Handle#</dia:string>
@@ -1709,9 +1757,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -1722,31 +1776,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -1880,84 +1934,126 @@
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O9">
+ <dia:object type="UML - Association" version="2" id="O9">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>#2..n#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="46,4.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="39.3,4.65;46.05,9.35"/>
+ <dia:rectangle val="38.805,4.65;46.05,9.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="46,4.7"/>
<dia:point val="44,4.7"/>
- <dia:point val="44,8.5"/>
- <dia:point val="40.05,8.5"/>
+ <dia:point val="44,8.25"/>
+ <dia:point val="39.555,8.25"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#2..n#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O8" connection="3"/>
<dia:connection handle="1" to="O6" connection="13"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O10">
+ <dia:object type="UML - Association" version="2" id="O10">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#8..9#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="22.1,19.9"/>
+ <dia:point val="21.26,19.85"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.35,16.65;46.05,20.75"/>
+ <dia:rectangle val="20.51,16.65;46.05,20.65"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="22.1,19.9"/>
- <dia:point val="26,19.9"/>
+ <dia:point val="21.26,19.85"/>
+ <dia:point val="26,19.85"/>
<dia:point val="26,16.7"/>
<dia:point val="46,16.7"/>
</dia:attribute>
@@ -1966,66 +2062,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#8..9#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="9"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O11">
+ <dia:object type="UML - Association" version="2" id="O11">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#0..n#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="22.1,22.3"/>
+ <dia:point val="21.26,21.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.35,19.65;28.15,23.15"/>
+ <dia:rectangle val="20.51,19.65;28.15,22.75"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="22.1,22.3"/>
- <dia:point val="27,22.3"/>
+ <dia:point val="21.26,21.95"/>
+ <dia:point val="27,21.95"/>
<dia:point val="27,19.7"/>
<dia:point val="28.1,19.7"/>
</dia:attribute>
@@ -2034,66 +2133,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..n#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="15"/>
<dia:connection handle="1" to="O1" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O12">
+ <dia:object type="UML - Association" version="2" id="O12">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#0..n#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="22.1,23.1"/>
+ <dia:point val="21.26,22.65"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.35,22.35;28.05,28.3"/>
+ <dia:rectangle val="20.51,21.85;28.05,28.3"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="22.1,23.1"/>
- <dia:point val="26,23.1"/>
+ <dia:point val="21.26,22.65"/>
+ <dia:point val="26,22.65"/>
<dia:point val="26,26.7"/>
<dia:point val="28,26.7"/>
</dia:attribute>
@@ -2102,66 +2204,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..n#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="17"/>
<dia:connection handle="1" to="O3" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O13">
+ <dia:object type="UML - Association" version="2" id="O13">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#0..n#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="22.1,23.9"/>
+ <dia:point val="21.26,23.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="21.35,23.15;28.05,35.3"/>
+ <dia:rectangle val="20.51,22.55;28.05,35.3"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="22.1,23.9"/>
- <dia:point val="25,23.9"/>
+ <dia:point val="21.26,23.35"/>
+ <dia:point val="25,23.35"/>
<dia:point val="25,33.7"/>
<dia:point val="28,33.7"/>
</dia:attribute>
@@ -2170,66 +2275,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..n#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O0" connection="19"/>
<dia:connection handle="1" to="O4" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O14">
+ <dia:object type="UML - Association" version="2" id="O14">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="40.85,22.5"/>
+ <dia:point val="40.325,22.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40.1,16.65;46.05,23.35"/>
+ <dia:rectangle val="39.575,16.65;46.05,23.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="40.85,22.5"/>
- <dia:point val="43,22.5"/>
+ <dia:point val="40.325,22.25"/>
+ <dia:point val="43,22.25"/>
<dia:point val="43,16.7"/>
<dia:point val="46,16.7"/>
</dia:attribute>
@@ -2238,66 +2346,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="13"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O15">
+ <dia:object type="UML - Association" version="2" id="O15">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="40.85,23.3"/>
+ <dia:point val="40.325,22.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40.1,16.65;46.05,24.15"/>
+ <dia:rectangle val="39.575,16.65;46.05,23.75"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="40.85,23.3"/>
- <dia:point val="43,23.3"/>
+ <dia:point val="40.325,22.95"/>
+ <dia:point val="43,22.95"/>
<dia:point val="43,16.7"/>
<dia:point val="46,16.7"/>
</dia:attribute>
@@ -2306,66 +2417,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="15"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O16">
+ <dia:object type="UML - Association" version="2" id="O16">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="40.75,29.5"/>
+ <dia:point val="40.225,29.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40,16.65;46.05,30.35"/>
+ <dia:rectangle val="39.475,16.65;46.05,30.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="40.75,29.5"/>
- <dia:point val="44,29.5"/>
+ <dia:point val="40.225,29.25"/>
+ <dia:point val="44,29.25"/>
<dia:point val="44,16.7"/>
<dia:point val="46,16.7"/>
</dia:attribute>
@@ -2374,66 +2488,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="13"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O17">
+ <dia:object type="UML - Association" version="2" id="O17">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="40.75,30.3"/>
+ <dia:point val="40.225,29.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="40,16.65;46.05,31.15"/>
+ <dia:rectangle val="39.475,16.65;46.05,30.75"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="40.75,30.3"/>
- <dia:point val="44,30.3"/>
+ <dia:point val="40.225,29.95"/>
+ <dia:point val="44,29.95"/>
<dia:point val="44,16.7"/>
<dia:point val="46,16.7"/>
</dia:attribute>
@@ -2442,66 +2559,69 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O3" connection="15"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O18">
+ <dia:object type="UML - Association" version="2" id="O18">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="2"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="true"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="57,19.5"/>
+ <dia:point val="56.55,19.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="0.95,1.25;59.05,20.35"/>
+ <dia:rectangle val="0.95,1.2;59.05,20.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="57,19.5"/>
- <dia:point val="59,19.5"/>
+ <dia:point val="56.55,19.25"/>
+ <dia:point val="59,19.25"/>
<dia:point val="59,2"/>
<dia:point val="1,2"/>
<dia:point val="1,3.7"/>
@@ -2514,50 +2634,14 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="2"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O2" connection="13"/>
@@ -2569,16 +2653,16 @@
<dia:point val="2,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="1.95,2.95;13.75,8.05"/>
+ <dia:rectangle val="1.95,2.95;13.27,7.65"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="2,3"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.699999999999999"/>
+ <dia:real val="11.220000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="5"/>
+ <dia:real val="4.6000000000000005"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#DiaObject#</dia:string>
@@ -2613,9 +2697,15 @@
<dia:attribute name="wrap_after_char">
<dia:int val="40"/>
</dia:attribute>
- <dia:attribute name="Comment_line_length">
+ <dia:attribute name="comment_line_length">
<dia:int val="40"/>
</dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -2626,31 +2716,31 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ <dia:font family="Courier New" style="0" name="Courier"/>
</dia:attribute>
<dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ <dia:font family="Arial" style="80" name="Helvetica-Bold"/>
</dia:attribute>
<dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ <dia:font family="Arial" style="88" name="Helvetica-BoldOblique"/>
</dia:attribute>
<dia:attribute name="comment_font">
<dia:font family="sans" style="8" name="Helvetica-Oblique"/>
</dia:attribute>
<dia:attribute name="normal_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.70000000000000007"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -2771,16 +2861,19 @@
</dia:object>
<dia:object type="UML - Generalization" version="1" id="O20">
<dia:attribute name="obj_pos">
- <dia:point val="7.85,8"/>
+ <dia:point val="7.61,7.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7,7.95;12.1,18.05"/>
+ <dia:rectangle val="6.76,7.55;11.68,18.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.85,8"/>
- <dia:point val="7.85,12"/>
- <dia:point val="12.05,12"/>
- <dia:point val="12.05,18"/>
+ <dia:point val="7.61,7.6"/>
+ <dia:point val="7.61,12"/>
+ <dia:point val="11.63,12"/>
+ <dia:point val="11.63,18"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -2790,6 +2883,9 @@
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
</dia:attribute>
@@ -2806,18 +2902,21 @@
</dia:object>
<dia:object type="UML - Generalization" version="1" id="O21">
<dia:attribute name="obj_pos">
- <dia:point val="7.85,8"/>
+ <dia:point val="7.61,7.6"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7,3.95;34.075,11.05"/>
+ <dia:rectangle val="6.76,3.95;33.8275,11.05"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.85,8"/>
- <dia:point val="7.85,11"/>
+ <dia:point val="7.61,7.6"/>
+ <dia:point val="7.61,11"/>
<dia:point val="25,11"/>
<dia:point val="25,4"/>
- <dia:point val="34.025,4"/>
- <dia:point val="34.025,5"/>
+ <dia:point val="33.7775,4"/>
+ <dia:point val="33.7775,5"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -2829,6 +2928,9 @@
<dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
+ </dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
</dia:attribute>
@@ -2843,16 +2945,55 @@
<dia:connection handle="1" to="O6" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="1" id="O22">
+ <dia:object type="UML - Association" version="2" id="O22">
+ <dia:attribute name="name">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="direction">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="show_direction">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="assoc_type">
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="role_a">
+ <dia:string>#used to (dis-)connect#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_a">
+ <dia:string>#0..n#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_a">
+ <dia:enum val="3"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_a">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="role_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="multipicity_b">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility_b">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="show_arrow_b">
+ <dia:boolean val="true"/>
+ </dia:attribute>
<dia:attribute name="obj_pos">
- <dia:point val="13.7,6.5"/>
+ <dia:point val="13.22,6.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.95,5.75;46.05,17.6"/>
+ <dia:rectangle val="12.47,5.45;46.05,17.6"/>
+ </dia:attribute>
+ <dia:attribute name="meta">
+ <dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="13.7,6.5"/>
- <dia:point val="17,6.5"/>
+ <dia:point val="13.22,6.25"/>
+ <dia:point val="17,6.25"/>
<dia:point val="17,16"/>
<dia:point val="46,16"/>
</dia:attribute>
@@ -2861,50 +3002,14 @@
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
- <dia:attribute name="autorouting">
+ <dia:attribute name="orth_autoroute">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
+ <dia:attribute name="text_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>#used to (dis-)connect#</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..n#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="3"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="line_colour">
+ <dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O19" connection="13"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
