From: tailor <ndimov@gmail.com>
Date: Sat, 17 Mar 2007 18:03:30 +0000 (+0000)
Subject: DER tareas mejorado
X-Git-Tag: 0_9_0~52
X-Git-Url: https://git.llucax.com/software/sercom.git/commitdiff_plain/0a4d5872de93f4eb8cb0564d3cd50cf3d9039f92?ds=inline

DER tareas mejorado
---

diff --git a/doc/schema/tareas.dia b/doc/schema/tareas.dia
index 9060886..d393948 100644
--- a/doc/schema/tareas.dia
+++ b/doc/schema/tareas.dia
@@ -28,7 +28,7 @@
           <dia:boolean val="false"/>
         </dia:attribute>
         <dia:attribute name="scaling">
-          <dia:real val="0.43935906887054443"/>
+          <dia:real val="0.43935909867286682"/>
         </dia:attribute>
         <dia:attribute name="fitto">
           <dia:boolean val="true"/>
@@ -71,13 +71,13 @@
   <dia:layer name="Fondo" visible="true">
     <dia:object type="UML - LargePackage" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="-24.3,-8.5"/>
+        <dia:point val="-24.3,-9.05"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-24.35,-9.55;28.9,25.4"/>
+        <dia:rectangle val="-24.35,-10.1;28.9,24.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-24.3,-8.5"/>
+        <dia:point val="-24.3,-9.05"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="53.149999999999999"/>
@@ -103,13 +103,13 @@
     </dia:object>
     <dia:object type="UML - Note" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="21.85,20.65"/>
