Cambie el actor protagonico.

[z.facultad/75.10/miklolife.git] / diagramas / clases.dia

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 1b4f9ab1a3e7f7933802fe8d179352886fcfaeb0..92df4ff61438d114ec4e7da80c99324d4fb36b3c 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.37544265389442444"/>
+          <dia:real val="0.37498420476913452"/>

         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>


@@ -175,13 +175,13 @@
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="33.25,8.9;45.75,16.2"/>
+        <dia:rectangle val="33.25,8.9;45.85,16.2"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="33.3,8.95"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="12.4"/>
+        <dia:real val="12.5"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>


@@ -530,7 +530,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#nroAfiliado#</dia:string>
+            <dia:string>#codigo#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>


@@ -655,16 +655,16 @@
         <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,16.3"/>
+        <dia:rectangle val="-4.875,13;1.075,15.5"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4.825,13.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="3.2000000000000002"/>
+        <dia:real val="2.3999999999999999"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestacion#</dia:string>


@@ -768,29 +768,6 @@
             <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>#int#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Identificador único de la prestación (esto está por el codificador? o porque nos pintó a nosotros?)#</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">


@@ -800,16 +777,16 @@
     </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="11.375,26.1"/>
+        <dia:point val="10.675,26.1"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="11.325,26.05;18.525,30.95"/>
+        <dia:rectangle val="10.625,26.05;20.425,30.95"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
       </dia:attribute>
       <dia:attribute name="elem_corner">

-        <dia:point val="11.375,26.1"/>
+        <dia:point val="10.675,26.1"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="7.0999999999999996"/>
+        <dia:real val="9.6999999999999993"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>


@@ -898,7 +875,7 @@
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#codigo#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -918,10 +895,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#precio#</dia:string>
+            <dia:string>#categoría#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#int#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -944,7 +921,7 @@
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#descripcion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -964,10 +941,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#permanencia_minima#</dia:string>
+            <dia:string>#permanenciaMinima#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>##</dia:string>
+            <dia:string>#Tiempo#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -997,16 +974,16 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-4.05,2.7;1.85,6.8"/>
+        <dia:rectangle val="-4.05,2.7;1.9,6"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="4"/>
+        <dia:real val="3.2000000000000002"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Prestador#</dia:string>


@@ -1089,7 +1066,7 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#cuit#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#int#</dia:string>


@@ -1098,7 +1075,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#Identificador único (para nosotros? o por codificador o algo?).#</dia:string>
+            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1133,29 +1110,6 @@
             <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>#cuit#</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>#Número de CUIT (lo necesitamos!?!?!).#</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">


@@ -1316,16 +1270,16 @@
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="5.725,4.6;16.875,15.3"/>
+        <dia:rectangle val="5.725,4.6;16.925,14.5"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="5.775,4.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="10.6"/>
+        <dia:real val="9.7999999999999989"/>

       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#Autorizacion#</dia:string>


@@ -1498,29 +1452,6 @@
             <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>#fechaResolucion#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#Fecha#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>#Fecha en la que se aprobó la autorización.#</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>#fechaRealizacion#</dia:string>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
             <dia:string>#fechaRealizacion#</dia:string>


@@ -1679,7 +1610,7 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="25.875,16.1;40.35,23.57"/>
+        <dia:rectangle val="25.875,16.1;40.35,23.52"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>


@@ -1714,7 +1645,7 @@
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="36.8,16.1;40.35,23.57"/>
+        <dia:rectangle val="36.8,16.1;40.35,23.52"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="39.5,16.15"/>


@@ -1841,16 +1772,16 @@
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
       <dia:attribute name="attributes">
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

-            <dia:string>#codigo#</dia:string>
+            <dia:string>#nombre#</dia:string>

           </dia:attribute>
           <dia:attribute name="type">
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#int#</dia:string>
+            <dia:string>#string#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>#País en donde se encuentra.#</dia:string>
+            <dia:string>#Nombre de la Zona#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -1873,7 +1804,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">

-            <dia:string>##</dia:string>
+            <dia:string>#Descripción de la Zona#</dia:string>

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>


@@ -2126,16 +2057,16 @@
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="10.315,21.21;18.965,23.71"/>
+        <dia:rectangle val="10.315,21.21;19.065,24.51"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="10.365,21.26"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="8.5500000000000007"/>
+        <dia:real val="8.6500000000000004"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
       </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>#AutorizacionManual#</dia:string>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#AutorizacionManual#</dia:string>


@@ -2239,6 +2170,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>#fechaResolucion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#fecha#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="value">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Fecha en la que se aprobo/rechazo la autorizacion.#</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">


