Mejoré la nota de arriba para aclarar que una instancia de 1 controller controla...

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

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 02667a31e755203d21951e61e25c654a65a86492..08b06fb8cd503b03ad69a2c0f5b779c4858dd08b 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -172,13 +172,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O1">
       <dia:attribute name="obj_pos">

-        <dia:point val="3,10"/>
+        <dia:point val="3,11.05"/>

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

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

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

-        <dia:point val="3,10"/>
+        <dia:point val="3,11.05"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.5"/>


@@ -438,7 +438,7 @@
         <dia:point val="-9.85,21.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="-9.85,21.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="-9.9,21;12.85,30.1"/>
+        <dia:rectangle val="-9.9,21;12.85,27.7"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-9.85,21.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-9.85,21.05"/>


@@ -447,7 +447,7 @@
         <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="22.650000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">

-        <dia:real val="9"/>
+        <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>


@@ -624,97 +624,7 @@
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
           <dia:attribute name="name">
       <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: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>#Guarda los datos del afiliado en la DB y retorna True si no hubo error#</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>#VerificarCobertura#</dia:string>
+            <dia:string>#verificarCobertura#</dia:string>

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


@@ -762,7 +672,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">

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

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


@@ -914,7 +824,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>#int#</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>


@@ -990,16 +900,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;19.75,9.25"/>
+        <dia:rectangle val="2.95,0.95;20.1,10.05"/>

       </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="16.700000000000003"/>
+        <dia:real val="17.050000000000001"/>

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


@@ -1229,19 +1139,19 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">

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

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

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

           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
           </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:string>##</dia:string>

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


@@ -1255,17 +1165,35 @@
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>

-          <dia:attribute name="parameters"/>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#codPrestacion#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>##</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:composite type="umloperation">
           <dia:attribute name="name">
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">

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

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

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

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


@@ -1288,10 +1216,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">

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

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

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

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


@@ -1305,6 +1233,36 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
             </dia:composite>
           </dia:attribute>
         </dia:composite>

+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#obtenerCoberturas#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#Cobertura[]#</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>

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


@@ -1411,7 +1369,7 @@
             <dia:string>#cuit#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#cuit#</dia:string>
           </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="value">
             <dia:string>##</dia:string>


@@ -1776,7 +1734,7 @@
             <dia:string>#porcentajeCobertura#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
             <dia:string>#porcentajeCobertura#</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="value">
             <dia:string>##</dia:string>


@@ -2213,7 +2171,7 @@
         <dia:point val="14.2,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="14.2,21"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="14.15,20.95;22.9,29.25"/>
+        <dia:rectangle val="14.15,20.95;22.9,26.25"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="14.2,21"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="14.2,21"/>


@@ -2222,7 +2180,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="8.2000000000000011"/>
+        <dia:real val="5.2000000000000011"/>

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


@@ -2396,128 +2354,7 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <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: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>#Guarda los datos del solicitante en la DB y retorna True si no hubo error#</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>#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>#Borra el solicitante de la DB y retorna True si no hubo error#</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="operations"/>

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


@@ -3287,13 +3124,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="20.15,0.85"/>
+        <dia:point val="21.2,1"/>

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

-        <dia:rectangle val="20.1,0.8;31.3,8.1"/>
+        <dia:rectangle val="21.15,0.95;32.35,8.25"/>

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

-        <dia:point val="20.15,0.85"/>
+        <dia:point val="21.2,1"/>

       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.1"/>


@@ -3620,15 +3457,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O18">
       <dia:attribute name="obj_pos">

-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>

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

-        <dia:rectangle val="1.425,17.15;10.05,21.1"/>
+        <dia:rectangle val="1.425,18.2;10.1,21.1"/>

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

-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.125"/>
-        <dia:point val="1.475,19.125"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.65"/>
+        <dia:point val="1.475,19.65"/>

         <dia:point val="1.475,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="1.475,21.05"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -3655,15 +3492,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O19">
       <dia:attribute name="obj_pos">

-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>

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

-        <dia:rectangle val="8.35,17.15;18.575,21.05"/>
+        <dia:rectangle val="8.4,18.2;18.575,21.05"/>

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

-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.1"/>
-        <dia:point val="18.525,19.1"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.6506"/>
+        <dia:point val="18.525,19.6506"/>

         <dia:point val="18.525,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="18.525,21"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -3672,7 +3509,7 @@
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">

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

       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>


@@ -3690,15 +3527,15 @@
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Generalization" version="0" id="O20">
       <dia:attribute name="obj_pos">

-        <dia:point val="9.2,17.2"/>
+        <dia:point val="9.25,18.25"/>

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

-        <dia:rectangle val="8.35,17.15;13.6,31.65"/>
+        <dia:rectangle val="8.4,18.2;13.6,31.65"/>

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

-        <dia:point val="9.2,17.2"/>
-        <dia:point val="9.2,19.9625"/>
-        <dia:point val="13.55,19.9625"/>
+        <dia:point val="9.25,18.25"/>
+        <dia:point val="9.25,19.6506"/>
+        <dia:point val="13.55,19.6506"/>

         <dia:point val="13.55,31.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="13.55,31.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">