Commit 56b48e1d7fb327d1d7f9d24c98224b5866631460

Authored by Aníbal Pacheco
1 parent 3919aca6b3
Exists in master

Actualización de modelo conceptual, detalle corregido

Showing 1 changed file with 35 additions and 39 deletions Side-by-side Diff

modelo_conceptual.xmi View file @ 56b48e1
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2011-09-30T13:32:29" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2011-09-30T14:32:40" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
3 3 <XMI.header>
4 4 <XMI.documentation>
5 5 <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
... ... @@ -309,8 +309,6 @@
309 309 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="piso"/>
310 310 <UML:Attribute visibility="public" isSpecification="false" xmi.id="rwlcd63VEsBh" type="xrosKNLalZGV" name="unidad"/>
311 311 <UML:Attribute visibility="public" isSpecification="false" xmi.id="4jLN0Day7URg" type="swYcGBYKkDue" name="descripcion"/>
312   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="ov2qOCPF7Bpk" type="4i4b5BkoCPyn" name="criterioGeocod"/>
313   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="HsFVjOAl7T88" type="SvdnBnsvEuNw" name="coordenadas"/>
314 312 <UML:Attribute visibility="public" isSpecification="false" xmi.id="kps2XaWjxILB" type="0lCIJN1IBOOh" name="paridad"/>
315 313 </UML:Classifier.feature>
316 314 </UML:Class>
... ... @@ -505,7 +503,7 @@
505 503 <diagrams>
506 504 <diagram showopsig="1" linecolor="#000000" snapx="10" showattribassocs="1" snapy="10" linewidth="0" showattsig="1" isopen="1" showpackage="1" showpubliconly="1" showstereotype="1" name="class diagram" font="Sans Serif,9,-1,0,50,0,0,0,0,0" canvasheight="672" canvaswidth="1342" localid="-1" snapcsgrid="0" showgrid="0" showops="1" griddotcolor="#808080" backgroundcolor="#ffffff" usefillcolor="1" fillcolor="#ffffff" zoom="100" xmi.id="LivcEe3649X1" documentation="" showscope="1" snapgrid="0" showatts="1" type="1">
507 505 <widgets>
508   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="299" showattsigs="601" showstereotype="1" y="219" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="tTM8hIy8GNaf" showscope="1" height="105" showopsigs="601"/>
  506 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="299" showattsigs="601" showstereotype="1" y="219" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="253" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="tTM8hIy8GNaf" showscope="1" height="105" showopsigs="601"/>
509 507 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="9" showattsigs="601" showstereotype="1" y="53" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="BtctkDrlM8Ug" showscope="1" height="63" showopsigs="601"/>
510 508 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="340" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="176" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JrepmBDIqpt5" showscope="1" height="63" showopsigs="601"/>
511 509 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="621" showattsigs="601" showstereotype="1" y="0" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="UGLwdsYoj8hU" showscope="1" height="63" showopsigs="601"/>
512 510  
... ... @@ -519,11 +517,11 @@
519 517 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="645" showattsigs="601" showstereotype="1" y="437" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="nqgOB6HFGZ5m" showscope="1" height="35" showopsigs="601"/>
520 518 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="83" showattsigs="601" showstereotype="1" y="483" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="6wPQBVstQYw3" showscope="1" height="49" showopsigs="601"/>
521 519 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="83" showattsigs="601" showstereotype="1" y="549" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="45gDAFCxsqL4" showscope="1" height="49" showopsigs="601"/>
522   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="375" showattsigs="601" showstereotype="1" y="475" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="147" showopsigs="601"/>
  520 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="380" showattsigs="601" showstereotype="1" y="492" showattributes="1" font="Sans Serif,9,-1,5,75,0,0,0,0,0" width="218" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="B6kIvg1gUhU3" showscope="1" height="119" showopsigs="601"/>
523 521 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="84" showattsigs="601" showstereotype="1" y="414" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="dICuM9h6UsS8" showscope="1" height="49" showopsigs="601"/>
524 522 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="644" showattsigs="601" showstereotype="1" y="539" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="164" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="xg2HZ89UTSe9" showscope="1" height="35" showopsigs="601"/>
525   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="249" showattsigs="601" showstereotype="1" y="101" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="an76wmD6d9AN" showscope="1" height="49" showopsigs="601"/>
526   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="7" showattsigs="601" showstereotype="1" y="619" showattributes="1" font="Sans Serif,9,-1,0,75,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
  523 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="249" showattsigs="601" showstereotype="1" y="101" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="an76wmD6d9AN" showscope="1" height="49" showopsigs="601"/>
  524 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="7" showattsigs="601" showstereotype="1" y="619" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="SSn60ti0Hi7M" showscope="1" height="49" showopsigs="601"/>
527 525 </widgets>
528 526 <messages/>
529 527 <associations>
530 528  
... ... @@ -533,16 +531,16 @@
533 531 <endpoint endx="769" endy="141"/>
534 532 <point x="769" y="145"/>
535 533 </linepath>
536   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="770" showstereotype="1" y="172" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="x4jwlKJfhs5W" height="18"/>
537   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="771" showstereotype="1" y="145" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3nbJUtxALv1t" height="18"/>
  534 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="770" showstereotype="1" y="172" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="N5MqIlU5yzkE" height="18"/>
  535 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="771" showstereotype="1" y="145" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="tJnw5oQgeNdQ" height="18"/>
