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

diff --git a/diagramas/clases.dia b/diagramas/clases.dia
index 3d6556d0777ef8fb346f46b16e76b22b0f6f6047..69b87d6862dcf13c44af8450683f09d39db3059f 100644 (file)
--- a/diagramas/clases.dia
+++ b/diagramas/clases.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">

-          <dia:real val="0.4046272337436676"/>
+          <dia:real val="0.39678561687469482"/>

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


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

-        <dia:rectangle val="23.55,22.7;32.3,27.6"/>
+        <dia:rectangle val="23.55,22.7;32.3,29.4"/>

       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="23.6,22.75"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="23.6,22.75"/>


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

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.6000000000000005"/>

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


@@ -471,7 +471,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">

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

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


@@ -621,7 +621,68 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>

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


@@ -1825,19 +1886,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">

-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>

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

-        <dia:rectangle val="43.615,25.2;52.365,30.1"/>
+        <dia:rectangle val="43.665,24.6;52.415,31.3"/>

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

-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>

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

-        <dia:real val="4.8000000000000007"/>
+        <dia:real val="6.6000000000000005"/>

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


@@ -1861,7 +1922,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">

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

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


@@ -2011,7 +2072,68 @@
           </dia:attribute>
         </dia:composite>
       </dia:attribute>
           </dia:attribute>
         </dia:composite>
       </dia:attribute>

-      <dia:attribute name="operations"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#existe#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Devuelve True si el afiliado existe y carga el resto de los datos correspondientes. Si no existe devuelve False. Si existe más de uno, se pueden obtener con getNext().#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#getNext#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>#Si encontró uno nuevo, devuelve True y lo carga. Si no devuelve False y queda intacto.#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+      </dia:attribute>

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


@@ -2022,13 +2144,13 @@
         <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="36.15,20.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="35.3,20.35;48.04,25.3"/>
+        <dia:rectangle val="35.3,20.35;48.09,24.7"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="36.15,20.4"/>
         <dia:point val="36.15,22.72"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="36.15,20.4"/>
         <dia:point val="36.15,22.72"/>

-        <dia:point val="47.99,22.72"/>
-        <dia:point val="47.99,25.25"/>
+        <dia:point val="48.04,22.72"/>
+        <dia:point val="48.04,24.65"/>

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


@@ -2895,15 +3017,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O22">
       <dia:attribute name="obj_pos">

-        <dia:point val="43.665,25.25"/>
+        <dia:point val="43.715,24.65"/>

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

-        <dia:rectangle val="40.15,23.5;44.365,26.1"/>
+        <dia:rectangle val="40.15,23.5;44.415,25.5"/>

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

-        <dia:point val="43.665,25.25"/>
-        <dia:point val="41.9325,25.25"/>
-        <dia:point val="41.9325,24.25"/>
+        <dia:point val="43.715,24.65"/>
+        <dia:point val="41.9575,24.65"/>
+        <dia:point val="41.9575,24.25"/>

         <dia:point val="40.2,24.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="40.2,24.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">


@@ -3195,13 +3317,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O27">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O27">
       <dia:attribute name="obj_pos">

-        <dia:point val="40.015,31.0825"/>
+        <dia:point val="40.015,31.8325"/>

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

-        <dia:rectangle val="39.965,31.0325;47.665,34.3325"/>
+        <dia:rectangle val="39.965,31.7825;47.665,35.0825"/>

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

-        <dia:point val="40.015,31.0825"/>
+        <dia:point val="40.015,31.8325"/>

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


@@ -3839,16 +3961,16 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O33">
       <dia:attribute name="obj_pos">

-        <dia:point val="23.6,27.55"/>
+        <dia:point val="23.6,29.35"/>

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

-        <dia:rectangle val="22.85,26.8;34.425,34.0575"/>
+        <dia:rectangle val="22.85,28.6;34.425,34.0575"/>

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

-        <dia:point val="23.6,27.55"/>
+        <dia:point val="23.6,29.35"/>

         <dia:point val="23.6,34.0075"/>
         <dia:point val="27.925,34.0075"/>
         <dia:point val="23.6,34.0075"/>
         <dia:point val="27.925,34.0075"/>

-        <dia:point val="27.925,27.55"/>
+        <dia:point val="27.925,29.35"/>

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


@@ -3904,13 +4026,13 @@
         <dia:point val="15.9,32.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="15.9,32.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="15.85,32.45;44.515,36.6825"/>
+        <dia:rectangle val="15.85,32.45;44.515,37.4325"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="15.9,32.5"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="15.9,32.5"/>

-        <dia:point val="15.9,35.0575"/>
-        <dia:point val="43.815,35.0575"/>
-        <dia:point val="43.815,34.2825"/>
+        <dia:point val="15.9,36.4075"/>
+        <dia:point val="43.815,36.4075"/>
+        <dia:point val="43.815,35.0325"/>

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


@@ -3966,13 +4088,13 @@
         <dia:point val="32.25,27.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
         <dia:point val="32.25,27.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">

-        <dia:rectangle val="31.5,26.3;41.8151,32.6325"/>
+        <dia:rectangle val="31.5,26.3;41.8151,33.3825"/>

       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.25,27.05"/>
         <dia:point val="35.0651,27.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.25,27.05"/>
         <dia:point val="35.0651,27.05"/>

-        <dia:point val="35.0651,31.7825"/>
-        <dia:point val="40.015,31.7825"/>
+        <dia:point val="35.0651,32.5325"/>
+        <dia:point val="40.015,32.5325"/>

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


@@ -4084,15 +4206,15 @@
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">
     </dia:object>
     <dia:object type="UML - Association" version="0" id="O37">
       <dia:attribute name="obj_pos">

-        <dia:point val="43.665,27.15"/>
+        <dia:point val="43.715,26.55"/>

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

-        <dia:rectangle val="32.2,25.5;44.365,28"/>
+        <dia:rectangle val="32.2,25.5;44.415,27.4"/>

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

-        <dia:point val="43.665,27.15"/>
-        <dia:point val="37.9575,27.15"/>
-        <dia:point val="37.9575,26.25"/>
+        <dia:point val="43.715,26.55"/>
+        <dia:point val="37.9825,26.55"/>
+        <dia:point val="37.9825,26.25"/>

         <dia:point val="32.25,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:point val="32.25,26.25"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">