From: Leandro Lucarella <llucax@gmail.com>
Date: Mon, 10 Nov 2003 13:58:12 +0000 (+0000)
Subject: Se agrega nuevo campo para indicar si se debe abrir en ventana nueva.
X-Git-Tag: svn_import~6
X-Git-Url: https://git.llucax.com/mecon/ai.git/commitdiff_plain/c3e87c06cf63d18cc37264de1bf8c611da031cad

Se agrega nuevo campo para indicar si se debe abrir en ventana nueva.
---

diff --git a/doc/uml.xmi b/doc/uml.xmi
index 77312b5..2baf8aa 100644
--- a/doc/uml.xmi
+++ b/doc/uml.xmi
@@ -3,222 +3,220 @@
  <XMI.header>
   <XMI.documentation>
    <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
-   <XMI.exporterVersion>1.1.5</XMI.exporterVersion>
+   <XMI.exporterVersion>1.2.0</XMI.exporterVersion>
    <XMI.exporterEncoding>UnicodeUTF8</XMI.exporterEncoding>
   </XMI.documentation>
   <XMI.model xmi.name="uml" href="/home/luca/public_html/ai/doc/uml.xmi" />
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="412" documentation="" uniqueid="539" />
+  <docsettings viewid="412" documentation="" uniqueid="577" />
   <umlobjects>
