X-Git-Url: https://git.llucax.com/mecon/meconlib.git/blobdiff_plain/c49c4882cf7f68c039797ec1fe9d2fb036597965..036b0e88e9cb45d027ed8462b4c43b475c924b6c:/doc/Marco/uml/Marco.xmi

diff --git a/doc/Marco/uml/Marco.xmi b/doc/Marco/uml/Marco.xmi
index 8269b28..b85b109 100644
--- a/doc/Marco/uml/Marco.xmi
+++ b/doc/Marco/uml/Marco.xmi
@@ -10,7 +10,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="216" documentation="" uniqueid="223" />
+  <docsettings viewid="216" documentation="" uniqueid="277" />
   <umlobjects>
    <UML:Class stereotype="" package="MECON" xmi.id="3" abstract="0" documentation="Clase encargada del manejo del Marco de los sistemas." name="MECON_Marco" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="26" type="void" abstract="0" documentation="Constructor. Recibe como parametro el path del archivo de configuracion" name="MECON_Marco" static="0" scope="200" >
@@ -42,6 +42,21 @@ Si es un objeto debe tener un metodo toHtml y opcionalmente puede tener un getCS
 Si es un objeto debe tener un metodo toHtml y opcionalmente puede tener un getCSS." name="addBodyContent" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Contenido a agregar en la pagina" name="content" static="0" scope="201" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="224" type="void" abstract="0" documentation="Funcion que permite concatenar lo pasado como parametro al titulo del sistema" name="addSubTitle" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Subtitulo a agregar" name="subtitulo" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="225" type="void" abstract="0" documentation="Concatena lo pasado por parametro al titulo del sistema" name="setTitle" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="''" type="string" abstract="0" documentation="Titulo a agregar. Si se pasa vacio se borra lo que pudiera estar" name="titulo" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="226" type="void" abstract="0" documentation="Concatena lo pasado por parametro al titulo de seccion" name="setSubtitle" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="''" type="string" abstract="0" documentation="Setea el subtitulo. Si se pasa vacio borra lo que pudiera estar." name="subtitulo" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="243" type="void" abstract="0" documentation="Permite hacer que en el copete aparezca un icono de ayuda, en un lugar predefinido. Sobreescribe lo seteado anteriormente por cualquier metodo." name="setAyuda" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Objeto MECON_HTML_Link o string para utilizar en el map." name="ayuda" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="277" type="mixed" abstract="0" documentation="Permite obtener el array de configuracion completo. En caso de recibir una clave como parametro devuelve su valor. Solo se tienen en cuenta las claves del primer nivel." name="getConf" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="string" abstract="0" documentation="Clave del array de configuracion a obtener." name="clave" static="0" scope="201" />
+    </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="8" value="" type="array" abstract="0" documentation="Array con los datos de configuracion del sistema." name="configuracion" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="206" value="true" type="bool" abstract="0" documentation="Mantiene el estado de los espacios" name="espacios" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="215" value="null" type="mixed" abstract="0" documentation="Menu vertical para agregar en la pantalla." name="menuVertical" static="0" scope="201" />
@@ -50,9 +65,11 @@ Si es un objeto debe tener un metodo toHtml y opcionalmente puede tener un getCS
    <UML:Class stereotype="" package="MECON/Marco" xmi.id="9" abstract="0" documentation="Manejo del copete de los sistemas que utilizan MECON_Marco" name="MECON_Marco_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="34" type="void" abstract="0" documentation="Recibe el nombre del directorio en donde se encuentra instalado el sistema. El directorio es case sensitive." name="MECON_Marco_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema." name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="mixed" abstract="0" documentation="Objeto MECON_HTML_Link o string para armar el map de la ayuda." name="ayuda" static="0" scope="201" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="35" type="string" abstract="0" documentation="Funcion que devuelve el string html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="33" value="''" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema. Es case sensitive." name="directorio" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="260" value="null" type="string" abstract="0" documentation="String con la referencia y los getvars de la ayuda" name="ayuda" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="MECON/Marco" xmi.id="10" abstract="0" documentation="Clase para el manejo de los pie de pagina de los sistemas de la intranet" name="MECON_Marco_Pie" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="38" type="void" abstract="0" documentation="Constructor. Recibe como parametro el array con los datos de configuracion del sistema." name="Pie" static="0" scope="200" >