538 536 </assocwidget>
539 537 <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="3" type="503" linewidth="none">
540 538 <linepath>
541 539 <startpoint startx="832" starty="272"/>
542 540 <endpoint endx="832" endy="141"/>
543 541 </linepath>
544   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="833" showstereotype="1" y="252" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="y0luV52S9lMu" height="18"/>
545   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="835" showstereotype="1" y="146" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="4fYlWdFZOrtt" height="18"/>
  542 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="833" showstereotype="1" y="252" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="g9sdteoHhA7x" height="18"/>
  543 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="835" showstereotype="1" y="146" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="tZ2qZk4Q3pL7" height="18"/>
546 544 </assocwidget>
547 545 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="HBC1Iq7Q0Ttn" widgetbid="jRE7u3EmnWHn" totalcountb="2" type="501" linewidth="none">
548 546 <linepath>
... ... @@ -599,8 +597,8 @@
599 597 <endpoint endx="805" endy="458"/>
600 598 <point x="844" y="458"/>
601 599 </linepath>
602   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="825" showstereotype="1" y="339" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="io13j2wf1faW" height="18"/>
603   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="806" showstereotype="1" y="440" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="kcwuMImQvK9R" height="18"/>
  600 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="825" showstereotype="1" y="339" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="dlnI9OgnWWRP" height="18"/>
  601 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="806" showstereotype="1" y="440" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ADepMjkFJm3q" height="18"/>
604 602 </assocwidget>
605 603 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
606 604 <linepath>
607 605  
... ... @@ -625,11 +623,11 @@
625 623 </assocwidget>
626 624 <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="wZ8M1u9f6AQT" widgetbid="B6kIvg1gUhU3" totalcountb="3" type="510" linewidth="none">
627 625 <linepath>
628   - <startpoint startx="388" starty="324"/>
629   - <endpoint endx="388" endy="475"/>
  626 + <startpoint startx="400" starty="324"/>
  627 + <endpoint endx="400" endy="492"/>
630 628 </linepath>
631   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="391" showstereotype="1" y="345" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="vM1KBsBtgCuN" height="18"/>
632   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="389" showstereotype="1" y="457" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Cq3DUdhEDb6X" height="18"/>
  629 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="403" showstereotype="1" y="345" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="U7EYuZdWJOoS" height="18"/>
  630 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="401" showstereotype="1" y="474" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="nSDJzcg7qJxA" height="18"/>
633 631 </assocwidget>
634 632 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
635 633 <linepath>
636 634  
... ... @@ -648,13 +646,13 @@
648 646 <startpoint startx="785" starty="321"/>
649 647 <endpoint endx="785" endy="437"/>
650 648 </linepath>
651   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="707" showstereotype="1" y="379" text="Entrecalles" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="74" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="rtvnB4C5PDPa" height="18"/>
652   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="752" showstereotype="1" y="324" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3aShkM5wB68f" height="18"/>
653   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="768" showstereotype="1" y="416" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="jnruPySGpN3y" height="18"/>
  649 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="707" showstereotype="1" y="379" text="Entrecalles" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="74" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="0fNJSR7wWKSR" height="18"/>
  650 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="752" showstereotype="1" y="324" text="0..2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="r3xASjaFBoWA" height="18"/>
  651 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="768" showstereotype="1" y="416" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QAGETBOUqmlI" height="18"/>
654 652 </assocwidget>
655 653 <assocwidget indexa="2" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="3" xmi.id="jWbih5XSFvh0" widgetbid="UFqijWWsUGXL" totalcountb="2" type="503" linewidth="none">
656 654 <linepath>
657   - <startpoint startx="452" starty="475"/>
  655 + <startpoint startx="452" starty="492"/>
658 656 <endpoint endx="452" endy="434"/>
659 657 </linepath>
660 658 </assocwidget>
... ... @@ -664,8 +662,8 @@
664 662 <endpoint endx="340" endy="17"/>
665 663 <point x="133" y="17"/>
666 664 </linepath>
667   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="138" showstereotype="1" y="30" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QG3pRSNT0pAk" height="18"/>
668   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="325" showstereotype="1" y="3" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="ADfLJn00arvz" height="18"/>
  665 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="138" showstereotype="1" y="30" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DrDhBd82h3D9" height="18"/>
  666 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="325" showstereotype="1" y="3" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="mnMwZs4y2KCU" height="18"/>
669 667 </assocwidget>
670 668 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="2" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
671 669 <linepath>
... ... @@ -673,8 +671,8 @@
673 671 <endpoint endx="621" endy="31"/>
674 672 <point x="617" y="31"/>
675 673 </linepath>
676   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="519" showstereotype="1" y="8" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="nLEcgFZ4Tctt" height="18"/>
677   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="605" showstereotype="1" y="11" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="3FM32WmCkRX3" height="18"/>
  674 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="519" showstereotype="1" y="8" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="VZyKLhcWYnDj" height="18"/>
  675 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="605" showstereotype="1" y="11" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="PKk6NxD8iZ2G" height="18"/>