-   <UML:Class stereotype="" package="AI" xmi.id="413" abstract="0" documentation="Servicio." name="AI_Servicio" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="465" type="void" abstract="0" documentation="" name="AI_Servicio" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del servicio." name="servicio" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="458" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el Servicio como nuevo." name="nuevo" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="539" type="mixed" abstract="0" documentation="Carga hijos de un servicio. Si hubo error devuelve un PEAR_Error, si no hubo error, devuleve un array de objetos (los hijos)." name="cargarHijos" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado a usar." name="db" static="0" scope="201" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Si es true, sólo trae los servicios habilitados." name="soloHabilitados" static="0" scope="201" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="false" type="mixed" abstract="0" documentation="Indica el orden en que se deben traer los hijos. Puede ser AI_SERVICIO_ORDEN_CANT_HIJOS, AI_SERVICIO_ORDEN_LONG_NOMBRE o un campo arbitrario." name="orden" static="0" scope="201" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="428" value="0" type="int" abstract="0" documentation="ID del servicio." name="servicio" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="452" value="0" type="int" abstract="0" documentation="" name="servicio_padre" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="429" value="''" type="string" abstract="0" documentation="Nombre del servicio." name="nombre" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="433" value="''" type="string" abstract="0" documentation="Descripción del servicio." name="descripcion" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="430" value="''" type="string" abstract="0" documentation="Ícono del servicio." name="icono" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="431" value="''" type="string" abstract="0" documentation="Enlace a donde el este servicio." name="link" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="432" value="''" type="string" abstract="0" documentation="Enlace a donde se encuentra la ayuda del servicio." name="link_ayuda" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="434" value="false" type="bool" abstract="0" documentation="True si es necesario que el usuario se loguee para usar el servicio." name="necesita_logueo" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="534" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
+   <UML:Package stereotype="" xmi.id="540" abstract="0" documentation="" name="AI" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="413" abstract="0" documentation="Servicio." name="AI_Servicio" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="465" type="void" abstract="0" documentation="" name="AI_Servicio" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del servicio." name="servicio" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="458" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el Servicio como nuevo." name="nuevo" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="539" type="mixed" abstract="0" documentation="Carga hijos de un servicio. Si hubo error devuelve un PEAR_Error, si no hubo error, devuleve un array de objetos (los hijos)." name="cargarHijos" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado a usar." name="db" static="0" scope="201" />
+     <UML:Parameter stereotype="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Si es true, sólo trae los servicios habilitados." name="soloHabilitados" static="0" scope="201" />
+     <UML:Parameter stereotype="" xmi.id="3" value="false" type="mixed" abstract="0" documentation="Indica el orden en que se deben traer los hijos. Puede ser AI_SERVICIO_ORDEN_CANT_HIJOS, AI_SERVICIO_ORDEN_LONG_NOMBRE o un campo arbitrario." name="orden" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" xmi.id="428" value="0" type="int" abstract="0" documentation="ID del servicio." name="servicio" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="452" value="0" type="int" abstract="0" documentation="" name="servicio_padre" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="429" value="''" type="string" abstract="0" documentation="Nombre del servicio." name="nombre" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="433" value="''" type="string" abstract="0" documentation="Descripción del servicio." name="descripcion" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="430" value="''" type="string" abstract="0" documentation="Ícono del servicio." name="icono" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="431" value="''" type="string" abstract="0" documentation="Enlace a donde el este servicio." name="link" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="432" value="''" type="string" abstract="0" documentation="Enlace a donde se encuentra la ayuda del servicio." name="link_ayuda" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="434" value="false" type="bool" abstract="0" documentation="True si es necesario que el usuario se loguee para usar el servicio." name="necesita_logueo" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="534" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="576" value="0" type="bool" abstract="0" documentation="Indica si debe abrirse en una ventana nueva." name="ventana_nueva" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="AI" xmi.id="416" abstract="0" documentation="Sistema." name="AI_Sistema" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="466" type="void" abstract="0" documentation="" name="AI_Sistema" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del sistema." name="sistema" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="536" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado de donde cargar el sistema." name="db" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="459" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el servicio como nuevo." name="nuevo" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="531" type="array" abstract="0" documentation="" name="getSistemas" static="1" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de donde obtener los sistemas." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="soloHabilitados" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="where" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="528" type="array" abstract="0" documentation="Obtiene un array con los identificadores de los sistemas cargados." name="getSistemasArray" static="1" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de la cual obtener los sistemas." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="where" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="437" value="0" type="int" abstract="0" documentation="ID del sistema (ID en SAMURAI)." name="sistema" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="513" value="''" type="string" abstract="0" documentation="Nombre del sistema (sólo de lectura, extraído de SAMURAI)." name="nombre" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="514" value="''" type="string" abstract="0" documentation="Descripción del sistema (sólo de lectura, extraído de SAMURAI)." name="descripcion" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="438" value="''" type="string" abstract="0" documentation="Ícono del sistema." name="icono" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="439" value="''" type="string" abstract="0" documentation="Enlace a donde se encuentra el sistema." name="link" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="440" value="''" type="string" abstract="0" documentation="Enlace a la ayuda del sistema." name="link_ayuda" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="533" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="538" value="'php'" type="string" abstract="0" documentation="" name="tipo" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="416" abstract="0" documentation="Sistema." name="AI_Sistema" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="466" type="void" abstract="0" documentation="" name="AI_Sistema" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del sistema." name="sistema" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="536" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado de donde cargar el sistema." name="db" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="459" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el servicio como nuevo." name="nuevo" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="531" type="array" abstract="0" documentation="" name="getSistemas" static="1" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de donde obtener los sistemas." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="soloHabilitados" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="3" value="''" type="string" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="where" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="528" type="array" abstract="0" documentation="Obtiene un array con los identificadores de los sistemas cargados." name="getSistemasArray" static="1" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de la cual obtener los sistemas." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="3" value="''" type="string" abstract="0" documentation="Clausula WHERE para filtrar la búsqueda." name="where" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" xmi.id="437" value="0" type="int" abstract="0" documentation="ID del sistema (ID en SAMURAI)." name="sistema" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="513" value="''" type="string" abstract="0" documentation="Nombre del sistema (sólo de lectura, extraído de SAMURAI)." name="nombre" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="514" value="''" type="string" abstract="0" documentation="Descripción del sistema (sólo de lectura, extraído de SAMURAI)." name="descripcion" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="438" value="''" type="string" abstract="0" documentation="Ícono del sistema." name="icono" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="439" value="''" type="string" abstract="0" documentation="Enlace a donde se encuentra el sistema." name="link" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="440" value="''" type="string" abstract="0" documentation="Enlace a la ayuda del sistema." name="link_ayuda" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="533" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="538" value="'php'" type="string" abstract="0" documentation="" name="tipo" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="AI" xmi.id="469" abstract="0" documentation="" name="AI_Error" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="470" type="void" abstract="0" documentation="" name="AI_Error" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Código de error." name="codigo" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Mensaje para mostrar" name="mensaje" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="469" abstract="0" documentation="" name="AI_Error" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="470" type="void" abstract="0" documentation="" name="AI_Error" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="int" abstract="0" documentation="Código de error." name="codigo" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="''" type="string" abstract="0" documentation="Mensaje para mostrar" name="mensaje" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="530" type="bool" abstract="0" documentation="" name="isError" static="1" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Variable a evaluar si es un error." name="error" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="530" type="bool" abstract="0" documentation="" name="isError" static="1" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Variable a evaluar si es un error." name="error" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
-   <UML:Class stereotype="" package="" xmi.id="471" abstract="0" documentation="x2c:extern
+   <UML:Class stereotype="" xmi.id="471" abstract="0" documentation="x2c:extern
 x2c:include: PEAR.php" name="PEAR_Error" static="0" scope="200" />
