Bugs en Marco y Tabla

[mecon/meconlib.git] / doc / Marco / uml / Marco.xmi

diff --git a/doc/Marco/uml/Marco.xmi b/doc/Marco/uml/Marco.xmi
index a4249c2cc3101db30fba428c5476acf687107631..b85b109dfb12d95dbf0ae19b738c885a8d30a09c 100644 (file)
--- a/doc/Marco/uml/Marco.xmi
+++ b/doc/Marco/uml/Marco.xmi
@@ -3,54 +3,75 @@
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
-   <XMI.exporterVersion>1.1</XMI.exporterVersion>
+   <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
+   <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
   </XMI.documentation>
-  <XMI.model xmi.name="Marco" href="/home/martin/public_html/meconlib/tronco/doc/Marco/uml/Marco.xmi" />
+  <XMI.model xmi.name="Marco" href="/home/martin/public_html/meconlib/doc/Marco/uml/Marco.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="4" documentation="" uniqueid="205" />
+  <docsettings viewid="216" documentation="" uniqueid="277" />
   <umlobjects>
-   <UML:Class stereotype="" package="MECON" xmi.id="3" abstract="0" documentation="Clase que se encarga del manejo del marco en general en los sistemas de intranet.
-Trabaja de forma general, llamando a los demas objetos para la realizacion del marco." name="Marco" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="31" type="void" abstract="0" documentation="Funcion que permite agregar archivos de estilo al sistema, ademas del generico." name="agregarEstilo" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo a incluir." name="archivo" static="0" scope="200" />
+   <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" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="indicacion de la ubicacion y nombre del archivo de configuracion" name="arch_configuracion" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="MECON_Perm" abstract="0" documentation="Objeto Permisos" name="obj_permiso" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="26" type="void" abstract="0" documentation="Constructor. Recibe como parametro el path del archivo de configuracion" name="Marco" 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="arch_configuracion" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="91" type="string" abstract="0" documentation="Funcion que se encarga mostrar en pantalla el contenido completo de la pagina. Este metodo utiliza la clase HTML_Page, lo que nos permite utilizar solamente clases y nada de hooks." name="display" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="30" type="void" abstract="0" documentation="Funcion que permite agregar archivos de script al sistema, ademas del generico." name="agregarScript" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo a incluir." name="archivo" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="32" type="array" abstract="0" documentation="Funcion que se encarga de la obtencion y generacion del array de configuracion.Recibe como parametro el directorio en donde se encuentra el sistema." name="obtenerConfiguracion" static="0" scope="201" >
+    <UML:Operation stereotype="" package="" xmi.id="32" type="array" abstract="0" documentation="Funcion que se encarga de la obtencion y generacion del array de configuracion. Recibe como parametro el path del archivo de configuracion" name="obtenerConfiguracion" static="0" scope="201" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Archivo de configuracion del sistema" name="archivo" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="97" type="void" abstract="0" documentation="Redefinicion de la funcion que permite agregar o adosar elementos o string al body de la pagina" name="addBody" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="97" type="void" abstract="0" documentation="Redefinicion de la funcion que permite agregar objetos o html al body de la pagina
+Si es un objeto debe tener un metodo toHtml y opcionalmente puede tener un getCSS.
+@deprecated" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="Mixed" abstract="0" documentation="Mixed. Recibe el contenido a agregar como body de la pagina" name="body" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="112" type="void" abstract="0" documentation="Funcion que se encarga de agregar a la pagina el contenido del header" name="header_display" static="0" scope="201" />
-    <UML:Operation stereotype="" package="" xmi.id="113" type="void" abstract="0" documentation="Funcion que se encarga de agregar a la pagina el contenido del body" name="body_display" static="0" scope="201" />
-    <UML:Operation stereotype="" package="" xmi.id="124" type="void" abstract="0" documentation="Funcion que permite adosar al titulo del sistema el titulo de la pagina." name="addTitle" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Titulo de la pagina." name="titulo" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="124" type="void" abstract="0" documentation="Funcion que permite concatenar lo pasado como parametro al titulo del sistema" name="addTitle" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="String que se quiere agregar al titulo del sistema" name="titulo" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="207" type="void" abstract="0" documentation="Setea la variable que define si hay que separar el body del menu" name="setEspacios" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="true" type="bool" abstract="0" documentation="Si es verdadero agrega los espacios, sino los elimina" name="espacios" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="214" type="void" abstract="0" documentation="Agrega un menu vertical a la izquierda en la pantalla." name="addMenuVertical" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Objeto u Html que representa el menu a mostrar." name="menuVertical" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="218" type="void" abstract="0" documentation="Permite habilitar o deshabilitar los links de una pagina (todos)" name="habilitarLinks" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="true" type="bool" abstract="0" documentation="True habilita los links, False no." name="param" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="220" type="string" abstract="0" documentation="Devuelve el html de la pagina" name="toHTML" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="223" type="void" abstract="0" documentation="Redefinicion de la funcion que permite agregar objetos o html al body de la pagina
+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="20" value="" type="Titulo" abstract="0" documentation="Referencia al objeto Titulo." name="titulo" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="125" value="" type="string" abstract="0" documentation="Titulo que quiere agregar el usuario al titulo del sistema" name="titulo2" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="21" value="" type="Copete" abstract="0" documentation="Referencia al objeto Copete." name="copete" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="24" value="" type="Menu" abstract="0" documentation="Referencia al objeto Menu." name="menu" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="25" value="" type="Pie" abstract="0" documentation="Referencia al objeto Pie." name="pie" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="123" value="" type="array" abstract="0" documentation="Html u objetos que se quieren incluir a la pagina" name="contenido" 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" />
+    <UML:Attribute stereotype="" package="" xmi.id="219" value="true" type="bool" abstract="0" documentation="Mantiene el estado de los links en la pagina. (True habilitados, False no)" name="links" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="9" abstract="0" documentation="Clase para el manejo de los copetes de los sistemas integrantes de intranet. Recibe el directorio porque debe obtener la imagen del directorio especificado." name="Copete" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="34" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde se encuentra instalado el sistema. El directorio es case sensitive." name="Copete" static="0" scope="200" >
+   <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:Operation stereotype="" package="" xmi.id="94" type="string" abstract="0" documentation="Funcion que devuelve el html de la imagen a incluir." name="darCopete" 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="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="Pie" static="0" scope="200" >
+   <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" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Array con los datos de configuracion del sistema." name="configuracion" static="0" scope="200" />
     </UML:Operation>
