Se agrega a Afiliado y Solicitante existe() y getNext().

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia
diff --git a/diagramas/clases.dia b/diagramas/clases.dia

index cb9ab877d94f1ee524c2afcdc28e424543a98959..69b87d6862dcf13c44af8450683f09d39db3059f 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
            <dia:boolean val="false"/>
          </dia:attribute>
          <dia:attribute name="scaling">
-          <dia:real val="0.4046272337436676"/>
+          <dia:real val="0.39678561687469482"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
          </dia:attribute>
          <dia:attribute name="fitto">
            <dia:boolean val="true"/>
@@ -438,7 +438,7 @@
          <dia:point val="23.6,22.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="23.6,22.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.55,22.7;32.3,27.6"/>
+        <dia:rectangle val="23.55,22.7;32.3,29.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="23.6,22.75"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="23.6,22.75"/>
@@ -447,7 +447,7 @@
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.6000000000000005"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Afiliado#</dia:string>
@@ -471,7 +471,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -621,7 +621,68 @@
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -632,7 +693,7 @@
          <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.875,13;1.025,15.5"/>
+        <dia:rectangle val="-4.875,13;1.025,16.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="-4.825,13.05"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
          <dia:point val="-4.825,13.05"/>
@@ -641,7 +702,7 @@
          <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
          <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="2.3999999999999999"/>
+        <dia:real val="3.2000000000000002"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Prestacion#</dia:string>
@@ -722,6 +783,29 @@
          <dia:real val="1"/>
        </dia:attribute>
        <dia:attribute name="attributes">
          <dia:real val="1"/>
        </dia:attribute>
        <dia:attribute name="attributes">
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código de la prestación según el codificador#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#nombre#</dia:string>
          <dia:composite type="umlattribute">
            <dia:attribute name="name">
              <dia:string>#nombre#</dia:string>
@@ -754,13 +838,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O4">
        <dia:attribute name="obj_pos">
-        <dia:point val="10.475,25.8"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.425,25.75;20.075,31.45"/>
+        <dia:rectangle val="11.075,26.85;20.725,32.55"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="10.475,25.8"/>
+        <dia:point val="11.125,26.9"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="9.5499999999999989"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="9.5499999999999989"/>
@@ -971,13 +1055,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O5">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.15,2.5;0.75,5.8"/>
+        <dia:rectangle val="-5.1,4.1;0.8,7.4"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
@@ -1119,19 +1203,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O6">
        <dia:attribute name="obj_pos">
-        <dia:point val="36.275,5.35"/>
+        <dia:point val="37.575,3.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="36.225,5.3;43.925,8.6"/>
+        <dia:rectangle val="37.525,3;45.225,7.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="36.275,5.35"/>
+        <dia:point val="37.575,3.05"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="4"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Cap#</dia:string>
@@ -1258,6 +1342,29 @@
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
              <dia:boolean val="false"/>
            </dia:attribute>
          </dia:composite>
+        <dia:composite type="umlattribute">
+          <dia:attribute name="name">
+            <dia:string>#codigo#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#string#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Código único para identificar al Cap (se usa para referirse al Cap en listados, etc)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
        </dia:attribute>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
        </dia:attribute>
        <dia:attribute name="operations"/>
        <dia:attribute name="template">
@@ -1267,13 +1374,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O7">
        <dia:attribute name="obj_pos">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.725,4.6;16.875,12.9"/>
+        <dia:rectangle val="5.475,6.8;16.625,15.1"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="5.775,4.65"/>
+        <dia:point val="5.525,6.85"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="11.049999999999999"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="11.049999999999999"/>
@@ -1779,19 +1886,19 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O11">
        <dia:attribute name="obj_pos">
-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="43.615,25.2;52.365,30.1"/>
+        <dia:rectangle val="43.665,24.6;52.415,31.3"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_height">
-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.6000000000000005"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>#Solicitante#</dia:string>
@@ -1815,7 +1922,7 @@
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
          <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="visible_comments">
          <dia:boolean val="false"/>