-   <UML:Class stereotype="" package="AI" xmi.id="486" abstract="0" documentation="Grupo de secciones." name="AI_GrupoSecciones" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="495" type="void" abstract="0" documentation="" name="AI_GrupoSecciones" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del grupo." name="grupo" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="486" abstract="0" documentation="Grupo de secciones." name="AI_GrupoSecciones" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="495" type="void" abstract="0" documentation="" name="AI_GrupoSecciones" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="0" type="int" abstract="0" documentation="ID del grupo." name="grupo" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="496" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o Resultado a utilizar." name="db" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="496" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o Resultado a utilizar." name="db" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="497" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el Grupo de Secciones como nuevo." name="nuevo" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="497" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB donde guardar." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a guardar el Grupo de Secciones como nuevo." name="nuevo" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="498" type="PEAR_Error" abstract="0" documentation="" name="borrar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB de donde borrar." name="db" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="498" type="PEAR_Error" abstract="0" documentation="" name="borrar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="DB de donde borrar." name="db" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="512" type="array" abstract="0" documentation="Obtiene un array con una lista de secciones.
+    <UML:Operation stereotype="" xmi.id="512" type="array" abstract="0" documentation="Obtiene un array con una lista de secciones.
 Sólo se obtienen las secciones que todavía no pertenecen a ningún grupo. Si se especifica un grupo, se agregan las secciones de ese grupo al &lt;em>array&lt;/em> resultante." name="getSeccionesArray" static="1" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="DB" abstract="0" documentation="Base de datos a usar para obtener los datos." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="0" type="int" abstract="0" documentation="Grupo del cual obtener las secciones." name="grupo" static="0" scope="201" />