@@ -58,7 +79,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
     <UML:Operation stereotype="" package="" xmi.id="95" type="string" abstract="0" documentation="Funcion que devuelve el pie a incluir en el marco." name="darPie" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="36" value="" type="array" abstract="0" documentation="Array con los datos de configuracion del sistema." name="configuracion" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="13" abstract="0" documentation="Clase para el manejo del titulo de los sistemas." name="Titulo" static="0" scope="200" >
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="13" abstract="0" documentation="Clase para el manejo del titulo de los sistemas." name="MECON_Marco_Titulo" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="52" type="void" abstract="0" documentation="Constructor. Recibe como parametro el titulo del sistema." name="Titulo" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Titulo del sistema" name="titulo" static="0" scope="200" />
     </UML:Operation>
@@ -66,15 +87,15 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
     <UML:Operation stereotype="" package="" xmi.id="96" type="string" abstract="0" documentation="Funcion que devuelve el titulo del sistema." name="darTitulo" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="51" value="" type="string" abstract="0" documentation="Array con los datos de configuracion del sistema." name="titulo" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="14" abstract="0" documentation="Clase para el manejo de los menues y secciones de los sistemas." name="Menu" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="56" type="void" abstract="0" documentation="Constructor. Recibe como parametro el directorio en donde se encuentra el sistema." name="Menu" static="0" scope="200" >
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="14" abstract="0" documentation="Clase para el manejo de los menues y secciones de los sistemas." name="MECON_Marco_Menu" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="56" type="void" abstract="0" documentation="Recibe como parametro el directorio en donde se encuentra el sistema." name="MECON_Marco_Menu" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="array" abstract="0" documentation="Array con los datos de las secciones" name="configuracion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="57" type="void" abstract="0" documentation="Funcion que se encarga de generar el archivo que despues sera utilizado con la funcion EVAL." name="generarArchivo" static="0" scope="201" />
     <UML:Operation stereotype="" package="" xmi.id="58" type="string" abstract="0" documentation="Funcion que se encarga de obtener el archivo con los datos del objeto para ser utilizado con la funcion EVAL." name="obtenerArchivo" static="0" scope="201" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema instalado" name="directorio" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="76" type="array" abstract="0" documentation="Funcion que obtiene el arrayde configuracion de secciones." name="obtenerConfSecciones" static="0" scope="201" />
+    <UML:Operation stereotype="" package="" xmi.id="76" type="array" abstract="0" documentation="Funcion que obtiene el array de configuracion de secciones." name="obtenerConfSecciones" static="0" scope="201" />
     <UML:Operation stereotype="" package="" xmi.id="82" type="void" abstract="0" documentation="Funcion que arma a partir de la configuracion de las secciones el array con los objetos seccion." name="armarArraySecciones" static="0" scope="201" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Array con la informacion de las secciones" name="confSec" static="0" scope="200" />
     </UML:Operation>