+        <dia:point val="21.85,20.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="21.8,20.6;27.7,24.8"/>
+        <dia:rectangle val="21.8,20.05;27.7,24.25"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="21.85,20.65"/>
+        <dia:point val="21.85,20.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.8000000000000007"/>
@@ -138,7 +138,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="22.2,21.85"/>
+            <dia:point val="22.2,21.3"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -152,13 +152,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="-10.63,12.795"/>
+        <dia:point val="-22.33,17.295"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.68,12.745;-2.03,16.845"/>
+        <dia:rectangle val="-22.38,17.245;-13.73,21.345"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-10.63,12.795"/>
+        <dia:point val="-22.33,17.295"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.5500000000000007"/>
@@ -378,13 +378,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-18.58,12.845"/>
+        <dia:point val="-21.78,2.445"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-18.63,12.795;-12.58,15.295"/>
+        <dia:rectangle val="-21.83,2.395;-15.78,4.895"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-18.58,12.845"/>
+        <dia:point val="-21.78,2.445"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.9500000000000002"/>
@@ -558,13 +558,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.32,6.545"/>
+        <dia:point val="-8.33,16.295"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.27,6.495;27.42,10.595"/>
+        <dia:rectangle val="-8.38,16.245;-1.23,20.345"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="20.32,6.545"/>
+        <dia:point val="-8.33,16.295"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.0499999999999998"/>
@@ -784,13 +784,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-13.03,-5.955"/>
+        <dia:point val="4.57,9.745"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-13.08,-6.005;-5.48,1.295"/>
+        <dia:rectangle val="4.52,9.695;12.12,16.995"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-13.03,-5.955"/>
+        <dia:point val="4.57,9.745"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5"/>
@@ -1102,13 +1102,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="-23.78,8.045"/>
+        <dia:point val="-12.68,2.095"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-23.83,7.995;-16.23,12.095"/>
+        <dia:rectangle val="-12.73,2.045;-5.13,6.145"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-23.78,8.045"/>
+        <dia:point val="-12.68,2.095"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5"/>
@@ -1328,13 +1328,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="-15.43,7.945"/>
+        <dia:point val="-12.63,-2.755"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-15.48,7.895;-8.03,11.995"/>
+        <dia:rectangle val="-12.68,-2.805;-5.23,1.295"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-15.43,7.945"/>
+        <dia:point val="-12.63,-2.755"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.3499999999999996"/>
@@ -1554,239 +1554,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="-18.58,18.595"/>
+        <dia:point val="13.82,-7.405"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-18.63,18.545;-9.88,22.645"/>
+        <dia:rectangle val="13.77,-7.455;23.82,8.645"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-18.58,18.595"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="8.6500000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="4"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#comando_ejecutado#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </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="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_line_length">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_tagging">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="0.69999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="attributes">
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#id#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#INTEGER#</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="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="true"/>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#diferencias#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#TEXT#</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="visibility">
-            <dia:enum val="3"/>
-          </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>#child_name#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#VARCHAR#</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="visibility">
-            <dia:enum val="3"/>
-          </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:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#Primary Key#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#pk#</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>#id#</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="0"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O9">
-      <dia:attribute name="obj_pos">
-        <dia:point val="1.32,-7.605"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.27,-7.655;11.32,8.445"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="1.32,-7.605"/>
+        <dia:point val="13.82,-7.405"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="9.9499999999999993"/>
@@ -2349,15 +2123,15 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O10">
+    <dia:object type="UML - Class" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="8.87,17.245"/>
+        <dia:point val="-3.23,2.345"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="8.82,17.195;20.82,21.295"/>
+        <dia:rectangle val="-3.28,2.295;8.72,6.395"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="8.87,17.245"/>
+        <dia:point val="-3.23,2.345"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.9"/>
@@ -2575,15 +2349,15 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O11">
+    <dia:object type="UML - Class" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="-18.48,15.745"/>
+        <dia:point val="-21.73,-2.155"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-18.53,15.695;-12.63,18.195"/>
+        <dia:rectangle val="-21.78,-2.205;-15.88,0.295"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-18.48,15.745"/>
+        <dia:point val="-21.73,-2.155"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.7999999999999998"/>
@@ -2755,15 +2529,15 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O12">
+    <dia:object type="UML - Class" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="-6.48,17.495"/>
+        <dia:point val="-3.18,-3.355"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.53,17.445;5.32,21.545"/>
+        <dia:rectangle val="-3.23,-3.405;8.62,0.695"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-6.48,17.495"/>
+        <dia:point val="-3.18,-3.355"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="11.75"/>
@@ -2981,15 +2755,15 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O13">
+    <dia:object type="UML - Class" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="-4.63,0.195"/>
+        <dia:point val="-17.43,-8.005"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.68,0.145;-0.88,2.445"/>
+        <dia:rectangle val="-17.48,-8.055;-13.68,-5.755"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-4.63,0.195"/>
+        <dia:point val="-17.43,-8.005"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.7000000000000002"/>
@@ -3088,24 +2862,24 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O14">
+    <dia:object type="UML - Class" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="-17.58,-3.205"/>
+        <dia:point val="-3.53,8.745"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-17.63,-3.255;-14.83,-0.955"/>
+        <dia:rectangle val="-3.58,8.695;1.17,10.995"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-17.58,-3.205"/>
+        <dia:point val="-3.53,8.745"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.7000000000000002"/>
+        <dia:real val="4.6500000000000004"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="2.1999999999999997"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#tarea#</dia:string>
+        <dia:string>#enunciado#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -3195,24 +2969,24 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O15">
+    <dia:object type="UML - Class" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="18.22,-5.355"/>
+        <dia:point val="-14.11,9.16"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="18.17,-5.405;22.92,-3.105"/>
+        <dia:rectangle val="-14.16,9.11;-7.26,14.81"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="18.22,-5.355"/>
+        <dia:point val="-14.11,9.16"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.6500000000000004"/>
+        <dia:real val="6.7999999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="2.1999999999999997"/>
+        <dia:real val="5.5999999999999996"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#enunciado#</dia:string>
+        <dia:string>#ejercicio#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -3233,221 +3007,7 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="visible_operations">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_line_length">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_tagging">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="0.69999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="attributes"/>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O16">
-      <dia:attribute name="obj_pos">
-        <dia:point val="12.57,-5.405"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.52,-5.455;15.37,-3.155"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="12.57,-5.405"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="2.75"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="2.1999999999999997"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#curso#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </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="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="visible_attributes">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_operations">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="visible_comments">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_operations">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="wrap_after_char">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_line_length">
-        <dia:int val="40"/>
-      </dia:attribute>
-      <dia:attribute name="comment_tagging">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="line_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="fill_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="text_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font">
-        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font">
-        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font">
-        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font">
-        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font">
-        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
-      </dia:attribute>
-      <dia:attribute name="normal_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="polymorphic_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-      <dia:attribute name="classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="abstract_classname_font_height">
-        <dia:real val="1"/>
-      </dia:attribute>
-      <dia:attribute name="comment_font_height">
-        <dia:real val="0.69999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="attributes"/>
-      <dia:attribute name="operations"/>
-      <dia:attribute name="template">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="templates"/>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O17">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.04,6.61"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.99,6.56;19.89,12.26"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="13.04,6.61"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="6.7999999999999998"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="5.5999999999999996"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#ejercicio#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
-      </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="suppress_attributes">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="suppress_operations">
-        <dia:boolean val="false"/>
-      </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="false"/>
       </dia:attribute>
       <dia:attribute name="visible_comments">
         <dia:boolean val="false"/>