-    </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="537" type="AI_GrupoSecciones" abstract="0" documentation="Obtiene el grupo al que pertenece una sección." name="getGrupo" static="1" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Sección a buscar." name="seccion" static="0" scope="201" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="DB" abstract="0" documentation="DB a usar." name="db" static="0" scope="201" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="487" value="0" type="int" abstract="0" documentation="ID del grupo de secciones." name="grupo" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="488" value="''" type="string" abstract="0" documentation="Nombre." name="nombre" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="489" value="0" type="int" abstract="0" documentation="" name="grupo_padre" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="491" value="array()" type="array" abstract="0" documentation="Secciones que pertenecen a este grupo." name="secciones" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="492" value="0" type="int" abstract="0" documentation="Antigüedad (en días) de las noticias a mostrar." name="antiguedad" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="493" value="false" type="bool" abstract="0" documentation="True si hay que mostrar los grupos hijos (?? FIXME)." name="mostrar_hijos" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="535" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="1" value="null" type="DB" abstract="0" documentation="Base de datos a usar para obtener los datos." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="0" type="int" abstract="0" documentation="Grupo del cual obtener las secciones." name="grupo" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" xmi.id="537" type="AI_GrupoSecciones" abstract="0" documentation="Obtiene el grupo al que pertenece una sección." name="getGrupo" static="1" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="int" abstract="0" documentation="Sección a buscar." name="seccion" static="0" scope="201" />
+     <UML:Parameter stereotype="" xmi.id="2" value="null" type="DB" abstract="0" documentation="DB a usar." name="db" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" xmi.id="487" value="0" type="int" abstract="0" documentation="ID del grupo de secciones." name="grupo" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="488" value="''" type="string" abstract="0" documentation="Nombre." name="nombre" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="489" value="0" type="int" abstract="0" documentation="" name="grupo_padre" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="491" value="array()" type="array" abstract="0" documentation="Secciones que pertenecen a este grupo." name="secciones" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="492" value="0" type="int" abstract="0" documentation="Antigüedad (en días) de las noticias a mostrar." name="antiguedad" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="493" value="false" type="bool" abstract="0" documentation="True si hay que mostrar los grupos hijos (?? FIXME)." name="mostrar_hijos" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="535" value="true" type="bool" abstract="0" documentation="Indica si esta habilitado." name="habilitado" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="AI" xmi.id="516" abstract="1" documentation="Objecto con capacidad de guardarse, cargarse y borrarse de una base de datos." name="AI_DBObject" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="519" type="void" abstract="0" documentation="" name="AI_DBObject" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="0" type="int" abstract="0" documentation="Identificador del objeto a cargar." name="id" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Archivo de configuración del objeto." name="confFile" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="516" abstract="1" documentation="Objecto con capacidad de guardarse, cargarse y borrarse de una base de datos." name="AI_DBObject" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="519" type="void" abstract="0" documentation="" name="AI_DBObject" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="0" type="int" abstract="0" documentation="Identificador del objeto a cargar." name="id" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="''" type="string" abstract="0" documentation="Archivo de configuración del objeto." name="confFile" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="520" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado a usar para cargar el objeto." name="db" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="520" type="PEAR_Error" abstract="0" documentation="" name="cargar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado a usar para cargar el objeto." name="db" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="521" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos a usar para guardar el objeto." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="array" abstract="0" documentation="Array con los datos a guardar en la DB (donde la clave es el campo y el valor el contenido a guardar)." name="datos" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="4" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a cargar el objeto en la base como si fuera nuevo." name="nuevo" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="521" type="PEAR_Error" abstract="0" documentation="" name="guardar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos a usar para guardar el objeto." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="3" value="" type="array" abstract="0" documentation="Array con los datos a guardar en la DB (donde la clave es el campo y el valor el contenido a guardar)." name="datos" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="4" value="false" type="bool" abstract="0" documentation="Si es true, se fuerza a cargar el objeto en la base como si fuera nuevo." name="nuevo" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="522" type="PEAR_Error" abstract="0" documentation="" name="borrar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos a usar para borrar el objeto." name="db" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="522" type="PEAR_Error" abstract="0" documentation="" name="borrar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos a usar para borrar el objeto." name="db" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="523" type="AI_DBObject" abstract="0" documentation="" name="__clone" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="517" value="array()" type="array" abstract="0" documentation="" name="conf" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="523" type="AI_DBObject" abstract="0" documentation="" name="__clone" static="0" scope="200" />
+    <UML:Attribute stereotype="" xmi.id="517" value="array()" type="array" abstract="0" documentation="" name="conf" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="AI" xmi.id="524" abstract="1" documentation="" name="AI_DBTreeObject" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="526" type="void" abstract="0" documentation="" name="AI_DBTreeObject" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="0" type="int" abstract="0" documentation="Identificador del objecto." name="id" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Configuración del objeto." name="confFile" static="0" scope="200" />
+   <UML:Class stereotype="" xmi.id="524" abstract="1" documentation="" name="AI_DBTreeObject" static="0" scope="200" packageid="540" >
+    <UML:Operation stereotype="" xmi.id="526" type="void" abstract="0" documentation="" name="AI_DBTreeObject" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="0" type="int" abstract="0" documentation="Identificador del objecto." name="id" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="''" type="string" abstract="0" documentation="Configuración del objeto." name="confFile" static="0" scope="200" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="527" type="mixed" abstract="0" documentation="Carga hijos de un objeto. Si hubo error devuelve un PEAR_Error, si no hubo error, devuleve un array de objetos (los hijos)." name="cargarHijos" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado de donde cargar los hijos." name="db" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Si es true, se cargan solo los hijos con el flag habilitado." name="soloHabilitados" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="'nombre'" type="string" abstract="0" documentation="Indica cómo ordenar los hijos cargados." name="orden" static="0" scope="201" />
+    <UML:Operation stereotype="" xmi.id="527" type="mixed" abstract="0" documentation="Carga hijos de un objeto. Si hubo error devuelve un PEAR_Error, si no hubo error, devuleve un array de objetos (los hijos)." name="cargarHijos" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="mixed" abstract="0" documentation="Base de datos o resultado de donde cargar los hijos." name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Si es true, se cargan solo los hijos con el flag habilitado." name="soloHabilitados" static="0" scope="200" />
+     <UML:Parameter stereotype="" xmi.id="3" value="'nombre'" type="string" abstract="0" documentation="Indica cómo ordenar los hijos cargados." name="orden" static="0" scope="201" />
     </UML:Operation>