@@ -1965,7 +2072,68 @@
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
            </dia:attribute>
          </dia:composite>
        </dia:attribute>
-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
        <dia:attribute name="template">
          <dia:boolean val="false"/>
        </dia:attribute>
@@ -1976,13 +2144,13 @@
          <dia:point val="36.15,20.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="36.15,20.4"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.3,20.35;48.04,25.3"/>
+        <dia:rectangle val="35.3,20.35;48.09,24.7"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="36.15,20.4"/>
          <dia:point val="36.15,22.72"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="36.15,20.4"/>
          <dia:point val="36.15,22.72"/>
-        <dia:point val="47.99,22.72"/>
-        <dia:point val="47.99,25.25"/>
+        <dia:point val="48.04,22.72"/>
+        <dia:point val="48.04,24.65"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2008,13 +2176,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O13">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.515,20.46"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.465,20.41;20.215,23.71"/>
+        <dia:rectangle val="11.165,19.96;19.915,23.26"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="11.515,20.46"/>
+        <dia:point val="11.215,20.01"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="8.6500000000000004"/>
@@ -2156,16 +2324,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O14">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O14">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.45,12.8;15.89,20.51"/>
+        <dia:rectangle val="10.2,15;15.59,20.06"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="11.3,12.85"/>
-        <dia:point val="11.3,15.0325"/>
-        <dia:point val="15.84,15.0325"/>
-        <dia:point val="15.84,20.46"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="15.54,18.0325"/>
+        <dia:point val="15.54,20.01"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2191,13 +2359,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O15">
        <dia:attribute name="obj_pos">
-        <dia:point val="3.03,17.32"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.98,17.27;13.43,19.17"/>
+        <dia:rectangle val="-0.22,19.97;10.23,21.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="3.03,17.32"/>
+        <dia:point val="-0.17,20.02"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="10.35"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="10.35"/>
@@ -2292,16 +2460,16 @@
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Generalization" version="0" id="O16">
        <dia:attribute name="obj_pos">
-        <dia:point val="11.3,12.85"/>
+        <dia:point val="11.05,15.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.155,12.8;12.15,17.37"/>
+        <dia:rectangle val="4.955,15;11.9,20.07"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="11.3,12.85"/>
-        <dia:point val="11.3,15.0325"/>
-        <dia:point val="8.205,15.0325"/>
-        <dia:point val="8.205,17.32"/>
+        <dia:point val="11.05,15.05"/>
+        <dia:point val="11.05,18.0325"/>
+        <dia:point val="5.005,18.0325"/>
+        <dia:point val="5.005,20.02"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2521,13 +2689,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O18">
        <dia:attribute name="obj_pos">
-        <dia:point val="-4.985,21.17"/>
+        <dia:point val="-5.435,24.62"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.035,21.12;0.865,24.42"/>
+        <dia:rectangle val="-5.485,24.57;0.415,27.87"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="-4.985,21.17"/>
+        <dia:point val="-5.435,24.62"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="5.7999999999999998"/>
@@ -2672,13 +2840,13 @@
          <dia:point val="7.615,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="7.615,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.565,25.75;11.225,31.57"/>
+        <dia:rectangle val="7.565,26.85;11.875,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="7.615,30.72"/>
          <dia:point val="8.96521,30.72"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="7.615,30.72"/>
          <dia:point val="8.96521,30.72"/>
-        <dia:point val="8.96521,26.5"/>
-        <dia:point val="10.475,26.5"/>
+        <dia:point val="8.96521,27.6"/>
+        <dia:point val="11.125,27.6"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -2731,15 +2899,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O20">
        <dia:attribute name="obj_pos">