@@ -3632,18 +3192,18 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O18">
+    <dia:object type="UML - Association" version="1" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2.78,2.395"/>
+        <dia:point val="-15.58,-5.805"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.405,2.345;-2.58,14.395"/>
+        <dia:rectangle val="-15.63,-5.855;2.895,-1.80487"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-2.78,2.395"/>
-        <dia:point val="-2.78,8.265"/>
-        <dia:point val="-6.355,8.265"/>
-        <dia:point val="-6.355,12.795"/>
+        <dia:point val="-15.58,-5.805"/>
+        <dia:point val="-15.58,-4.675"/>
+        <dia:point val="2.695,-4.675"/>
+        <dia:point val="2.695,-3.40487"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3696,22 +3256,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="6"/>
-        <dia:connection handle="1" to="O2" connection="1"/>
+        <dia:connection handle="0" to="O12" connection="6"/>
+        <dia:connection handle="1" to="O11" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O19">
+    <dia:object type="UML - Association" version="1" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2.78,2.395"/>
+        <dia:point val="19.245,12.195"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.83,2.345;-0.405,19.0497"/>
+        <dia:rectangle val="19.195,10.525;26.095,16.195"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-2.78,2.395"/>
-        <dia:point val="-2.78,8.265"/>
-        <dia:point val="-0.605,8.265"/>
-        <dia:point val="-0.605,17.4497"/>
+        <dia:point val="19.245,12.195"/>
+        <dia:point val="19.245,10.575"/>
+        <dia:point val="25.545,10.575"/>
+        <dia:point val="25.545,15.395"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -3733,8 +3293,25 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3745,13 +3322,61 @@
             <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
+      </dia:attribute>
+      <dia:childnode parent="O0"/>
+    </dia:object>
+    <dia:object type="UML - Association" version="1" id="O17">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-22.33,19.195"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-23.38,-8.005;-17.38,20.095"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-22.33,19.195"/>
+        <dia:point val="-23.33,19.195"/>
+        <dia:point val="-23.33,-7.305"/>
+        <dia:point val="-17.43,-7.305"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
         <dia:composite>
           <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#* #</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3764,27 +3389,27 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="6"/>