-    <UML:Operation stereotype="" package="" xmi.id="529" type="PEAR_Error" abstract="0" documentation="Borra el objeto de la base de datos verificando que no tenga hijos." name="borrar" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de la cual borrar el objeto." name="db" static="0" scope="200" />
+    <UML:Operation stereotype="" xmi.id="529" type="PEAR_Error" abstract="0" documentation="Borra el objeto de la base de datos verificando que no tenga hijos." name="borrar" static="0" scope="200" >
+     <UML:Parameter stereotype="" xmi.id="1" value="" type="DB" abstract="0" documentation="Base de datos de la cual borrar el objeto." name="db" static="0" scope="200" />
     </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="525" value="array()" type="array" abstract="0" documentation="Grupos de secciones que tiene este grupo.
+    <UML:Attribute stereotype="" xmi.id="525" value="array()" type="array" abstract="0" documentation="Grupos de secciones que tiene este grupo.
 x2c:get" name="hijos" static="0" scope="202" />
    </UML:Class>
+   <UML:Datatype stereotype="datatype" xmi.id="577" abstract="0" documentation="" name="bool" static="0" scope="200" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="469" roleb="471" multia="" doca="" multib="" docb="" xmi.id="541" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="416" roleb="516" multia="" doca="" multib="" docb="" xmi.id="545" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="524" roleb="516" multia="" doca="" multib="" docb="" xmi.id="549" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="486" roleb="524" multia="" doca="" multib="" docb="" xmi.id="553" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
+   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="413" roleb="524" multia="" doca="" multib="" docb="" xmi.id="557" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="834" snapy="10" showatts="1" xmi.id="412" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="648" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="826" snapy="10" showatts="1" xmi.id="412" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="648" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="152" showattsigs="601" usesdiagramusefillcolour="0" x="386" linecolour="#ff0000" y="353" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="169" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="413" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="369" showattsigs="601" usesdiagramusefillcolour="0" x="9" linecolour="#ff0000" y="180" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="416" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="241" showattsigs="601" usesdiagramusefillcolour="0" x="89" linecolour="#ff0000" y="430" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="45" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="469" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="68" showattsigs="601" usesdiagramusefillcolour="0" x="175" linecolour="#ff0000" y="374" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#dcdcdc" height="23" usefillcolor="1" showattributes="0" isinstance="0" xmi.id="471" showoperations="0" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,75,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="142" showattsigs="601" usesdiagramusefillcolour="0" x="572" linecolour="#ff0000" y="354" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="486" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="324" showattsigs="601" usesdiagramusefillcolour="0" x="244" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="91" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="516" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="415" showattsigs="601" usesdiagramusefillcolour="0" x="415" linecolour="#ff0000" y="180" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="65" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="524" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="397" showattsigs="601" usesdiagramusefillcolour="0" x="110" linecolour="#ff0000" y="410" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="413" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="369" showattsigs="601" usesdiagramusefillcolour="0" x="7" linecolour="#ff0000" y="162" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="416" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="241" showattsigs="601" usesdiagramusefillcolour="0" x="564" linecolour="#ff0000" y="89" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="45" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="469" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="68" showattsigs="601" usesdiagramusefillcolour="0" x="650" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#dcdcdc" height="25" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="471" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="293" showattsigs="601" usesdiagramusefillcolour="0" x="523" linecolour="#ff0000" y="410" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="486" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="324" showattsigs="601" usesdiagramusefillcolour="0" x="169" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="91" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="516" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,75,1,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="415" showattsigs="601" usesdiagramusefillcolour="0" x="393" linecolour="#ff0000" y="162" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="65" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="524" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,75,1,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="471" widgetaid="469" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="471" widgetaid="469" xmi.id="541" >
       <linepath>
-       <startpoint startx="209" starty="430" />
-       <endpoint endx="209" endy="397" />
+       <startpoint startx="684" starty="89" />
+       <endpoint endx="684" endy="45" />
       </linepath>
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-4" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-9" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="178" linecolour="none" y="453" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="541" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-119" linecolour="none" y="-7" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="562" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-84" linecolour="none" y="30" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="563" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-144" linecolour="none" y="19" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="541" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-106" linecolour="none" y="2" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="541" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="516" widgetaid="416" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="516" widgetaid="416" xmi.id="545" >
       <linepath>