@@ -202,239 +219,246 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
     </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="197" value="null" type="Seccion" abstract="0" documentation="Contiene el objeto seccion que se encuentra seleccionada. Se utiliza para mostrar el menu." name="seccionSeleccionada" static="0" scope="201" />
    </UML:Class>
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="9" roleb="3" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="10" roleb="3" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="13" roleb="3" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="14" roleb="3" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="17" roleb="16" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="3" roleb="92" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="100" roleb="14" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="103" roleb="14" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="16" roleb="14" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="14" roleb="16" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="17" roleb="14" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="136" roleb="14" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="193" roleb="100" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" canvaswidth="905" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco - Relaciones" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="898" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" canvaswidth="905" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco - Relaciones" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="898" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="338" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="134" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="656" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="227" showattsigs="601" usesdiagramusefillcolour="0" x="371" linecolour="#ff0000" y="302" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="114" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="60" showattsigs="601" usesdiagramusefillcolour="0" x="689" linecolour="#ff0000" y="69" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="533" linecolour="#ff0000" y="542" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="647" linecolour="#ff0000" y="388" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="469" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="239" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="338" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="198" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="276" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="134" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="656" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="227" showattsigs="601" usesdiagramusefillcolour="0" x="371" linecolour="#ff0000" y="302" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="114" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="60" showattsigs="601" usesdiagramusefillcolour="0" x="689" linecolour="#ff0000" y="69" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="533" linecolour="#ff0000" y="542" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="647" linecolour="#ff0000" y="388" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="469" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="239" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="3" roleBdoc="" widgetaid="9" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="3" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="6" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="6" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="6" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="3" widgetaid="9" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
-       <startpoint startx="104" starty="63" />
-       <endpoint endx="362" endy="194" />
+       <startpoint startx="141" starty="74" />
+       <endpoint endx="362" endy="183" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="18" linecolour="none" y="35" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="37" linecolour="none" y="11" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="61" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="37" linecolour="none" y="11" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="61" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="37" linecolour="none" y="11" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="61" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="1" widgetbid="3" roleBdoc="" widgetaid="10" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="1" widgetbid="3" widgetaid="10" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="306" starty="72" />
        <endpoint endx="446" endy="117" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="126" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="255" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="255" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="255" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="2" widgetbid="3" roleBdoc="" widgetaid="13" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="4" indexb="2" widgetbid="3" widgetaid="13" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="541" starty="48" />
        <endpoint endx="531" endy="117" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="84" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-28" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="184" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="48" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="120" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="28" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="140" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="3" roleBdoc="" widgetaid="14" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="5" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="11" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="11" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="11" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="3" widgetaid="14" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="484" starty="302" />
-       <endpoint endx="531" endy="271" />
+       <endpoint endx="362" endy="249" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-84" linecolour="none" y="-6" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-12" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-161" linecolour="none" y="-11" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-22" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-147" linecolour="none" y="-11" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-12" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-157" linecolour="none" y="-11" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="16" roleBdoc="" widgetaid="17" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="249" starty="773" />
        <endpoint endx="157" endy="519" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="165" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="330" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="330" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="330" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="4" indexa="3" visibilityB="200" totalcountb="2" indexb="1" widgetbid="92" roleBdoc="" widgetaid="3" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="4" indexa="3" visibilityB="200" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="615" starty="117" />
        <endpoint endx="689" endy="79" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="14" roleBdoc="" widgetaid="100" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="14" widgetaid="100" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="658" starty="542" />
        <endpoint endx="522" endy="489" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" roleBdoc="" widgetaid="103" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="772" starty="388" />
        <endpoint endx="598" endy="364" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="45" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="-86" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="169" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="88" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="7" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="162" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="-69" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" roleBdoc="" widgetaid="16" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="111" starty="365" />
        <endpoint endx="371" endy="364" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="69" linecolour="none" y="48" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="138" linecolour="none" y="-62" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="143" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="138" linecolour="none" y="62" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="31" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="138" linecolour="none" y="162" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="-69" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="3" indexb="2" widgetbid="16" roleBdoc="" widgetaid="14" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="371" starty="426" />
        <endpoint endx="202" endy="365" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" roleBdoc="" widgetaid="17" roleAdoc="" documentation="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="3" indexb="1" widgetbid="14" widgetaid="17" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="468" starty="773" />
        <endpoint endx="446" endy="489" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="57" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-28" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="130" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="48" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="66" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="28" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="86" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="14" roleBdoc="" widgetaid="136" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="14" widgetaid="136" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="775" starty="469" />
        <endpoint endx="598" endy="426" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="100" roleBdoc="" widgetaid="193" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="100" widgetaid="193" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="627" starty="693" />
        <endpoint endx="658" endy="569" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="1" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
      </UML:AssocWidget>
     </associations>
    </diagram>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1386" snapy="10" showatts="1" xmi.id="152" documentation="" type="403" showops="1" showpackage="0" name="Marco - Contructores" localid="29994" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="630" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1386" snapy="10" showatts="1" xmi.id="152" documentation="" type="403" showops="1" showpackage="0" name="Marco - Contructores" localid="29994" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="661" >
     <widgets>
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="111" usesdiagramusefillcolour="1" x="204" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="513" isinstance="0" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="0" width="270" usesdiagramusefillcolour="0" x="393" linecolour="#ff0000" y="54" instancename="PRINCIPAL" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="513" isinstance="0" xmi.id="100" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="164" usesdiagramusefillcolour="1" x="773" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="506" isinstance="0" xmi.id="16" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="0" width="266" usesdiagramusefillcolour="0" x="1116" linecolour="#ff0000" y="54" instancename="SUBMENU" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="498" isinstance="0" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="0" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="514" isinstance="0" xmi.id="170" decon="0" localid="29994" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="111" usesdiagramusefillcolour="1" x="204" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="270" usesdiagramusefillcolour="0" x="393" linecolour="#ff0000" y="54" instancename="PRINCIPAL" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" isinstance="0" xmi.id="100" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="164" usesdiagramusefillcolour="1" x="773" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="16" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="266" usesdiagramusefillcolour="0" x="1116" linecolour="#ff0000" y="54" instancename="SUBMENU" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" isinstance="0" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="0" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="170" decon="0" localid="29994" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
     </widgets>
     <messages>