@@ -84,24 +105,32 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="143" type="string" abstract="0" documentation="Funcion que se encarga de devolver lo que se debe mostrar en pantalla" name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="151" type="string" abstract="0" documentation="Devuelve el html del menu que hay que mostrar en pantalla" name="menuToHtml" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="55" value="" type="array" abstract="0" documentation="Array con la configuracion de las secciones del sistema;." name="configuracion" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="133" value="" type="array" abstract="0" documentation="Array de array con los componentes del menu" name="componentes" static="0" scope="201" />
+    <UML:Operation stereotype="" package="" xmi.id="222" type="string" abstract="0" documentation="Devuelve un string con el encabezado de la seccion
+" name="armarEncabezado" static="0" scope="201" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Titulo de la seccion" name="titulo" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="55" value="array()" type="array" abstract="0" documentation="Array con la configuracion de las secciones del sistema;." name="configuracion" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="133" value="array()" type="array" abstract="0" documentation="Array de array con los componentes del menu" name="componentes" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="142" value="" type="table" abstract="0" documentation="Variable que contiene la tabla general de menues que se va a mostrar en pantalla" name="tabla" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="147" value="" type="string" abstract="0" documentation="Variable que contiene el titulo de la seccion seleccionada" name="titulo" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="200" value="" type="array" abstract="0" documentation="Array con los objetos seccion." name="secciones" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="203" value="" type="string" abstract="0" documentation="" name="componentesVertical" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="147" value="''" type="string" abstract="0" documentation="Variable que contiene el titulo de la seccion seleccionada" name="titulo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="200" value="array()" type="array" abstract="0" documentation="Array con los objetos seccion." name="secciones" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="203" value="array()" type="string" abstract="0" documentation="Array de array con los componentes del menu en caso de ser este vertical" name="componentesVertical" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="15" abstract="0" documentation="Clase para el manejo de las paginas. " name="Pagina" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="66" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo pagina." name="Pagina" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo pagina." name="pagina" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="67" type="string" abstract="0" documentation="Funcion que devuelve un string con el link de a la pagina." name="link" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="65" value="" type="string" abstract="0" documentation="Nombre del archivo pagina." name="link" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="80" value="" type="string" abstract="0" documentation="Titulo de la pagina" name="titulo" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="81" value="" type="array" abstract="0" documentation="Permisos de la pagina" name="permisos" static="0" scope="201" />
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="15" abstract="0" documentation="Clase para el manejo de las paginas. " name="MECON_Marco_Pagina" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="66" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo pagina." name="MECON_Marco_Pagina" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo pagina." name="link" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Titulo de la pagina" name="titulo" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="array()" abstract="0" documentation="Array con los permisos necesarios para la pagina" name="permisos" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="65" value="''" type="string" abstract="0" documentation="Nombre del archivo pagina.
+x2c:get set" name="link" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="80" value="''" type="string" abstract="0" documentation="Titulo de la pagina
+x2c:get set" name="titulo" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="81" value="array()" type="array" abstract="0" documentation="Permisos de la pagina
+x2c:get set" name="permisos" static="0" scope="201" />
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="16" abstract="0" documentation="Clase seccion para el manejo de las secciones" name="Seccion" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="63" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre de la seccion" name="Seccion" static="1" scope="200" >
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="16" abstract="0" documentation="Clase para el manejo de las secciones" name="MECON_Marco_Seccion" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="63" type="void" abstract="0" documentation="Recibe como parametro el nombre de la seccion" name="MECON_Marco_Seccion" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Array con la informacion de la seccion" name="seccion" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="array" abstract="0" documentation="Array con la configuracion del sistema" name="configuracion" static="0" scope="200" />
     </UML:Operation>
@@ -116,356 +145,448 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
 Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSeleccionada" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la pagina a la cual se quiere acceder." name="link_sel" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="202" type="string" abstract="0" documentation="" name="toHtmlVertical" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="202" type="string" abstract="0" documentation="Devuelve el html a mostrar en pantalla" name="toHtmlVertical" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la seccion seleccionada" name="link_sel" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Indica si es el ultimo componente del menu.....en caso de serlo, debe mostrar la imagen con codito" name="ultimo" static="0" scope="200" />
     </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="60" value="" type="string" abstract="0" documentation="Nombre de la seccion." name="nombre" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="60" value="''" type="string" abstract="0" documentation="Nombre de la seccion." name="nombre" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="61" value="" type="Imagen" abstract="0" documentation="Este es el nombre de la imagen" name="imagen" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="62" value="" type="Menu" abstract="0" documentation="Hijos (menu) de la seccion." name="hijos" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="string" abstract="0" documentation="Valor string del tipo de menu de la seccion" name="tipoMenu" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="130" value="" type="array" abstract="0" documentation="Array con la configuracion del sistema" name="configuracion" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="149" value="" type="string" abstract="0" documentation="" name="menuHtml" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="118" value="''" type="string" abstract="0" documentation="Valor string del tipo de menu de la seccion" name="tipoMenu" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="130" value="array()" type="array" abstract="0" documentation="Array con la configuracion del sistema" name="configuracion" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="149" value="''" type="string" abstract="0" documentation="Contiene el html del menu de la seccion" name="menuHtml" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="221" value="''" type="string" abstract="0" documentation="Nombre del archivo pagina." name="link" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="MECON/Marco" xmi.id="17" abstract="0" documentation="Clase para el manejo de la animacion de las imagenes. Utilizada principalmente en la barra de secciones