-       <startpoint startx="193" starty="180" />
-       <endpoint endx="352" endy="101" />
+       <startpoint startx="191" starty="162" />
+       <endpoint endx="277" endy="111" />
       </linepath>
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="27" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="55" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="33" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="54" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="331" linecolour="none" y="185" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="545" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-1" linecolour="none" y="-17" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="565" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-20" linecolour="none" y="11" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="566" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-2" linecolour="none" y="-18" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="545" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-21" linecolour="none" y="10" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="545" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="516" widgetaid="524" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="516" widgetaid="524" xmi.id="549" >
       <linepath>
-       <startpoint startx="622" starty="180" />
-       <endpoint endx="460" endy="101" />
+       <startpoint startx="600" starty="162" />
+       <endpoint endx="385" endy="111" />
       </linepath>
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="26" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="648" linecolour="none" y="180" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="549" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-33" linecolour="none" y="10" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="568" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-212" linecolour="none" y="-22" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="569" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="4" linecolour="none" y="-18" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="549" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-221" linecolour="none" y="4" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="549" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="2" widgetbid="524" widgetaid="486" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="524" widgetaid="486" xmi.id="553" >
       <linepath>
-       <startpoint startx="572" starty="445" />
-       <endpoint endx="691" endy="245" />
+       <startpoint startx="669" starty="410" />
+       <endpoint endx="669" endy="227" />
       </linepath>
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="39" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="7" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="79" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="715" linecolour="none" y="381" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="553" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="98" linecolour="none" y="-61" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="571" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-58" linecolour="none" y="-20" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="572" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="85" linecolour="none" y="-28" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="553" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="12" linecolour="none" y="-48" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="553" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="3" indexb="1" widgetbid="524" widgetaid="413" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="524" widgetaid="413" xmi.id="557" >
       <linepath>
-       <startpoint startx="462" starty="353" />
-       <endpoint endx="553" endy="245" />
+       <startpoint startx="308" starty="410" />
+       <endpoint endx="531" endy="227" />
       </linepath>
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="55" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="13" linecolour="none" y="28" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="62" linecolour="none" y="-26" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="48" linecolour="none" y="1" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="23" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,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="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="109" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="652" linecolour="none" y="351" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="557" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-172" linecolour="none" y="85" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="574" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="107" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="575" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-185" linecolour="none" y="57" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="557" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="150" linecolour="none" y="26" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="23" usefillcolor="1" pretext="" isinstance="0" xmi.id="557" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
     </associations>
    </diagram>
@@ -226,74 +224,11 @@ x2c:get" name="hijos" static="0" scope="202" />
   <listview>
    <listitem open="1" type="800" id="-1" label="Vistas" >
     <listitem open="1" type="801" id="-1" label="Vista lógica" >