-     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="114" operation="MenuHorizontal(directorio : string) : void" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="153" isinstance="0" xmi.id="154" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="529" linecolour="none" y="135" operation="Seccion(seccion : array, directorio : string) : void" instancename="" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="155" isinstance="0" xmi.id="156" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="177" operation="MenuHorizontal(directorio : string) : void" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="157" isinstance="0" xmi.id="158" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="262" operation="agregarComponente" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="159" isinstance="0" xmi.id="160" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="217" operation="return" instancename="" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="163" isinstance="0" xmi.id="164" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="529" linecolour="none" y="282" operation="return" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="165" isinstance="0" xmi.id="166" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="313" operation="return" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="167" isinstance="0" xmi.id="168" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="102" operation="Marco(directorio : string) : void" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="171" isinstance="0" xmi.id="172" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="353" operation="return" instancename="" widgetbid="29994" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="173" isinstance="0" xmi.id="174" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="386" operation="addBody(body : Mixed) : void" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="175" isinstance="0" xmi.id="176" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="424" operation="display() : string" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="177" isinstance="0" xmi.id="178" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="452" operation="addBody(body : string) : void" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="179" isinstance="0" xmi.id="180" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="114" operation="MenuHorizontal(directorio : string) : void" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" isinstance="0" xmi.id="154" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="529" linecolour="none" y="135" operation="Seccion(seccion : array, directorio : string) : void" instancename="" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" isinstance="0" xmi.id="156" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="177" operation="MenuHorizontal(directorio : string) : void" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" isinstance="0" xmi.id="158" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="262" operation="agregarComponente" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" isinstance="0" xmi.id="160" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="856" linecolour="none" y="217" operation="return" instancename="" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" isinstance="0" xmi.id="164" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="529" linecolour="none" y="282" operation="return" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" isinstance="0" xmi.id="166" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="313" operation="return" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" isinstance="0" xmi.id="168" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="102" operation="Marco(directorio : string) : void" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" isinstance="0" xmi.id="172" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="353" operation="return" instancename="" widgetbid="29994" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" isinstance="0" xmi.id="174" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="386" operation="addBody(body : Mixed) : void" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" isinstance="0" xmi.id="176" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="223" usesdiagramusefillcolour="1" x="35" linecolour="none" y="424" operation="display() : string" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" isinstance="0" xmi.id="178" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="267" usesdiagramusefillcolour="1" x="260" linecolour="none" y="452" operation="addBody(body : string) : void" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" isinstance="0" xmi.id="180" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
     </messages>
     <associations/>
    </diagram>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="781" snapy="10" showatts="1" xmi.id="181" documentation="" type="403" showops="1" showpackage="0" name="Marco::addBody" localid="29996" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="630" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="792" snapy="10" showatts="1" xmi.id="181" documentation="" type="403" showops="1" showpackage="0" name="Marco::addBody" localid="29996" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="661" >
     <widgets>
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="111" usesdiagramusefillcolour="1" x="209" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="545" isinstance="0" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="0" width="172" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="54" instancename="marco->_tabla" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="537" isinstance="0" xmi.id="182" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="13" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="545" isinstance="0" xmi.id="170" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:ObjectWidget usesdiagramfillcolour="1" width="206" usesdiagramusefillcolour="1" x="382" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="536" isinstance="0" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="111" usesdiagramusefillcolour="1" x="209" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="3" decon="0" localid="29999" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="0" width="172" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="54" instancename="marco->_tabla" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" isinstance="0" xmi.id="182" decon="0" localid="29998" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="68" usesdiagramusefillcolour="1" x="13" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="170" decon="0" localid="29997" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
+     <UML:ObjectWidget usesdiagramfillcolour="1" width="206" usesdiagramusefillcolour="1" x="382" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" isinstance="0" xmi.id="100" decon="0" localid="29996" multipleinstance="0" drawasactor="0" font="helvetica,-1,12,0,50,0,1,0,0,0" />
     </widgets>
     <messages>