678 676 </assocwidget>
679 677 <assocwidget indexa="1" indexb="1" widgetaid="UGLwdsYoj8hU" linecolor="none" totalcounta="2" xmi.id="oFsAUjbRPciw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
680 678 <linepath>
... ... @@ -682,8 +680,8 @@
682 680 <endpoint endx="882" endy="106"/>
683 681 <point x="882" y="10"/>
684 682 </linepath>
685   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="819" showstereotype="1" y="13" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="EV4mLxk8Gyjw" height="18"/>
686   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="884" showstereotype="1" y="86" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="BI1fssYv7ux8" height="18"/>
  683 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="819" showstereotype="1" y="13" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="P4EPPQtszpCI" height="18"/>
  684 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="884" showstereotype="1" y="86" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Xno3Y0nxIX1d" height="18"/>
687 685 </assocwidget>
688 686 <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
689 687 <linepath>
... ... @@ -691,8 +689,8 @@
691 689 <endpoint endx="890" endy="321"/>
692 690 <point x="890" y="548"/>
693 691 </linepath>
694   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="809" showstereotype="1" y="529" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="OhK68q8KLA4g" height="18"/>
695   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="892" showstereotype="1" y="329" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="7onNkUHwkIZc" height="18"/>
  692 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="809" showstereotype="1" y="529" text="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="SCj8jlO6qcWD" height="18"/>
  693 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="892" showstereotype="1" y="329" text="*" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1N3yBEHg13jX" height="18"/>
696 694 </assocwidget>
697 695 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
698 696 <linepath>
... ... @@ -706,8 +704,8 @@
706 704 <endpoint endx="275" endy="101"/>
707 705 <point x="275" y="32"/>
708 706 </linepath>
709   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="321" showstereotype="1" y="40" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="97WEzRMN8hUE" height="18"/>
710   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="278" showstereotype="1" y="80" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="XcYqmaVrNIC5" height="18"/>
  707 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="321" showstereotype="1" y="40" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1UTJzSxPfgYM" height="18"/>
  708 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="278" showstereotype="1" y="80" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="QuTEVxRWISST" height="18"/>
711 709 </assocwidget>
712 710 <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
713 711 <linepath>
714 712  
715 713  
... ... @@ -715,17 +713,17 @@
715 713 <endpoint endx="243" endy="626"/>
716 714 <point x="342" y="626"/>
717 715 </linepath>
718   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="343" showstereotype="1" y="325" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="anlhmTQgPiQT" height="18"/>
719   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="244" showstereotype="1" y="643" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="fyGb9WfLSvIZ" height="18"/>
  716 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="343" showstereotype="1" y="325" text="1..N" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="33" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="gh7flrDkJe4J" height="18"/>
  717 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="244" showstereotype="1" y="643" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6zgjdE419VFe" height="18"/>
720 718 </assocwidget>
721 719 <assocwidget indexa="1" indexb="2" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
722 720 <linepath>
723   - <startpoint startx="456" starty="622"/>
  721 + <startpoint startx="456" starty="611"/>
724 722 <endpoint endx="243" endy="643"/>
725 723 <point x="456" y="643"/>
726 724 </linepath>
727   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="458" showstereotype="1" y="624" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DxGx7ncfbLML" height="18"/>
728   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="245" showstereotype="1" y="609" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="yqN6VMTBKhkT" height="18"/>
  725 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="458" showstereotype="1" y="613" text="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="16" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="Se8i7aAlIHR1" height="18"/>
  726 + <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="245" showstereotype="1" y="609" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="6cjOGnfKkL4M" height="18"/>
729 727 </assocwidget>
730 728 </associations>
731 729 </diagram>
... ... @@ -793,8 +791,6 @@
793 791 <listitem open="0" type="814" id="ytuSbMWO2TAb"/>
794 792 <listitem open="0" type="814" id="rwlcd63VEsBh"/>
795 793 <listitem open="0" type="814" id="4jLN0Day7URg"/>
796   - <listitem open="0" type="814" id="ov2qOCPF7Bpk"/>
797   - <listitem open="0" type="814" id="HsFVjOAl7T88"/>
798 794 <listitem open="0" type="814" id="kps2XaWjxILB"/>
799 795 </listitem>
800 796 <listitem open="1" type="813" id="UFqijWWsUGXL">
... ... @@ -859,7 +855,7 @@
859 855 <listitem open="1" type="813" id="xg2HZ89UTSe9">
860 856 <listitem open="0" type="814" id="TT1F82F8gHxU"/>
861 857 </listitem>
862   - <listitem open="1" type="830" id="Datatypes">
  858 + <listitem open="0" type="830" id="Datatypes">
863 859 <listitem open="1" type="829" id="XT9G38k8Vh3T"/>
864 860 <listitem open="1" type="829" id="5PxxxWWUqjGq"/>
865 861 <listitem open="1" type="829" id="6aMgotUEBgWz"/>