-" name="ImagenAnimada" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="70" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo que contiene la imagen." name="ImagenAnimada" static="0" scope="200" >
+" name="MECON_Marco_ImagenAnimada" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="70" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo que contiene la imagen." name="MECON_Marco_ImagenAnimada" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo imagen.  " name="imagenComun" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="string" abstract="0" documentation="Imagen alterna con el mouse por arriba" name="imagenMouseOn" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="string" abstract="0" documentation="Imagen alterna cuando esta seleccionada la seccion" name="imagenSelect" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="4" value="null" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Imagen alterna con el mouse por arriba" name="imagenMouseOn" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Imagen alterna cuando esta seleccionada la seccion" name="imagenSelect" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="''" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="5" value="''" type="string" abstract="0" documentation="Nombre de la imagen animada." name="nombre" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="6" value="''" type="string" abstract="0" documentation="Link." name="link" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="71" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="68" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgMouseOn" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="69" value="" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgSelect" static="0" scope="201" />
-   </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="18" abstract="0" documentation="Clase para el manejo de las imagenes." name="Imagen" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="73" type="void" abstract="0" documentation="Constructor. Recibe como parametro el nombre del archivo imagen." name="Imagen" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del archivo imagen" name="imagen" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Directorio en donde se encuentra las imagenes" name="directorio" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="74" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir en pantalla." name="toHtml" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="83" type="void" abstract="0" documentation="" name="cargarAlt" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Alt de la imagen." name="alt" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="72" value="" type="string" abstract="0" documentation="Nombre del archivo imagen" name="imgComun" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="78" value="" type="string" abstract="0" documentation="Alt de la imagen" name="alt" static="0" scope="201" />
-    <UML:Attribute stereotype="" package="" xmi.id="205" value="" type="string" abstract="0" documentation="Directorio en donde se encuentran las imagenes" name="directorio" static="0" scope="201" />
+    <UML:Operation stereotype="" package="" xmi.id="209" type="string" abstract="0" documentation="" name="calcularImagen" static="0" scope="202" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la imagen." name="imagen" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Directorio." name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Modificador que indica una variante de la imagen." name="modificador" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="208" value="''" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgComun" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="68" value="''" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgMouseOn" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="69" value="''" type="string" abstract="0" documentation="Nombre del archivo imagen." name="imgSelect" static="0" scope="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="210" value="false" type="bool" abstract="0" documentation="Indica si la imagen esta seleccionada.
+x2c:get set" name="seleccionada" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="211" value="true" type="bool" abstract="0" documentation="Indica si está habilitado el link.
+x2c:get set" name="habilitada" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="212" value="''" type="string" abstract="0" documentation="Link a donde apunta la imagen.
+x2c:get set" name="link" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="213" value="''" type="string" abstract="0" documentation="Nombre de la imagen
+x2c:get set" name="nombre" static="0" scope="202" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="92" abstract="0" documentation="x2c:extern
 x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="100" abstract="0" documentation="Clase que se encarga del manejo de los menues horizontales" name="MenuHorizontal" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="111" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuHorizontal" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="5" value="null" type="array" abstract="0" documentation="Configuracion del sistema" name="configuracion" static="0" scope="200" />
-    </UML:Operation>
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="100" abstract="0" documentation="Clase que se encarga del manejo de los menues horizontales" name="MECON_Marco_MenuHorizontal" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="139" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Body para agregar a la pagina" name="body" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="null" type="mixed" abstract="0" documentation="Menu a mostrar" name="menu" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="103" abstract="0" documentation="Clase que se encarga del manejo de los menues verticales" name="MenuVertical" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="110" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuVertical" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="5" value="null" type="array" abstract="0" documentation="Configuracion del sistema" name="configuracion" static="0" scope="200" />
-    </UML:Operation>
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="103" abstract="0" documentation="Clase que se encarga del manejo de los menues verticales" name="MECON_Marco_MenuVertical" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="141" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Cuerpo del mensaje para agregar a la pagina" name="body" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="null" type="mixed" abstract="0" documentation="Menu a mostrar" name="menu" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="136" abstract="0" documentation="Clase que se encarga del manejo de los menues ocultos." name="MenuOculto" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="138" type="void" abstract="0" documentation="Constructor. Recibe el nombre del directorio en donde esta instalado el sistema" name="MenuOculto" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="array" abstract="0" documentation="Configuracion del sistema" name="configuracion" static="0" scope="200" />
-    </UML:Operation>
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="136" abstract="0" documentation="Clase que se encarga del manejo de los menues ocultos." name="MECON_Marco_MenuOculto" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="140" type="void" abstract="0" documentation="Funcion para agregar el cuerpo de la pagina a la pagina" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="String con el cuerpo a agregar a la pagina" name="body" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Titulo de la seccion seleccionada" name="titulo" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="null" type="mixed" abstract="0" documentation="Menu a mostrar" name="menu" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="170" abstract="0" documentation="x2c:extern" name="PAGINA" static="0" scope="200" />
    <UML:Class stereotype="" package="" xmi.id="182" abstract="0" documentation="x2c:extern" name="HTML::Table" static="0" scope="200" />
