Author: ftoledo Date: 2007-08-08 16:21:49 -0300 (Wed, 08 Aug 2007) New Revision: 4941 Removed: prosistem/alba/trunk/alba/config/schema.xml.sample Modified: prosistem/alba/trunk/alba/doc/DER.xmi Log: sacando schema de ejmplo y agregando tabla espacio al der Deleted: prosistem/alba/trunk/alba/config/schema.xml.sample =================================================================== --- prosistem/alba/trunk/alba/config/schema.xml.sample 2007-08-08 16:54:38 UTC (rev 4940) +++ prosistem/alba/trunk/alba/config/schema.xml.sample 2007-08-08 19:21:49 UTC (rev 4941) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - <database name="propel" defaultIdMethod="native" noxsd="true"> - </database> Modified: prosistem/alba/trunk/alba/doc/DER.xmi =================================================================== --- prosistem/alba/trunk/alba/doc/DER.xmi 2007-08-08 16:54:38 UTC (rev 4940) +++ prosistem/alba/trunk/alba/doc/DER.xmi 2007-08-08 19:21:49 UTC (rev 4941) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-01-31T16:15:23" xmi.version="1.2" > +<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-08-08T16:17:48" xmi.version="1.2" > <XMI.header> <XMI.documentation> <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter> @@ -15,6 +15,8 @@ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2211" isRoot="false" isAbstract="false" name="datatype" /> <UML:Model stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="1" isRoot="false" isAbstract="false" name="Logical View" > <UML:Namespace.ownedElement> @@ -393,6 +395,16 @@ <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2496" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_division_id" /> <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2497" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_alumno_id" /> </UML:Entity> + <UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="6" xmi.id="2507" isRoot="false" isAbstract="false" name="espacio" > + <UML:EntityAttribute attributes="" values="" dbindex_type="1101" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="1" xmi.id="2508" isRoot="false" initialValue="" type="2210" isAbstract="false" name="id" /> + <UML:EntityAttribute attributes="" values="128" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2509" isRoot="false" initialValue="" type="2441" isAbstract="false" name="nombre" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2510" isRoot="false" initialValue="" type="2214" isAbstract="false" name="m2" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2511" isRoot="false" initialValue="" type="2441" isAbstract="false" name="capacidad" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2512" isRoot="false" initialValue="" type="2441" isAbstract="false" name="descripcion" /> + <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2513" isRoot="false" initialValue="" type="2441" isAbstract="false" name="estado" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2514" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_tipoespacio_id" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2507" auto_increment="0" xmi.id="2515" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_locacion_id" /> + </UML:Entity> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2469" name="" > <UML:Association.connection> <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2470" aggregation="none" type="2465" name="" /> @@ -423,60 +435,91 @@ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2500" aggregation="none" type="2439" name="" /> </UML:Association.connection> </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2501" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2502" aggregation="none" type="2220" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2503" aggregation="none" type="2494" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2504" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2505" aggregation="none" type="2221" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2506" aggregation="none" type="2465" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2516" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2517" aggregation="none" type="2481" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2518" aggregation="none" type="2222" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2519" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2520" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2521" aggregation="none" type="2481" name="" /> + </UML:Association.connection> + </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2522" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2523" aggregation="none" type="2507" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2524" aggregation="none" type="2222" name="" /> + </UML:Association.connection> + </UML:Association> </UML:Namespace.ownedElement> <XMI.extension xmi.extender="umbrello" > <diagrams> - <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1396" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1318" > + <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="81" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1588" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1353" > <widgets> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="597" y="358" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="965" y="277" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="137" usesdiagramusefillcolour="0" x="575" y="675" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="481" y="456" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="1097" y="139" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="137" usesdiagramusefillcolour="0" x="117" y="1087" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2222" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="103" usesdiagramusefillcolour="0" x="429" y="124" linewidth="none" fillcolour="#ffffc0" height="198" usefillcolor="1" isinstance="0" xmi.id="2223" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="702" y="1026" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="84" usesdiagramusefillcolour="0" x="1197" y="278" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="1353" y="964" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2224" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="84" usesdiagramusefillcolour="0" x="1351" y="147" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2225" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="108" usesdiagramusefillcolour="0" x="708" y="119" linewidth="none" fillcolour="#ffffc0" height="216" usefillcolor="1" isinstance="0" xmi.id="2226" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="317" y="677" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="46" y="550" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2227" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="94" usesdiagramusefillcolour="0" x="1012" y="1112" linewidth="none" fillcolour="#ffffc0" height="108" usefillcolor="1" isinstance="0" xmi.id="2228" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="124" usesdiagramusefillcolour="0" x="1183" y="526" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="416" y="475" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="225" usesdiagramusefillcolour="0" x="774" y="548" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="126" usesdiagramusefillcolour="0" x="841" y="1109" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="124" usesdiagramusefillcolour="0" x="1423" y="547" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2229" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="100" usesdiagramusefillcolour="0" x="237" y="553" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2230" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="225" usesdiagramusefillcolour="0" x="978" y="589" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2231" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="126" usesdiagramusefillcolour="0" x="840" y="1142" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2232" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="161" usesdiagramusefillcolour="0" x="959" y="993" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2233" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="186" usesdiagramusefillcolour="0" x="1179" y="699" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="129" usesdiagramusefillcolour="0" x="211" y="123" linewidth="none" fillcolour="#ffffc0" height="306" usefillcolor="1" isinstance="0" xmi.id="2235" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="845" y="1224" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="186" usesdiagramusefillcolour="0" x="1398" y="766" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2234" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="129" usesdiagramusefillcolour="0" x="216" y="68" linewidth="none" fillcolour="#ffffc0" height="306" usefillcolor="1" isinstance="0" xmi.id="2235" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="692" y="1133" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="572" y="121" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2237" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="961" y="703" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="196" y="738" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="65" y="593" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="191" y="887" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="6" y="916" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="356" y="832" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="1169" y="688" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="777" y="723" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="773" y="591" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="669" y="912" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="433" y="1007" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="489" y="816" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> + <entitywidget usesdiagramfillcolour="0" width="119" usesdiagramusefillcolour="0" x="343" y="1187" linewidth="none" fillcolour="#ffffc0" height="162" usefillcolor="1" isinstance="0" xmi.id="2507" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> </widgets> <messages/> <associations> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2230" widgetaid="2227" xmi.id="2372" linecolor="none" > <linepath> - <startpoint startx="367" starty="677" /> - <endpoint endx="449" endy="565" /> + <startpoint startx="146" starty="595" /> + <endpoint endx="237" endy="598" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2225" xmi.id="2378" linecolor="none" > <linepath> - <startpoint startx="1197" starty="314" /> - <endpoint endx="1097" endy="349" /> + <startpoint startx="1351" starty="183" /> + <endpoint endx="1229" endy="211" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2222" widgetaid="2230" xmi.id="2381" linecolor="none" > <linepath> - <startpoint startx="482" starty="565" /> - <endpoint endx="575" endy="783" /> - <point x="550" y="722" /> + <startpoint startx="287" starty="643" /> + <endpoint endx="185" endy="1087" /> + <point x="285" y="738" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2233" widgetaid="2238" xmi.id="2384" linecolor="none" > <linepath> - <startpoint startx="1035" starty="937" /> + <startpoint startx="1169" starty="805" /> <endpoint endx="1039" endy="993" /> </linepath> </assocwidget> @@ -489,7 +532,7 @@ <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2221" widgetaid="2226" xmi.id="2390" linecolor="none" > <linepath> <startpoint startx="816" starty="227" /> - <endpoint endx="965" endy="325" /> + <endpoint endx="1097" endy="187" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2226" widgetaid="2237" xmi.id="2393" linecolor="none" > @@ -498,114 +541,135 @@ <endpoint endx="708" endy="227" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" linecolor="none" > + <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2221" xmi.id="2396" linecolor="none" > <linepath> - <startpoint startx="1009" starty="421" /> - <endpoint endx="886" endy="548" /> + <startpoint startx="1163" starty="283" /> + <endpoint endx="1090" endy="589" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2237" xmi.id="2399" linecolor="none" > <linepath> <startpoint startx="572" starty="157" /> - <endpoint endx="532" endy="190" /> + <endpoint endx="532" endy="223" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2223" widgetaid="2230" xmi.id="2402" linecolor="none" > <linepath> - <startpoint startx="482" starty="475" /> - <endpoint endx="480" endy="322" /> + <startpoint startx="303" starty="553" /> + <endpoint endx="463" endy="322" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" linecolor="none" > + <assocwidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" linewidth="none" widgetbid="2238" widgetaid="2221" xmi.id="2405" linecolor="none" > <linepath> - <startpoint startx="1053" starty="421" /> - <endpoint endx="1035" endy="703" /> + <startpoint startx="1196" starty="283" /> + <endpoint endx="1243" endy="688" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2230" xmi.id="2408" linecolor="none" > <linepath> - <startpoint startx="449" starty="475" /> - <endpoint endx="340" endy="327" /> + <startpoint startx="270" starty="553" /> + <endpoint endx="280" endy="374" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2235" widgetaid="2223" xmi.id="2411" linecolor="none" > <linepath> <startpoint startx="429" starty="223" /> - <endpoint endx="340" endy="225" /> + <endpoint endx="345" endy="221" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2236" xmi.id="2414" linecolor="none" > <linepath> - <startpoint startx="886" starty="1224" /> - <endpoint endx="904" endy="1181" /> + <startpoint startx="774" starty="1178" /> + <endpoint endx="840" endy="1178" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2232" widgetaid="2228" xmi.id="2417" linecolor="none" > <linepath> <startpoint startx="1012" starty="1166" /> - <endpoint endx="967" endy="1145" /> + <endpoint endx="966" endy="1178" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2229" xmi.id="2420" linecolor="none" > <linepath> - <startpoint startx="1245" starty="616" /> - <endpoint endx="1272" endy="699" /> + <startpoint startx="1485" starty="637" /> + <endpoint endx="1491" endy="766" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2234" widgetaid="2238" xmi.id="2423" linecolor="none" > <linepath> - <startpoint startx="1109" starty="820" /> - <endpoint endx="1179" endy="735" /> + <startpoint startx="1317" starty="805" /> + <endpoint endx="1398" endy="802" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" linecolor="none" > + <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2231" widgetaid="2222" xmi.id="2426" linecolor="none" > <linepath> - <startpoint startx="712" starty="783" /> - <endpoint endx="886" endy="620" /> + <startpoint startx="254" starty="1159" /> + <endpoint endx="1090" endy="661" /> + <point x="604" y="1163" /> + <point x="852" y="983" /> </linepath> </assocwidget> - <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" linecolor="none" > + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2230" xmi.id="2429" linecolor="none" > <linepath> - <startpoint startx="516" starty="520" /> - <endpoint endx="597" endy="538" /> + <startpoint startx="337" starty="598" /> + <endpoint endx="481" endy="591" /> </linepath> </assocwidget> <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2221" xmi.id="2432" linecolor="none" > <linepath> - <startpoint startx="965" starty="373" /> - <endpoint endx="745" endy="493" /> + <startpoint startx="1097" starty="235" /> + <endpoint endx="629" endy="591" /> </linepath> </assocwidget> - <assocwidget totalcounta="3" indexa="2" totalcountb="3" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" linecolor="none" > + <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="2220" widgetaid="2223" xmi.id="2435" linecolor="none" > <linepath> - <startpoint startx="532" starty="256" /> - <endpoint endx="597" endy="448" /> + <startpoint startx="497" starty="322" /> + <endpoint endx="555" endy="456" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2439" xmi.id="2472" linecolor="none" > <linepath> - <startpoint startx="239" starty="738" /> - <endpoint endx="139" endy="665" /> + <startpoint startx="820" starty="723" /> + <endpoint endx="847" endy="663" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2475" xmi.id="2488" linecolor="none" > <linepath> - <startpoint startx="248" starty="887" /> - <endpoint endx="239" endy="828" /> + <startpoint startx="726" starty="912" /> + <endpoint endx="820" endy="813" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2475" widgetaid="2481" xmi.id="2491" linecolor="none" > <linepath> - <startpoint startx="154" starty="979" /> - <endpoint endx="191" endy="941" /> + <startpoint startx="581" starty="1070" /> + <endpoint endx="669" endy="966" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2494" xmi.id="2498" linecolor="none" > <linepath> - <startpoint startx="356" starty="868" /> - <endpoint endx="283" endy="783" /> + <startpoint startx="635" starty="852" /> + <endpoint endx="777" endy="768" /> </linepath> </assocwidget> + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2494" widgetaid="2220" xmi.id="2501" linecolor="none" > + <linepath> + <startpoint startx="555" starty="726" /> + <endpoint endx="562" endy="816" /> + <point x="594" y="712" /> + </linepath> + </assocwidget> + <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2221" xmi.id="2504" linecolor="none" > + <linepath> + <startpoint startx="1130" starty="283" /> + <endpoint endx="847" endy="591" /> + </linepath> + </assocwidget> + <assocwidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" linewidth="none" widgetbid="2222" widgetaid="2507" xmi.id="2522" linecolor="none" > + <linepath> + <startpoint startx="343" starty="1268" /> + <endpoint endx="254" endy="1231" /> + </linepath> + </assocwidget> </associations> </diagram> </diagrams> @@ -615,7 +679,7 @@ </UML:Model> </XMI.content> <XMI.extensions xmi.extender="umbrello" > - <docsettings viewid="2219" documentation="" uniqueid="2500" /> + <docsettings viewid="2219" documentation="" uniqueid="2524" /> <listview> <listitem open="1" type="800" label="Vistas" > <listitem open="1" type="801" id="1" > @@ -705,6 +769,16 @@ <listitem open="0" type="833" id="2463" /> <listitem open="0" type="833" id="2464" /> </listitem> + <listitem open="1" type="832" id="2507" > + <listitem open="0" type="833" id="2508" /> + <listitem open="0" type="833" id="2509" /> + <listitem open="0" type="833" id="2510" /> + <listitem open="0" type="833" id="2511" /> + <listitem open="0" type="833" id="2512" /> + <listitem open="0" type="833" id="2513" /> + <listitem open="0" type="833" id="2514" /> + <listitem open="0" type="833" id="2515" /> + </listitem> <listitem open="1" type="832" id="2221" > <listitem open="0" type="833" id="2261" /> <listitem open="0" type="833" id="2262" />