-        <dia:connection handle="1" to="O12" connection="14"/>
+        <dia:connection handle="0" to="O2" connection="8"/>
+        <dia:connection handle="1" to="O12" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O20">
+    <dia:object type="UML - Association" version="1" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.295,8.395"/>
+        <dia:point val="8.71966,4.345"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.22,8.345;6.495,20.995"/>
+        <dia:rectangle val="8.66966,2.595;13.87,5.245"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="6.295,8.395"/>
-        <dia:point val="6.295,19.165"/>
-        <dia:point val="5.27,19.165"/>
-        <dia:point val="5.27,19.395"/>
+        <dia:point val="8.71966,4.345"/>
+        <dia:point val="10.8452,4.345"/>
+        <dia:point val="10.8452,3.295"/>
+        <dia:point val="13.82,3.295"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
@@ -3801,8 +3426,25 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string># 1#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3813,13 +3455,64 @@
             <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O9" connection="14"/>
+        <dia:connection handle="1" to="O8" connection="30"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="1" id="O19">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-15.93,-1.455"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-15.98,-2.155;-12.58,0.045"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-15.93,-1.455"/>
+        <dia:point val="-14.28,-1.455"/>
+        <dia:point val="-14.28,-0.855"/>
+        <dia:point val="-12.63,-0.855"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
         <dia:composite>
           <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3832,30 +3525,30 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="6"/>
-        <dia:connection handle="1" to="O12" connection="9"/>
+        <dia:connection handle="0" to="O10" connection="4"/>
+        <dia:connection handle="1" to="O7" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Association" version="1" id="O21">
+    <dia:object type="UML - Association" version="1" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.295,8.395"/>
+        <dia:point val="-15.83,3.145"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.245,8.345;9.07,20.745"/>
+        <dia:rectangle val="-15.88,2.445;-12.6805,4.995"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="6.295,8.395"/>
-        <dia:point val="6.295,19.165"/>
-        <dia:point val="8.87,19.165"/>
-        <dia:point val="8.87,19.145"/>
+        <dia:point val="-15.83,3.145"/>
+        <dia:point val="-14.2802,3.145"/>
+        <dia:point val="-14.2802,4.095"/>
+        <dia:point val="-12.7305,4.095"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -3869,8 +3562,25 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3881,13 +3591,64 @@
             <dia:enum val="0"/>
           </dia:attribute>
         </dia:composite>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O3" connection="4"/>
+        <dia:connection handle="1" to="O6" connection="14"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="1" id="O21">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-5.23135,-0.755"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-5.28135,-2.155;-3.13,0.145"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-5.23135,-0.755"/>
+        <dia:point val="-4.17977,-0.755"/>
+        <dia:point val="-4.17977,-1.455"/>
+        <dia:point val="-3.18,-1.455"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="autorouting">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="ends">
         <dia:composite>
           <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
+            <dia:string>#1#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="arrow">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="aggregate">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite>
+          <dia:attribute name="role">
             <dia:string>##</dia:string>
           </dia:attribute>
+          <dia:attribute name="multiplicity">
+            <dia:string>#*#</dia:string>
+          </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
           </dia:attribute>
@@ -3900,27 +3661,27 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="6"/>
-        <dia:connection handle="1" to="O10" connection="8"/>
+        <dia:connection handle="0" to="O7" connection="14"/>
+        <dia:connection handle="1" to="O11" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.945,-3.15523"/>
+        <dia:point val="8.57,-1.455"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.895,-3.20523;16.64,8.21"/>
+        <dia:rectangle val="8.52,-3.005;13.87,-0.555"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="13.945,-3.15523"/>
-        <dia:point val="13.945,3.005"/>
-        <dia:point val="16.44,3.005"/>
-        <dia:point val="16.44,6.61"/>
+        <dia:point val="8.57,-1.455"/>
+        <dia:point val="10.95,-1.455"/>
+        <dia:point val="10.95,-2.305"/>
+        <dia:point val="13.82,-2.305"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
@@ -3937,7 +3698,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3954,7 +3715,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -3968,27 +3729,27 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O16" connection="8"/>
-        <dia:connection handle="1" to="O17" connection="1"/>
+        <dia:connection handle="0" to="O11" connection="9"/>
+        <dia:connection handle="1" to="O8" connection="16"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.545,-3.11196"/>
+        <dia:point val="-5.18,4.795"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="16.39,-3.16196;20.745,8.16067"/>
+        <dia:rectangle val="-5.23,3.545;-3.18,5.695"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.545,-3.11196"/>
-        <dia:point val="20.545,3.015"/>
-        <dia:point val="16.44,3.015"/>
-        <dia:point val="16.44,6.56067"/>
+        <dia:point val="-5.18,4.795"/>
+        <dia:point val="-4.05,4.795"/>
+        <dia:point val="-4.05,4.245"/>
+        <dia:point val="-3.23,4.245"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
         <dia:boolean val="false"/>