-   <UML:Class stereotype="" package="MECON/Marco" xmi.id="193" abstract="0" documentation="Clase que se encarga del manejo de los menues principales. Este menu es el de secciones general del sistema." name="MenuPrincipal" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="195" type="void" abstract="0" documentation="" name="menuPrincipal" static="0" scope="200" >
+   <UML:Class stereotype="" package="MECON/Marco" xmi.id="193" abstract="0" documentation="Clase que se encarga del manejo del menu principal. Este menu es el de secciones general del sistema." name="MECON_Marco_MenuPrincipal" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="195" type="void" abstract="0" documentation="" name="MECON_Marco_MenuPrincipal" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Configuracion del sistema" name="configuracion" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="199" type="void" abstract="0" documentation="Funcion que se encarga de agregar el body a la seccion seleccionada" name="addBody" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="" name="body" static="0" scope="200" />
     </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="197" value="" 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: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>
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="6" snapy="6" showatts="1" xmi.id="4" documentation="" type="402" showops="1" showpackage="0" name="Marco" localid="30000" showstereotype="0" showscope="1" font="helvetica,6,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <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:ConceptWidget usesdiagramfillcolour="0" width="198" showattsigs="601" usesdiagramusefillcolour="0" x="362" linecolour="#ff0000" y="117" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="187" usefillcolor="1" showattributes="1" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="147" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="144" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="209" showattsigs="601" usesdiagramusefillcolour="0" x="180" linecolour="#ff0000" y="894" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="529" showattsigs="601" usesdiagramusefillcolour="0" x="31" linecolour="#ff0000" y="773" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="210" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="381" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="176" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="61" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="253" showattsigs="601" usesdiagramusefillcolour="0" x="21" linecolour="#ff0000" y="365" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="143" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="123" showattsigs="601" usesdiagramusefillcolour="0" x="541" linecolour="#ff0000" y="21" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="637" linecolour="#ff0000" y="114" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="217" showattsigs="601" usesdiagramusefillcolour="0" x="459" linecolour="#ff0000" y="598" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="207" showattsigs="601" usesdiagramusefillcolour="0" x="647" linecolour="#ff0000" y="388" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="202" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="469" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="136" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="187" showattsigs="601" usesdiagramusefillcolour="0" x="508" linecolour="#ff0000" y="693" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="44" usefillcolor="1" showattributes="1" 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" totalcountb="3" indexb="2" widgetbid="3" widgetaid="9" documentation="" type="501" >
+     <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="150" starty="46" />
-       <endpoint endx="362" endy="241" />
+       <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" totalcountb="3" indexb="1" widgetbid="3" widgetaid="10" documentation="" type="501" >
+     <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="311" starty="72" />
-       <endpoint endx="362" endy="179" />
+       <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" totalcountb="2" indexb="1" widgetbid="3" widgetaid="13" documentation="" type="501" >
+     <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="461" endy="117" />
-      </linepath>
-     </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
-      <linepath>
-       <startpoint startx="432" starty="381" />
-       <endpoint endx="461" endy="304" />
-      </linepath>
-     </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="15" widgetaid="16" documentation="" type="500" >
-      <linepath>
-       <startpoint startx="147" starty="365" />
-       <endpoint endx="129" endy="226" />
+       <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="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
+     <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="207" starty="773" />
-       <endpoint endx="147" endy="508" />
+       <startpoint startx="484" starty="302" />
+       <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="2" indexa="1" totalcountb="2" indexb="1" widgetbid="18" widgetaid="17" documentation="" type="500" >
+     <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="295" starty="828" />
-       <endpoint endx="284" endy="894" />
+       <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="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
+     <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="560" starty="210" />
-       <endpoint endx="637" endy="124" />
+       <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" totalcountb="2" indexb="1" widgetbid="14" widgetaid="100" documentation="" type="500" >
+     <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="567" starty="598" />
-       <endpoint endx="432" endy="557" />
+       <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" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
+     <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="647" starty="407" />
-       <endpoint endx="537" endy="439" />
+       <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" totalcountb="4" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
+     <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="274" starty="412" />
-       <endpoint endx="327" endy="425" />
+       <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="4" indexa="2" totalcountb="3" indexb="2" widgetbid="16" widgetaid="14" documentation="" type="501" >
+     <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="327" starty="469" />
-       <endpoint endx="274" endy="460" />
+       <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" totalcountb="4" indexb="3" widgetbid="14" widgetaid="17" documentation="" type="501" >
+     <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="383" starty="773" />
-       <endpoint endx="327" endy="513" />
+       <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" totalcountb="3" indexb="2" widgetbid="14" widgetaid="136" documentation="" type="500" >
+     <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="751" starty="469" />
-       <endpoint endx="537" endy="498" />
+       <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" totalcountb="2" indexb="1" widgetbid="100" widgetaid="193" documentation="" type="500" >
+     <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="601" starty="693" />
-       <endpoint endx="567" endy="636" />
+       <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" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="152" documentation="" type="403" showops="1" showpackage="0" name="Marco - Contructores" localid="29994" showstereotype="0" showscope="1" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <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="57" usesdiagramusefillcolour="1" x="204" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="513" 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="173" usesdiagramusefillcolour="0" x="393" linecolour="#ff0000" y="54" instancename="PRINCIPAL" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="513" 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="67" usesdiagramusefillcolour="1" x="773" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="506" 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="169" usesdiagramusefillcolour="0" x="1116" linecolour="#ff0000" y="54" instancename="SUBMENU" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="26" usefillcolor="1" length="498" 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" 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="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="114" operation="MenuHorizontal(directorio : string) : void" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="153" xmi.id="154" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="480" linecolour="none" y="135" operation="Seccion(seccion : array, directorio : string) : void" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="155" xmi.id="156" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="177" operation="MenuHorizontal(directorio : string) : void" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="157" xmi.id="158" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="262" operation="agregarComponente" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="159" xmi.id="160" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="392" usesdiagramusefillcolour="1" x="807" linecolour="none" y="217" operation="return" widgetbid="29997" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="163" xmi.id="164" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="325" usesdiagramusefillcolour="1" x="480" linecolour="none" y="282" operation="return" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="165" xmi.id="166" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="313" operation="return" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29998" textid="167" xmi.id="168" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="102" operation="Marco(directorio : string) : void" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="171" xmi.id="172" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="353" operation="return" widgetbid="29994" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="173" xmi.id="174" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="386" operation="addBody(body : Mixed) : void" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="175" xmi.id="176" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="196" usesdiagramusefillcolour="1" x="35" linecolour="none" y="424" operation="display() : string" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29994" textid="177" xmi.id="178" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="245" usesdiagramusefillcolour="1" x="233" linecolour="none" y="452" operation="addBody(body : string) : void" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="179" xmi.id="180" 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" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="181" documentation="" type="403" showops="1" showpackage="0" name="Marco::addBody" localid="29996" showstereotype="0" showscope="1" font="helvetica,-1,12,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <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="57" usesdiagramusefillcolour="1" x="209" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="545" 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" 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" 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="109" usesdiagramusefillcolour="1" x="382" linecolour="none" y="54" instancename="" usesdiagramlinecolour="1" fillcolour="none" height="26" usefillcolor="1" length="536" 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="188" usesdiagramusefillcolour="1" x="48" linecolour="none" y="101" operation="display() : string" widgetbid="29999" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29997" textid="183" xmi.id="184" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="197" usesdiagramusefillcolour="1" x="238" linecolour="none" y="129" operation="addBody(body : string) : void" widgetbid="29996" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29999" textid="187" xmi.id="188" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="167" usesdiagramusefillcolour="1" x="437" linecolour="none" y="164" operation="addRow(Componentes)" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="189" xmi.id="190" font="helvetica,-1,12,0,50,0,0,0,0,0" />
-     <UML:MessageWidget usesdiagramfillcolour="1" width="167" usesdiagramusefillcolour="1" x="437" linecolour="none" y="195" operation="addRow(titulo)" widgetbid="29998" usesdiagramlinecolour="1" fillcolour="none" height="8" usefillcolor="1" seqnum="" widgetaid="29996" textid="191" xmi.id="192" 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="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="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/>
+   </diagram>
   </diagrams>
   <listview>
    <listitem open="1" type="800" id="-1" label="Views" >
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="1" type="803" id="-1" label="Marco" >
-      <listitem open="0" type="813" id="9" label="Copete" >
-       <listitem open="0" type="815" id="34" label="Copete" />
-       <listitem open="0" type="815" id="94" label="darCopete" />
+      <listitem open="1" type="813" id="92" label="HTML_Page" />
+      <listitem open="1" type="813" id="3" label="MECON_Marco" >
+       <listitem open="0" type="814" id="8" label="configuracion" />
+       <listitem open="0" type="814" id="206" label="espacios" />
+       <listitem open="0" type="814" id="219" label="links" />
+       <listitem open="0" type="814" id="215" label="menuVertical" />
+       <listitem open="0" type="815" id="26" label="MECON_Marco" />
+       <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="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" />
       </listitem>