-        <dia:point val="20.025,26.5"/>
+        <dia:point val="20.675,27.6"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="19.975,25.75;23.95,27.9"/>
+        <dia:rectangle val="20.625,26.3;23.95,28.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="20.025,26.5"/>
-        <dia:point val="20.8125,26.5"/>
-        <dia:point val="20.8125,27.05"/>
+        <dia:point val="20.675,27.6"/>
+        <dia:point val="22.115,27.6"/>
+        <dia:point val="22.115,27.05"/>
          <dia:point val="23.6,27.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:point val="23.6,27.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
@@ -2795,12 +2963,12 @@
          <dia:point val="44.715,11.76"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="44.715,11.76"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.325,7.8;45.415,12.61"/>
+        <dia:rectangle val="40.625,6.3;45.415,12.61"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="44.715,11.76"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="44.715,11.76"/>
-        <dia:point val="40.075,11.76"/>
-        <dia:point val="40.075,8.55"/>
+        <dia:point val="41.375,11.76"/>
+        <dia:point val="41.375,7.05"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -2849,15 +3017,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O22">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O22">
        <dia:attribute name="obj_pos">
-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="40.15,23.5;44.365,26.1"/>
+        <dia:rectangle val="40.15,23.5;44.415,25.5"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="43.665,25.25"/>
-        <dia:point val="41.9325,25.25"/>
-        <dia:point val="41.9325,24.25"/>
+        <dia:point val="43.715,24.65"/>
+        <dia:point val="41.9575,24.65"/>
+        <dia:point val="41.9575,24.25"/>
          <dia:point val="40.2,24.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:point val="40.2,24.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
@@ -2908,16 +3076,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O23">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O23">
        <dia:attribute name="obj_pos">
-        <dia:point val="-1.925,15.45"/>
+        <dia:point val="-1.925,16.25"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.835,15.4;-0.875,21.92"/>
+        <dia:rectangle val="-3.285,16.2;-0.875,25.37"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="-1.925,15.45"/>
-        <dia:point val="-1.925,18.31"/>
-        <dia:point val="-2.085,18.31"/>
-        <dia:point val="-2.085,21.17"/>
+        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-1.925,20.435"/>
+        <dia:point val="-2.535,20.435"/>
+        <dia:point val="-2.535,24.62"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -2970,13 +3138,13 @@
          <dia:point val="-5.485,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="-5.485,30.72"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.535,14.2;-4.475,31.57"/>
+        <dia:rectangle val="-6.535,15;-4.475,31.57"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-5.485,30.72"/>
          <dia:point val="-6.485,30.72"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-5.485,30.72"/>
          <dia:point val="-6.485,30.72"/>
-        <dia:point val="-6.485,14.95"/>
-        <dia:point val="-4.825,14.95"/>
+        <dia:point val="-6.485,15.75"/>
+        <dia:point val="-4.825,15.75"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3021,7 +3189,7 @@
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O17" connection="3"/>
        </dia:attribute>
        <dia:connections>
          <dia:connection handle="0" to="O17" connection="3"/>
-        <dia:connection handle="1" to="O3" connection="8"/>
+        <dia:connection handle="1" to="O3" connection="10"/>
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O25">
        </dia:connections>
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O25">
@@ -3029,14 +3197,14 @@
          <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="-4.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.875,5;-1.45,14.6"/>
+        <dia:rectangle val="-5.875,6.6;-1.4,14.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-4.825,13.75"/>
          <dia:point val="-5.825,13.75"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="-4.825,13.75"/>
          <dia:point val="-5.825,13.75"/>
-        <dia:point val="-5.825,9.75"/>
-        <dia:point val="-2.2,9.75"/>
-        <dia:point val="-2.2,5.75"/>
+        <dia:point val="-5.825,10.55"/>
+        <dia:point val="-2.15,10.55"/>
+        <dia:point val="-2.15,7.35"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3087,14 +3255,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O26">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O26">
        <dia:attribute name="obj_pos">
