Agregué una sobrecarga del método getEstado, para adecuarlo a mis necesidades

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

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 03cb6cc9893c783b2201dbba2cfa30e4d56f2243..3c6719dafe871d8873337e0204592ee005d7dbb0 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.48352965712547302"/>
+          <dia:real val="0.48352962732315063"/>

         </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="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="2.95,9.95;15.45,17.25"/>
+        <dia:rectangle val="2.95,9.95;15.55,17.25"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,10"/>
       </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"/>


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

-            <dia:string>#Fecha de nacimiento (es una clase??? Para mí sí)#</dia:string>
+            <dia:string>#Fecha de nacimiento#</dia:string>

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


@@ -539,7 +539,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 de afiliado (con alguna codificación? int?).#</dia:string>
+            <dia:string>#Identificador único de afiliado.#</dia:string>

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


@@ -894,16 +894,16 @@
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="2.95,0.95;12.6,6.65"/>
+        <dia:rectangle val="2.95,0.95;12.4,8.45"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="3,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">

-        <dia:real val="9.5499999999999989"/>
+        <dia:real val="9.3499999999999996"/>

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

-        <dia:real val="5.5999999999999996"/>
+        <dia:real val="7.3999999999999995"/>

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


@@ -912,7 +912,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>#Plan para los Afiliados de la obra social#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -921,13 +921,13 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="suppress_operations">

-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>

       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
       </dia:attribute>
       <dia:attribute name="visible_attributes">
         <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"/>


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

-            <dia:string>#Codigo de plan (nomenclador).#</dia:string>
+            <dia:string>#Código de plan.#</dia:string>

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


@@ -1012,13 +1012,13 @@
             <dia:string>#categoría#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#categoría#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#int#</dia:string>
+            <dia:string>#float#</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>#Categoría a la que pertenece (nomenclador).#</dia:string>
+            <dia:string>#Categoría del plan. Cuanto más grande es la categoría, mejor es el plan#</dia:string>

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


@@ -1058,13 +1058,13 @@
             <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#permanenciaMinima#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#float#</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>#Permanencia mínima que debe cumplir en el plan antes de pasarse a otro.#</dia:string>
+            <dia:string>#Permanencia mínima (en meses) que debe cumplir en el plan antes de pasarse a otro.#</dia:string>

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


@@ -1100,7 +1100,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>#borrar#</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>#Cambia fechaBaja a la fecha actual del sistema#</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>#guardar#</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>#Registra en la BD todo el esquema del plan#</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>


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

-            <dia:string>#Número de CUIT (lo necesitamos!?!?!).#</dia:string>
+            <dia:string>#Número de CUIT.#</dia:string>

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


@@ -1374,7 +1435,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>#responsable#</dia:string>
+            <dia:string>#codigo#</dia:string>

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


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

-            <dia:string>#Nombre del responsable (gerente) del CAP (lo usamos para algo!?!?!?!!).#</dia:string>
+            <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="visibility">
             <dia:enum val="0"/>


@@ -1397,7 +1458,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

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

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


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

-            <dia:string>#Horario de atención (debería volar!?!?!?).#</dia:string>
+            <dia:string>#Nombre del responsable (gerente) del CAP#</dia:string>

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


@@ -1420,7 +1481,7 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">

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

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


@@ -1429,7 +1490,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="comment">
             <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:string>#Horario de atención (texto libre)#</dia:string>

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


@@ -1450,19 +1511,19 @@
     </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="29,1"/>
+        <dia:point val="29,0.95"/>

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

-        <dia:rectangle val="28.95,0.95;40.1,9.25"/>
+        <dia:rectangle val="28.95,0.9;44.7,10"/>

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

-        <dia:point val="29,1"/>
+        <dia:point val="29,0.95"/>

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

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

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

-        <dia:real val="8.1999999999999993"/>
+        <dia:real val="9"/>

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


@@ -1736,6 +1797,54 @@
           </dia:attribute>
           <dia:attribute name="parameters"/>
         </dia:composite>
           </dia:attribute>
           <dia:attribute name="parameters"/>
         </dia:composite>

+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getEstado#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#int#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</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 type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#fechaRecepcion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#DateTime#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>

       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>


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

-        <dia:string>#Región geográfica, cuya mínima unidad es un barrio.#</dia:string>
+        <dia:string>#Región geográfica que cubre un Cap y a la que pertenecen los Prestadores#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


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

-            <dia:string>#Horario en el cual puede ser visitado (de nuevo, representación???).#</dia:string>
+            <dia:string>#Horario en el cual puede ser visitado (como texto libre)#</dia:string>

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


@@ -2376,7 +2485,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>#Autorización aprobada o rechazada automáticamente por el sistema#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -2459,13 +2568,13 @@
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="27.95,19.95;41.15,24.85"/>
+        <dia:rectangle val="27.95,19.95;41.25,24.85"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="28,20"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="28,20"/>
       </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"/>


@@ -2554,13 +2663,13 @@
             <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#carencia#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">

-            <dia:string>#Tiempo#</dia:string>
+            <dia:string>#float#</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>#Antigüedad que debe tener el afiliado en el plan para ser cubierto. (años? meses?)#</dia:string>
+            <dia:string>#Antigüedad (en meses) que debe tener el afiliado en el plan para ser cubierto.#</dia:string>

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


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

-        <dia:string>#Clasificación de las Prestaciones. (esto lo necesitamos por el codificador, no?)#</dia:string>
+        <dia:string>#Clasificación de las Prestaciones#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


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

-            <dia:string>#Fecha en la que el plan no rige mas para el afiliado#</dia:string>
+            <dia:string>#Fecha en la que el plan no rige mas para el afiliado (si es el plan actual es NULL)#</dia:string>

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


@@ -2972,13 +3081,13 @@
         <dia:point val="15,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="15,1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.95,0.95;26.1,8.25"/>
+        <dia:rectangle val="14.95,0.95;26.15,8.25"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="15,1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="15,1"/>
       </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="7.1999999999999993"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="7.1999999999999993"/>


@@ -2990,7 +3099,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>#Dirección y datos de un domicilio#</dia:string>

       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="abstract">
         <dia:boolean val="false"/>


@@ -3232,15 +3341,15 @@
     </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="34.525,9.2"/>
+        <dia:point val="36.825,9.95"/>

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

-        <dia:rectangle val="33.675,9.15;40.375,13.05"/>
+        <dia:rectangle val="35.975,9.9;40.375,13.05"/>

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

-        <dia:point val="34.525,9.2"/>
-        <dia:point val="34.525,11.1"/>
-        <dia:point val="40.325,11.1"/>
+        <dia:point val="36.825,9.95"/>
+        <dia:point val="36.825,11.475"/>
+        <dia:point val="40.325,11.475"/>

         <dia:point val="40.325,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="40.325,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -3267,15 +3376,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O17">
       <dia:attribute name="obj_pos">

-        <dia:point val="34.525,9.2"/>
+        <dia:point val="36.825,9.95"/>

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

-        <dia:rectangle val="28.125,9.15;35.375,13.05"/>
+        <dia:rectangle val="28.125,9.9;37.675,13.05"/>

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

-        <dia:point val="34.525,9.2"/>
-        <dia:point val="34.525,11.1"/>
-        <dia:point val="28.175,11.1"/>
+        <dia:point val="36.825,9.95"/>
+        <dia:point val="36.825,11.475"/>
+        <dia:point val="28.175,11.475"/>

         <dia:point val="28.175,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="28.175,13"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">