-      <listitem open="1" type="813" id="92" label="HTML_Page" />
-      <listitem open="0" type="813" id="18" label="Imagen" >
-       <listitem open="0" type="814" id="78" label="alt" />
-       <listitem open="0" type="815" id="83" label="cargarAlt" />
-       <listitem open="0" type="814" id="205" label="directorio" />
-       <listitem open="0" type="815" id="73" label="Imagen" />
-       <listitem open="0" type="814" id="72" label="imgComun" />
-       <listitem open="0" type="815" id="74" label="toHtml" />
-      </listitem>
-      <listitem open="0" type="813" id="17" label="ImagenAnimada" >
-       <listitem open="0" type="815" id="70" label="ImagenAnimada" />
+      <listitem open="0" type="813" id="17" label="MECON_Marco_ImagenAnimada" >
+       <listitem open="0" type="814" id="211" label="habilitada" />
+       <listitem open="0" type="814" id="208" label="imgComun" />
        <listitem open="0" type="814" id="68" label="imgMouseOn" />
        <listitem open="0" type="814" id="69" label="imgSelect" />
+       <listitem open="0" type="814" id="212" label="link" />
+       <listitem open="0" type="814" id="213" label="nombre" />
+       <listitem open="0" type="814" id="210" label="seleccionada" />
+       <listitem open="0" type="815" id="70" label="MECON_Marco_ImagenAnimada" />
+       <listitem open="0" type="815" id="209" label="calcularImagen" />
        <listitem open="0" type="815" id="71" label="toHtml" />
       </listitem>