-     <listitem open="1" type="803" id="-1" label="AI" >
-      <listitem open="0" type="813" id="516" label="AI_DBObject" >
-       <listitem open="0" type="814" id="517" label="conf" />
-       <listitem open="0" type="815" id="519" label="AI_DBObject" />
-       <listitem open="0" type="815" id="523" label="__clone" />
-       <listitem open="0" type="815" id="522" label="borrar" />
-       <listitem open="0" type="815" id="520" label="cargar" />
-       <listitem open="0" type="815" id="521" label="guardar" />
-      </listitem>
-      <listitem open="1" type="813" id="524" label="AI_DBTreeObject" >
-       <listitem open="0" type="814" id="525" label="hijos" />
-       <listitem open="0" type="815" id="526" label="AI_DBTreeObject" />
-       <listitem open="0" type="815" id="529" label="borrar" />
-       <listitem open="0" type="815" id="527" label="cargarHijos" />
-      </listitem>
-      <listitem open="0" type="813" id="469" label="AI_Error" >
-       <listitem open="0" type="815" id="470" label="AI_Error" />
-       <listitem open="0" type="815" id="530" label="isError" />
-      </listitem>
-      <listitem open="0" type="813" id="486" label="AI_GrupoSecciones" >
-       <listitem open="0" type="814" id="492" label="antiguedad" />
-       <listitem open="0" type="814" id="487" label="grupo" />
-       <listitem open="0" type="814" id="489" label="grupo_padre" />
-       <listitem open="0" type="814" id="535" label="habilitado" />
-       <listitem open="0" type="814" id="493" label="mostrar_hijos" />
-       <listitem open="0" type="814" id="488" label="nombre" />
-       <listitem open="0" type="814" id="491" label="secciones" />
-       <listitem open="0" type="815" id="495" label="AI_GrupoSecciones" />
-       <listitem open="0" type="815" id="498" label="borrar" />
-       <listitem open="0" type="815" id="496" label="cargar" />
-       <listitem open="0" type="815" id="537" label="getGrupo" />
-       <listitem open="0" type="815" id="512" label="getSeccionesArray" />
-       <listitem open="0" type="815" id="497" label="guardar" />
-      </listitem>
-      <listitem open="1" type="813" id="413" label="AI_Servicio" >
-       <listitem open="0" type="814" id="433" label="descripcion" />
-       <listitem open="0" type="814" id="534" label="habilitado" />
-       <listitem open="0" type="814" id="430" label="icono" />
-       <listitem open="0" type="814" id="431" label="link" />
-       <listitem open="0" type="814" id="432" label="link_ayuda" />
-       <listitem open="0" type="814" id="434" label="necesita_logueo" />
-       <listitem open="0" type="814" id="429" label="nombre" />
-       <listitem open="0" type="814" id="428" label="servicio" />
-       <listitem open="0" type="814" id="452" label="servicio_padre" />
-       <listitem open="0" type="815" id="465" label="AI_Servicio" />
-       <listitem open="0" type="815" id="539" label="cargarHijos" />
-       <listitem open="0" type="815" id="458" label="guardar" />
-      </listitem>
-      <listitem open="0" type="813" id="416" label="AI_Sistema" >
-       <listitem open="0" type="814" id="514" label="descripcion" />
-       <listitem open="0" type="814" id="533" label="habilitado" />
-       <listitem open="0" type="814" id="438" label="icono" />
-       <listitem open="0" type="814" id="439" label="link" />
-       <listitem open="0" type="814" id="440" label="link_ayuda" />
-       <listitem open="0" type="814" id="513" label="nombre" />
-       <listitem open="0" type="814" id="437" label="sistema" />
-       <listitem open="0" type="814" id="538" label="tipo" />
-       <listitem open="0" type="815" id="466" label="AI_Sistema" />
-       <listitem open="0" type="815" id="536" label="cargar" />
-       <listitem open="0" type="815" id="531" label="getSistemas" />
-       <listitem open="0" type="815" id="528" label="getSistemasArray" />
-       <listitem open="0" type="815" id="459" label="guardar" />
-      </listitem>
-     </listitem>
-     <listitem open="1" type="803" id="-1" label="Externo" >
-      <listitem open="0" type="813" id="471" label="PEAR_Error" />
-     </listitem>
      <listitem open="0" type="807" id="412" label="Clases" />
+     <listitem open="1" type="818" id="540" label="AI" />
+     <listitem open="1" type="830" id="-1" label="Datatypes" >
+      <listitem open="1" type="829" id="577" label="bool" />
+     </listitem>
     </listitem>
     <listitem open="1" type="802" id="-1" label="Vista de caso de uso" />
     <listitem open="1" type="821" id="-1" label="Component View" />
diff --git a/lib/AI/Servicio.php b/lib/AI/Servicio.php
index 29f2070..6928d32 100644
--- a/lib/AI/Servicio.php
+++ b/lib/AI/Servicio.php
@@ -54,7 +54,6 @@ define('AI_SERVICIO_ORDEN_LONG_NOMBRE', 2);
 /**
  * Servicio.
  *
- * @package AI
  * @access public
  */
 class AI_Servicio extends AI_DBTreeObject {
@@ -128,6 +127,14 @@ class AI_Servicio extends AI_DBTreeObject {
      */
     var $habilitado = true;
 
+    /**
+     * Indica si debe abrirse en una ventana nueva.
+     *
+     * @var    bool $ventana_nueva
+     * @access public
+     */
+    var $ventana_nueva = false;
+
     // ~X2C
 
     // +X2C Operation 465
diff --git a/sql/servicio.sql b/sql/servicio.sql
index a0930d3..620fe09 100644
--- a/sql/servicio.sql
+++ b/sql/servicio.sql
@@ -36,6 +36,7 @@ CREATE TABLE servicio (
     descripcion     VARCHAR(255)            NOT NULL default '',
     necesita_logueo TINYINT(1)              NOT NULL default 0,
     habilitado      TINYINT(1)              NOT NULL default 1,
+    ventana_nueva   TINYINT(1)              NOT NULL default 0,
     -- Para para determinar de que forma se muestran las cosas
     -- control         VARCHAR(255)    NOT NULL default '',
     PRIMARY KEY (servicio)