@@ -2248,16 +2202,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.325,15.25"/>
+        <dia:point val="11.325,14.45"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="10.475,15.2;14.69,21.31"/>
+        <dia:rectangle val="10.475,14.4;14.74,21.31"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,14.45"/>

         <dia:point val="11.325,17.97"/>
         <dia:point val="11.325,17.97"/>

-        <dia:point val="14.64,17.97"/>
-        <dia:point val="14.64,21.26"/>
+        <dia:point val="14.69,17.97"/>
+        <dia:point val="14.69,21.26"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -2384,13 +2338,13 @@
     </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.325,15.25"/>
+        <dia:point val="11.325,14.45"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="7.18,15.2;12.175,21.27"/>
+        <dia:rectangle val="7.18,14.4;12.175,21.27"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="11.325,15.25"/>
+        <dia:point val="11.325,14.45"/>

         <dia:point val="11.325,17.97"/>
         <dia:point val="7.23,17.97"/>
         <dia:point val="7.23,21.22"/>
         <dia:point val="11.325,17.97"/>
         <dia:point val="7.23,17.97"/>
         <dia:point val="7.23,21.22"/>


@@ -2422,13 +2376,13 @@
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-5.635,27.47;7.565,32.37"/>
+        <dia:rectangle val="-5.635,27.47;7.665,32.37"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-5.585,27.52"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="13.1"/>
+        <dia:real val="13.199999999999999"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="4.8000000000000007"/>


@@ -2586,7 +2540,7 @@
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#tipoAutorizacion#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#emun(manual,auto)#</dia:string>
+            <dia:string>#enum(manual,auto)#</dia:string>

           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>


@@ -2616,13 +2570,13 @@
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="0.765,-3.57999;6.665,-0.27999"/>
+        <dia:rectangle val="0.765,-3.57999;6.715,-0.27999"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="0.815,-3.52999"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="5.7999999999999998"/>
+        <dia:real val="5.8499999999999996"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>


@@ -2761,16 +2715,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O19">
       <dia:attribute name="obj_pos">

-        <dia:point val="7.515,28.22"/>
+        <dia:point val="7.615,28.22"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="7.465,26.05;12.125,29.07"/>
+        <dia:rectangle val="7.565,26;11.425,29.02"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="7.515,28.22"/>
-        <dia:point val="9.895,28.22"/>
-        <dia:point val="9.895,26.8"/>
-        <dia:point val="11.375,26.8"/>
+        <dia:point val="7.615,28.22"/>
+        <dia:point val="8.96521,28.22"/>
+        <dia:point val="8.96521,26.8"/>
+        <dia:point val="10.675,26.8"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -2823,15 +2777,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="18.475,26.8"/>
+        <dia:point val="20.375,26.8"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="18.425,26.05;21.95,28.2"/>
+        <dia:rectangle val="20.325,26;21.95,28.15"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="18.475,26.8"/>
-        <dia:point val="20.0375,26.8"/>
-        <dia:point val="20.0375,27.35"/>
+        <dia:point val="20.375,26.8"/>
+        <dia:point val="20.9875,26.8"/>
+        <dia:point val="20.9875,27.35"/>

         <dia:point val="21.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="21.6,27.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -2885,7 +2839,7 @@
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="39.225,-2.09;44.815,1.65"/>
+        <dia:rectangle val="39.225,-2.14;44.815,1.6"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="44.115,-1.34"/>


@@ -3006,7 +2960,7 @@
         <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="39.05,23.3;43.115,26.25"/>
+        <dia:rectangle val="39.05,23.25;43.115,26.2"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="42.415,25.4"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="42.415,25.4"/>


@@ -3065,7 +3019,7 @@
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="0.925,-1.07999;4.465,14.6"/>
+        <dia:rectangle val="0.925,-1.07999;4.465,14.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0.975,13.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="0.975,13.75"/>


@@ -3122,13 +3076,13 @@
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="0.215,4.6;6.825,28.37"/>
+        <dia:rectangle val="0.265,4.55;6.825,28.32"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="5.775,5.35"/>

-        <dia:point val="3.965,5.35"/>
-        <dia:point val="3.965,27.52"/>
-        <dia:point val="0.965,27.52"/>
+        <dia:point val="4.165,5.35"/>
+        <dia:point val="4.165,27.52"/>
+        <dia:point val="1.015,27.52"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3184,14 +3138,14 @@
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-5.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-6.635,15.5;-1.175,29.07"/>
+        <dia:rectangle val="-6.635,14.7;-1.175,29.02"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-5.585,28.22"/>
         <dia:point val="-6.585,28.22"/>

-        <dia:point val="-6.585,22.235"/>
-        <dia:point val="-1.925,22.235"/>
-        <dia:point val="-1.925,16.25"/>
+        <dia:point val="-6.585,21.835"/>
+        <dia:point val="-1.925,21.835"/>
+        <dia:point val="-1.925,15.45"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3245,14 +3199,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,6;-0.35,14.6"/>
+        <dia:rectangle val="-5.875,5.2;-0.35,14.55"/>

       </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,10.25"/>