-      <listitem open="1" type="807" id="4" label="Marco" />
-      <listitem open="0" type="813" id="3" label="Marco" >
-       <listitem open="0" type="815" id="97" label="addBody" />
-       <listitem open="0" type="815" id="124" label="addTitle" />
-       <listitem open="0" type="815" id="31" label="agregarEstilo" />
-       <listitem open="0" type="815" id="30" label="agregarScript" />
-       <listitem open="0" type="815" id="113" label="body_display" />
-       <listitem open="0" type="814" id="8" label="configuracion" />
-       <listitem open="0" type="814" id="123" label="contenido" />
-       <listitem open="0" type="814" id="21" label="copete" />
-       <listitem open="0" type="815" id="91" label="display" />
-       <listitem open="0" type="815" id="112" label="header_display" />
-       <listitem open="0" type="815" id="26" label="Marco" />
-       <listitem open="0" type="814" id="24" label="menu" />
-       <listitem open="0" type="815" id="32" label="obtenerConfiguracion" />
-       <listitem open="0" type="814" id="25" label="pie" />
-       <listitem open="0" type="814" id="20" label="titulo" />
-       <listitem open="0" type="814" id="125" label="titulo2" />
-      </listitem>
-      <listitem open="0" type="813" id="14" label="Menu" >
-       <listitem open="0" type="815" id="134" label="agregarComponente" />
-       <listitem open="0" type="815" id="82" label="armarArraySecciones" />
+      <listitem open="0" type="813" id="14" label="MECON_Marco_Menu" >
        <listitem open="0" type="814" id="133" label="componentes" />
        <listitem open="0" type="814" id="203" label="componentesVertical" />
        <listitem open="0" type="814" id="55" label="configuracion" />
+       <listitem open="0" type="814" id="200" label="secciones" />
+       <listitem open="0" type="814" id="142" label="tabla" />
+       <listitem open="0" type="814" id="147" label="titulo" />
+       <listitem open="0" type="815" id="56" label="MECON_Marco_Menu" />
+       <listitem open="0" type="815" id="134" label="agregarComponente" />
+       <listitem open="0" type="815" id="82" label="armarArraySecciones" />
+       <listitem open="0" type="815" id="222" label="armarEncabezado" />
        <listitem open="0" type="815" id="57" label="generarArchivo" />
-       <listitem open="0" type="815" id="56" label="Menu" />
        <listitem open="0" type="815" id="151" label="menuToHtml" />
        <listitem open="0" type="815" id="58" label="obtenerArchivo" />
        <listitem open="0" type="815" id="76" label="obtenerConfSecciones" />
-       <listitem open="0" type="814" id="200" label="secciones" />
        <listitem open="0" type="815" id="126" label="serializarArraySecciones" />
-       <listitem open="0" type="814" id="142" label="tabla" />
-       <listitem open="0" type="814" id="147" label="titulo" />
        <listitem open="0" type="815" id="143" label="toHtml" />
       </listitem>
-      <listitem open="0" type="813" id="100" label="MenuHorizontal" >
+      <listitem open="0" type="813" id="100" label="MECON_Marco_MenuHorizontal" >
        <listitem open="0" type="815" id="139" label="addBody" />
-       <listitem open="0" type="815" id="111" label="MenuHorizontal" />
       </listitem>
-      <listitem open="0" type="813" id="136" label="MenuOculto" >
+      <listitem open="0" type="813" id="136" label="MECON_Marco_MenuOculto" >
        <listitem open="0" type="815" id="140" label="addBody" />
-       <listitem open="0" type="815" id="138" label="MenuOculto" />
       </listitem>