-        <dia:point val="-5.1,2.55"/>
+        <dia:point val="-5.05,4.15"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.15,-1.26749;49.265,11.81"/>
+        <dia:rectangle val="-5.1,-1.26749;49.265,11.81"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="-5.1,2.55"/>
-        <dia:point val="-5.1,-0.51749"/>
+        <dia:point val="-5.05,4.15"/>
+        <dia:point val="-5.05,-0.51749"/>
          <dia:point val="48.515,-0.51749"/>
          <dia:point val="48.515,11.06"/>
        </dia:attribute>
          <dia:point val="48.515,-0.51749"/>
          <dia:point val="48.515,11.06"/>
        </dia:attribute>
@@ -3149,13 +3317,13 @@
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O27">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Class" version="0" id="O27">
        <dia:attribute name="obj_pos">
-        <dia:point val="40.015,31.0825"/>
+        <dia:point val="40.015,31.8325"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="39.965,31.0325;47.665,34.3325"/>
+        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>
        </dia:attribute>
        <dia:attribute name="elem_corner">
        </dia:attribute>
        <dia:attribute name="elem_corner">
-        <dia:point val="40.015,31.0825"/>
+        <dia:point val="40.015,31.8325"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
        </dia:attribute>
        <dia:attribute name="elem_width">
          <dia:real val="7.5999999999999996"/>
@@ -3620,20 +3788,16 @@
          <dia:point val="21.6508,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="21.6508,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.95,-0.1925;22.0008,3.3"/>
+        <dia:rectangle val="-2.9,0.8075;22.0008,4.9"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="21.6508,1.5575"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="21.6508,1.5575"/>
-        <dia:point val="20.6508,1.5575"/>
-        <dia:point val="20.6508,0.5575"/>
-        <dia:point val="-2.2,0.5575"/>
-        <dia:point val="-2.2,2.55"/>
+        <dia:point val="-2.15,1.5575"/>
+        <dia:point val="-2.15,4.15"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
          <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
        </dia:attribute>
        <dia:attribute name="name">
          <dia:string>##</dia:string>
@@ -3678,15 +3842,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O31">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O31">
        <dia:attribute name="obj_pos">
-        <dia:point val="0.7,3.25"/>
+        <dia:point val="0.75,4.85"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.65,2.5;12,6.25"/>
+        <dia:rectangle val="0.7,4.1;11.75,8.45"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="0.7,3.25"/>
-        <dia:point val="11.3,3.25"/>
-        <dia:point val="11.3,4.65"/>
+        <dia:point val="0.75,4.85"/>
+        <dia:point val="11.05,4.85"/>
+        <dia:point val="11.05,6.85"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3735,14 +3899,14 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O32">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O32">
        <dia:attribute name="obj_pos">
-        <dia:point val="16.825,5.35"/>
+        <dia:point val="16.575,7.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.775,4.6;23.95,24.3"/>
+        <dia:rectangle val="16.525,6.8;23.95,24.3"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="16.825,5.35"/>
-        <dia:point val="20.8967,5.35"/>
+        <dia:point val="16.575,7.55"/>
+        <dia:point val="20.8967,7.55"/>
          <dia:point val="20.8967,23.45"/>
          <dia:point val="23.6,23.45"/>
        </dia:attribute>
          <dia:point val="20.8967,23.45"/>
          <dia:point val="23.6,23.45"/>
        </dia:attribute>
@@ -3797,16 +3961,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O33">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O33">
        <dia:attribute name="obj_pos">
-        <dia:point val="23.6,27.55"/>
+        <dia:point val="23.6,29.35"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="22.85,26.8;34.425,34.0575"/>
+        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="23.6,27.55"/>
+        <dia:point val="23.6,29.35"/>
          <dia:point val="23.6,34.0075"/>
          <dia:point val="27.925,34.0075"/>
          <dia:point val="23.6,34.0075"/>
          <dia:point val="27.925,34.0075"/>
-        <dia:point val="27.925,27.55"/>
+        <dia:point val="27.925,29.35"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3859,16 +4023,16 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O34">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O34">
        <dia:attribute name="obj_pos">