-     <UML:MessageWidget usesdiagramfillcolour="1" width="215" usesdiagramusefillcolour="1" x="48" linecolour="none" y="101" operation="display() : string" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="183" isinstance="0" xmi.id="184" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="219" usesdiagramusefillcolour="1" x="265" linecolour="none" y="129" operation="addBody(body : string) : void" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="187" isinstance="0" xmi.id="188" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="118" usesdiagramusefillcolour="1" x="486" linecolour="none" y="164" operation="addRow(Componentes)" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="189" isinstance="0" xmi.id="190" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="118" usesdiagramusefillcolour="1" x="486" linecolour="none" y="195" operation="addRow(titulo)" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="191" isinstance="0" xmi.id="192" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="215" usesdiagramusefillcolour="1" x="48" linecolour="none" y="101" operation="display() : string" instancename="" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" isinstance="0" xmi.id="184" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="219" usesdiagramusefillcolour="1" x="265" linecolour="none" y="129" operation="addBody(body : string) : void" instancename="" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" isinstance="0" xmi.id="188" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="118" usesdiagramusefillcolour="1" x="486" linecolour="none" y="164" operation="addRow(Componentes)" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" isinstance="0" xmi.id="190" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
+     <UML:MessageWidget usesdiagramfillcolour="1" width="118" usesdiagramusefillcolour="1" x="486" linecolour="none" y="195" operation="addRow(titulo)" instancename="" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" isinstance="0" xmi.id="192" sequencemessagetype="1001" font="helvetica,-1,12,0,50,0,0,0,0,0" />
     </messages>
     <associations/>
    </diagram>
-   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="767" snapy="10" showatts="1" xmi.id="216" documentation="" type="402" showops="1" showpackage="0" name="Marco - Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="655" >
+   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="792" snapy="10" showatts="1" xmi.id="216" documentation="" type="402" showops="1" showpackage="0" name="Marco - Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="661" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="656" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="530" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="338" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="227" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="170" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="270" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="310" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="239" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="170" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="230" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="360" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="276" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="656" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="530" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="338" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="209" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="227" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="260" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="180" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="220" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="239" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="80" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="193" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="251" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="140" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="360" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="154" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,1,0,0,0" />
     </widgets>
     <messages/>
     <associations/>
@@ -454,13 +478,19 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="97" label="addBody" />
        <listitem open="0" type="815" id="223" label="addBodyContent" />
        <listitem open="0" type="815" id="214" label="addMenuVertical" />
+       <listitem open="0" type="815" id="224" label="addSubTitle" />
        <listitem open="0" type="815" id="124" label="addTitle" />
+       <listitem open="0" type="815" id="277" label="getConf" />
        <listitem open="0" type="815" id="218" label="habilitarLinks" />
        <listitem open="0" type="815" id="32" label="obtenerConfiguracion" />
+       <listitem open="0" type="815" id="243" label="setAyuda" />
        <listitem open="0" type="815" id="207" label="setEspacios" />
+       <listitem open="0" type="815" id="226" label="setSubtitle" />
+       <listitem open="0" type="815" id="225" label="setTitle" />
        <listitem open="0" type="815" id="220" label="toHTML" />
       </listitem>
-      <listitem open="0" type="813" id="9" label="MECON_Marco_Copete" >
+      <listitem open="1" type="813" id="9" label="MECON_Marco_Copete" >
+       <listitem open="0" type="814" id="260" label="ayuda" />
        <listitem open="0" type="814" id="33" label="directorio" />
        <listitem open="0" type="815" id="34" label="MECON_Marco_Copete" />
        <listitem open="0" type="815" id="35" label="toHtml" />
@@ -554,9 +584,9 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />
-    <listitem open="0" type="823" id="-1" label="Diagrams" />
     <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>
+  <codegeneration/>
  </XMI.content>
 </XMI>