-      <listitem open="0" type="813" id="103" label="MenuVertical" >
+      <listitem open="0" type="813" id="193" label="MECON_Marco_MenuPrincipal" >
+       <listitem open="0" type="814" id="197" label="seccionSeleccionada" />
+       <listitem open="0" type="815" id="195" label="MECON_Marco_MenuPrincipal" />
+       <listitem open="0" type="815" id="199" label="addBody" />
+      </listitem>
+      <listitem open="0" type="813" id="103" label="MECON_Marco_MenuVertical" >
        <listitem open="0" type="815" id="141" label="addBody" />
-       <listitem open="0" type="815" id="110" label="MenuVertical" />
       </listitem>
-      <listitem open="0" type="813" id="15" label="Pagina" >
-       <listitem open="0" type="815" id="67" label="link" />
+      <listitem open="0" type="813" id="15" label="MECON_Marco_Pagina" >
        <listitem open="0" type="814" id="65" label="link" />
-       <listitem open="0" type="815" id="66" label="Pagina" />
        <listitem open="0" type="814" id="81" label="permisos" />
        <listitem open="0" type="814" id="80" label="titulo" />
+       <listitem open="0" type="815" id="66" label="MECON_Marco_Pagina" />
       </listitem>
-      <listitem open="0" type="813" id="10" label="Pie" >
+      <listitem open="0" type="813" id="10" label="MECON_Marco_Pie" >
        <listitem open="0" type="814" id="36" label="configuracion" />
-       <listitem open="0" type="815" id="95" label="darPie" />
        <listitem open="0" type="815" id="38" label="Pie" />
+       <listitem open="0" type="815" id="95" label="darPie" />
        <listitem open="0" type="815" id="39" label="toHtml" />
       </listitem>
-      <listitem open="0" type="813" id="16" label="Seccion" >
-       <listitem open="0" type="815" id="84" label="cargarHijos" />
-       <listitem open="0" type="815" id="127" label="desSerializarArraySecciones" />
+      <listitem open="0" type="813" id="16" label="MECON_Marco_Seccion" >
        <listitem open="0" type="814" id="130" label="configuracion" />
        <listitem open="0" type="814" id="62" label="hijos" />
        <listitem open="0" type="814" id="61" label="imagen" />
+       <listitem open="0" type="814" id="221" label="link" />
        <listitem open="0" type="814" id="149" label="menuHtml" />
        <listitem open="0" type="814" id="60" label="nombre" />
-       <listitem open="0" type="815" id="63" label="Seccion" />
        <listitem open="0" type="814" id="118" label="tipoMenu" />
+       <listitem open="0" type="815" id="63" label="MECON_Marco_Seccion" />
+       <listitem open="0" type="815" id="84" label="cargarHijos" />
+       <listitem open="0" type="815" id="127" label="desSerializarArraySecciones" />
        <listitem open="0" type="815" id="64" label="toHtml" />
        <listitem open="0" type="815" id="202" label="toHtmlVertical" />
        <listitem open="0" type="815" id="129" label="verifSeccionSeleccionada" />
       </listitem>
-      <listitem open="0" type="813" id="13" label="Titulo" >
+      <listitem open="0" type="813" id="13" label="MECON_Marco_Titulo" >
        <listitem open="0" type="814" id="51" label="titulo" />
-       <listitem open="0" type="815" id="96" label="darTitulo" />
        <listitem open="0" type="815" id="52" label="Titulo" />
+       <listitem open="0" type="815" id="96" label="darTitulo" />
        <listitem open="0" type="815" id="53" label="toHtml" />
       </listitem>
      </listitem>
-     <listitem open="1" type="810" id="181" label="Marco::addBody" />
-     <listitem open="1" type="810" id="152" label="Marco - Contructores" />
-     <listitem open="0" type="813" id="193" label="MenuPrincipal" >
-      <listitem open="0" type="815" id="199" label="addBody" />
-      <listitem open="0" type="815" id="195" label="menuPrincipal" />
-      <listitem open="0" type="814" id="197" label="seccionSeleccionada" />
-     </listitem>
-     <listitem open="1" type="803" id="-1" label="Secuencia" >
+     <listitem open="0" type="803" id="-1" label="Secuencia" >
+      <listitem open="1" type="810" id="152" label="Marco - Contructores" />
+      <listitem open="1" type="810" id="181" label="Marco::addBody" />
       <listitem open="1" type="813" id="182" label="HTML::Table" />
       <listitem open="1" type="813" id="170" label="PAGINA" />
      </listitem>
+     <listitem open="1" type="807" id="216" label="Marco - Clases" />
+     <listitem open="1" type="807" id="4" label="Marco - Relaciones" />
     </listitem>
     <listitem open="1" type="802" id="-1" label="Use Case View" />
+    <listitem open="1" type="821" id="-1" label="Component View" />
+    <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>
+  <codegeneration/>
  </XMI.content>
 </XMI>