-        <dia:point val="15.25,31.4"/>
+        <dia:point val="15.9,32.5"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="15.2,31.35;44.515,36.6825"/>
+        <dia:rectangle val="15.85,32.45;44.515,37.4325"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="15.25,31.4"/>
-        <dia:point val="15.25,35.0575"/>
-        <dia:point val="43.815,35.0575"/>
-        <dia:point val="43.815,34.2825"/>
+        <dia:point val="15.9,32.5"/>
+        <dia:point val="15.9,36.4075"/>
+        <dia:point val="43.815,36.4075"/>
+        <dia:point val="43.815,35.0325"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="1"/>
@@ -3924,13 +4088,13 @@
          <dia:point val="32.25,27.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="32.25,27.05"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.5,26.3;41.8151,32.6325"/>
+        <dia:rectangle val="31.5,26.3;41.8151,33.3825"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="32.25,27.05"/>
          <dia:point val="35.0651,27.05"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="32.25,27.05"/>
          <dia:point val="35.0651,27.05"/>
-        <dia:point val="35.0651,31.7825"/>
-        <dia:point val="40.015,31.7825"/>
+        <dia:point val="35.0651,32.5325"/>
+        <dia:point val="40.015,32.5325"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -3986,13 +4150,13 @@
          <dia:point val="32.7008,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
          <dia:point val="32.7008,1.5575"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.6508,0.8075;37.025,8.9"/>
+        <dia:rectangle val="32.6508,0.8075;38.325,6.6"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="32.7008,1.5575"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
          <dia:point val="32.7008,1.5575"/>
-        <dia:point val="34.4879,1.5575"/>
-        <dia:point val="34.4879,8.05"/>
-        <dia:point val="36.275,8.05"/>
+        <dia:point val="35.1379,1.5575"/>
+        <dia:point val="35.1379,5.75"/>
+        <dia:point val="37.575,5.75"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:enum val="0"/>
@@ -4042,15 +4206,15 @@
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O37">
        <dia:attribute name="obj_pos">
      </dia:object>
      <dia:object type="UML - Association" version="0" id="O37">
        <dia:attribute name="obj_pos">
-        <dia:point val="43.665,27.15"/>
+        <dia:point val="43.715,26.55"/>
        </dia:attribute>
        <dia:attribute name="obj_bb">
        </dia:attribute>
        <dia:attribute name="obj_bb">
-        <dia:rectangle val="32.2,25.5;44.365,28"/>
+        <dia:rectangle val="32.2,25.5;44.415,27.4"/>
        </dia:attribute>
        <dia:attribute name="orth_points">
        </dia:attribute>
        <dia:attribute name="orth_points">
-        <dia:point val="43.665,27.15"/>
-        <dia:point val="37.9575,27.15"/>
-        <dia:point val="37.9575,26.25"/>
+        <dia:point val="43.715,26.55"/>
+        <dia:point val="37.9825,26.55"/>
+        <dia:point val="37.9825,26.25"/>
          <dia:point val="32.25,26.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
          <dia:point val="32.25,26.25"/>
        </dia:attribute>
        <dia:attribute name="orth_orient">
@@ -4099,5 +4263,64 @@
          <dia:connection handle="1" to="O2" connection="13"/>
        </dia:connections>
      </dia:object>
          <dia:connection handle="1" to="O2" connection="13"/>
        </dia:connections>
      </dia:object>
+    <dia:object type="UML - Association" version="0" id="O38">
+      <dia:attribute name="obj_pos">
+        <dia:point val="5.525,7.55"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.925,6.8;5.875,14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="5.525,7.55"/>
+        <dia:point val="3.25,7.55"/>
+        <dia:point val="3.25,13.75"/>
+        <dia:point val="0.975,13.75"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </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:composite>
+        <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="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O7" connection="3"/>
+        <dia:connection handle="1" to="O3" connection="4"/>
+      </dia:connections>
+    </dia:object>
    </dia:layer>
  </dia:diagram>
    </dia:layer>
  </dia:diagram>