@@ -4005,7 +3766,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4022,7 +3783,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4036,30 +3797,30 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O15" connection="8"/>
-        <dia:connection handle="1" to="O17" connection="18"/>
+        <dia:connection handle="0" to="O6" connection="11"/>
+        <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="23.845,6.49488"/>
+        <dia:point val="-8.38044,18.295"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.495,-3.205;24.045,8.09488"/>
+        <dia:rectangle val="-13.7797,17.595;-8.33044,20.195"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="23.845,6.49488"/>
-        <dia:point val="23.845,3.015"/>
-        <dia:point val="20.545,3.015"/>
-        <dia:point val="20.545,-3.155"/>
+        <dia:point val="-8.38044,18.295"/>
+        <dia:point val="-11.0551,18.295"/>
+        <dia:point val="-11.0551,19.295"/>
+        <dia:point val="-13.7297,19.295"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="autorouting">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>##</dia:string>
@@ -4073,7 +3834,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#* #</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4090,7 +3851,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string># 1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4105,21 +3866,21 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O4" connection="14"/>
-        <dia:connection handle="1" to="O15" connection="6"/>
+        <dia:connection handle="1" to="O2" connection="14"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="-16.23,-0.955172"/>
+        <dia:point val="-18.055,17.295"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-20.08,-1.00517;-16.03,9.59512"/>
+        <dia:rectangle val="-18.105,6.295;3.27,18.095"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-16.23,-0.955172"/>
-        <dia:point val="-16.23,2.565"/>
-        <dia:point val="-20.03,2.565"/>
-        <dia:point val="-20.03,7.99512"/>
+        <dia:point val="-18.055,17.295"/>
+        <dia:point val="-18.055,7.875"/>
+        <dia:point val="2.72,7.875"/>
+        <dia:point val="2.72,6.345"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4141,7 +3902,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4158,7 +3919,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4172,22 +3933,22 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O14" connection="8"/>
-        <dia:connection handle="1" to="O6" connection="14"/>
+        <dia:connection handle="0" to="O2" connection="1"/>
+        <dia:connection handle="1" to="O9" connection="6"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Association" version="1" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="-16.23,-0.955172"/>
+        <dia:point val="-1.205,10.9951"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-16.28,-1.00517;-11.555,9.4964"/>
+        <dia:rectangle val="-7.36,10.9451;-0.655,13.775"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-16.23,-0.955172"/>
-        <dia:point val="-16.23,2.565"/>
-        <dia:point val="-11.755,2.565"/>
-        <dia:point val="-11.755,7.8964"/>
+        <dia:point val="-1.205,10.9951"/>
+        <dia:point val="-1.205,12.975"/>
+        <dia:point val="-7.31,12.975"/>
+        <dia:point val="-7.31,11.86"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -4209,7 +3970,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#1#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4226,7 +3987,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="multiplicity">
-            <dia:string>##</dia:string>
+            <dia:string>#*#</dia:string>
           </dia:attribute>
           <dia:attribute name="arrow">
             <dia:boolean val="false"/>
@@ -4240,8 +4001,8 @@
         </dia:composite>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O14" connection="8"/>
-        <dia:connection handle="1" to="O7" connection="14"/>
+        <dia:connection handle="0" to="O13" connection="8"/>
+        <dia:connection handle="1" to="O14" connection="11"/>
       </dia:connections>
     </dia:object>
   </dia:layer>