-        <dia:point val="-1.1,10.25"/>
-        <dia:point val="-1.1,6.75"/>
+        <dia:point val="-5.825,9.85"/>
+        <dia:point val="-1.1,9.85"/>
+        <dia:point val="-1.1,5.95"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>


@@ -3306,7 +3260,7 @@
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-4.05,-5.31749;48.665,4.35"/>
+        <dia:rectangle val="-4.05,-5.36749;48.665,4.35"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4,2.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-4,2.75"/>


@@ -3516,13 +3470,13 @@
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="13.2008,-1.29249;28.2008,2.00751"/>
+        <dia:rectangle val="13.2008,-1.29249;28.2508,2.00751"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="13.2508,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="14.9"/>
+        <dia:real val="14.949999999999999"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.2000000000000002"/>


@@ -3664,13 +3618,13 @@
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.0508,11.7575;31.2008,18.2575"/>
+        <dia:rectangle val="20.0508,11.7575;31.2508,18.2575"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.1008,11.8075"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="11.049999999999999"/>
+        <dia:real val="11.1"/>

       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="6.4000000000000004"/>


@@ -3961,7 +3915,7 @@
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="31.1008,11.7575;33.65,14.1"/>
+        <dia:rectangle val="31.1008,11.7075;33.65,14.05"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="31.1508,12.5075"/>


@@ -4020,7 +3974,7 @@
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-1.15,-4.76749;21.4008,4.35"/>
+        <dia:rectangle val="-1.15,-4.81749;21.4008,4.35"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="20.7008,-1.24249"/>


@@ -4082,13 +4036,13 @@
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.6258,18.2075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.75,6.7;26.3258,20.6075"/>
+        <dia:rectangle val="1.75,5.9;26.3258,20.6075"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
         <dia:point val="1.8,19.2075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,18.2075"/>
         <dia:point val="25.6258,19.2075"/>
         <dia:point val="1.8,19.2075"/>

-        <dia:point val="1.8,6.75"/>
+        <dia:point val="1.8,5.95"/>

       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>


@@ -4141,7 +4095,7 @@
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="1.05,2.7;12.025,6.25"/>
+        <dia:rectangle val="1.05,2.65;12.025,6.25"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.8,3.45"/>


@@ -4198,7 +4152,7 @@
         <dia:point val="16.875,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="16.875,5.35"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="16.825,4.6;22.35,24.6"/>
+        <dia:rectangle val="16.825,4.55;22.35,24.55"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="16.875,5.35"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="16.875,5.35"/>


@@ -4260,7 +4214,7 @@
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="20.85,27.9;32.425,34.0575"/>
+        <dia:rectangle val="20.85,27.9;32.575,34.0575"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="21.6,28.65"/>


@@ -4319,14 +4273,14 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O39">
       <dia:attribute name="obj_pos">

-        <dia:point val="14.925,30.9"/>
+        <dia:point val="15.525,30.9"/>

       </dia:attribute>
       <dia:attribute name="obj_bb">
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.875,30.85;38.365,35.5825"/>
+        <dia:rectangle val="15.475,30.85;38.365,35.5825"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
       </dia:attribute>
       <dia:attribute name="orth_points">

-        <dia:point val="14.925,30.9"/>
-        <dia:point val="14.925,34.3575"/>
+        <dia:point val="15.525,30.9"/>
+        <dia:point val="15.525,34.3575"/>

         <dia:point val="37.615,34.3575"/>
         <dia:point val="37.615,31.7825"/>
       </dia:attribute>
         <dia:point val="37.615,34.3575"/>
         <dia:point val="37.615,31.7825"/>
       </dia:attribute>


@@ -4384,7 +4338,7 @@
         <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="30.2,27.4;34.265,30.1325"/>
+        <dia:rectangle val="30.2,27.35;34.265,30.0825"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.25,28.15"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="30.25,28.15"/>


@@ -4443,7 +4397,7 @@
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="28.1008,-1.29249;32.725,1.65"/>
+        <dia:rectangle val="28.1008,-1.34249;32.725,1.6"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.375,0.8"/>


@@ -4502,7 +4456,7 @@
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="25.5758,2.05;32.725,13.4075"/>
+        <dia:rectangle val="25.5758,2;32.725,13.4075"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="25.6258,11.8075"/>


@@ -4559,7 +4513,7 @@
         <dia:point val="42.415,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="42.415,27.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="30.2,25.8;43.115,28.15"/>
+        <dia:rectangle val="30.2,25.75;43.115,28.1"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="42.415,27.3"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="42.415,27.3"/>