Commit 3919aca6b345add600aac75825bd0d5e2797c6cc

Authored by Aníbal Pacheco
1 parent feb3226703
Exists in master

Actualización de modelo conceptual según cambios de las últimas reuniones del CTE

Showing 1 changed file with 196 additions and 152 deletions Side-by-side Diff

modelo_conceptual.xmi View file @ 3919aca
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<XMI verified="false" xmi.version="1.2" timestamp="2011-06-15T15:09:50" xmlns:UML="http://schema.omg.org/spec/UML/1.3">
  2 +<XMI verified="false" xmi.version="1.2" timestamp="2011-09-30T13:32:29" 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>
... ... @@ -49,6 +49,7 @@
49 49 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="BaZFOwbCP9LS" isRoot="false" xmi.id="xJzBOwv8UelF" name="Alfanumerico(20)"/>
50 50 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="BaZFOwbCP9LS" isRoot="false" xmi.id="PhXZlZ9gs6sF" name="Alfanumerico(255)"/>
51 51 <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" elementReference="d3ZqEjji5qNM" isRoot="false" xmi.id="0lNUP6kRom2r" name="Numerico(9)"/>
  52 + <UML:DataType stereotype="datatype" visibility="public" isSpecification="false" namespace="Datatypes" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SvdnBnsvEuNw" name="[Geometria]"/>
52 53 </UML:Namespace.ownedElement>
53 54 </UML:Package>
54 55 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="tTM8hIy8GNaf" name="Direccion">
... ... @@ -58,8 +59,7 @@
58 59 <UML:Attribute visibility="public" isSpecification="false" xmi.id="HAywdppmNMzm" type="0lNUP6kRom2r" name="kilometro"/>
59 60 <UML:Attribute visibility="public" isSpecification="false" xmi.id="8pTcPkXhuTbV" type="IOGfkFP0mMfT" name="nombreInmueble"/>
60 61 <UML:Attribute visibility="public" isSpecification="false" xmi.id="KVQtfUjIGMo4" type="swYcGBYKkDue" name="descripcion"/>
61   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="eNXbtd8E7Z5m" type="4i4b5BkoCPyn" name="criterioGeocod"/>
62   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="09IlMBPyWuZQ" type="WhcdEhNGTPXc" name="coordenadas"/>
  62 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="CNoeG4DwyQAC" type="0lCIJN1IBOOh" name="paridad"/>
63 63 </UML:Classifier.feature>
64 64 </UML:Class>
65 65 <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="d3ZqEjji5qNM" name="Numerico"/>
... ... @@ -106,7 +106,7 @@
106 106 <UML:Attribute visibility="public" isSpecification="false" xmi.id="DlOEvisprZ8k" type="WhcdEhNGTPXc" name="geometria"/>
107 107 </UML:Classifier.feature>
108 108 </UML:Class>
109   - <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9xmfrTwvPUo7" name="ViaTransito">
  109 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="9xmfrTwvPUo7" name="ViaCirculacion">
110 110 <UML:Classifier.feature>
111 111 <UML:Attribute visibility="public" isSpecification="false" xmi.id="KIwqTRk2qI4k" type="YLAuThEfBwVf" name="numeroRuta"/>
112 112 <UML:Attribute visibility="public" isSpecification="false" xmi.id="cUJ5sugCAc2d" type="2kfs2jaY2kSV" name="nombre"/>
113 113  
114 114  
... ... @@ -301,16 +301,17 @@
301 301 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="0..1" xmi.id="E3KSwPRKgmH6" type="9xmfrTwvPUo7" name="" aggregation="none"/>
302 302 </UML:Association.connection>
303 303 </UML:Association>
304   - <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="B6kIvg1gUhU3" name="SubDireccion">
  304 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="B6kIvg1gUhU3" name="DireccionInterna">
305 305 <UML:Classifier.feature>
306 306 <UML:Attribute visibility="public" isSpecification="false" xmi.id="vfSJ6IxQ2ass" type="4vkGhFBaDyav" name="senda"/>
307 307 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ngzobNmAliMT" type="xrosKNLalZGV" name="block"/>
308 308 <UML:Attribute visibility="public" isSpecification="false" xmi.id="s8pgTEZeKJuD" type="xrosKNLalZGV" name="torre"/>
309 309 <UML:Attribute visibility="public" isSpecification="false" xmi.id="ytuSbMWO2TAb" type="xrosKNLalZGV" name="piso"/>
310   - <UML:Attribute visibility="public" isSpecification="false" xmi.id="rwlcd63VEsBh" type="xrosKNLalZGV" name="apartamento"/>
  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 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="WhcdEhNGTPXc" name="coordenadas"/>
  313 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="HsFVjOAl7T88" type="SvdnBnsvEuNw" name="coordenadas"/>
  314 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="kps2XaWjxILB" type="0lCIJN1IBOOh" name="paridad"/>
314 315 </UML:Classifier.feature>
315 316 </UML:Class>
316 317 <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="gj6lBVR0QTon" name="">
317 318  
318 319  
319 320  
320 321  
... ... @@ -456,30 +457,73 @@
456 457 <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="QxtZwiJ1cwjn" type="KZG5QMEvjqxe" name="" aggregation="none"/>
457 458 </UML:Association.connection>
458 459 </UML:Association>
  460 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="an76wmD6d9AN" name="Municipio">
  461 + <UML:Classifier.feature>
  462 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="kT1UkY4rfa5e" type="5PxxxWWUqjGq" name="codigo"/>
  463 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="1Q075SLa2rQm" type="yLDTOQJUye8m" name="nombre"/>
  464 + </UML:Classifier.feature>
  465 + </UML:Class>
  466 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="Who6fRzdA1CF" name="">
  467 + <UML:Association.connection>
  468 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="ngT2di0EU7IQ" type="an76wmD6d9AN" name="" aggregation="aggregate"/>
  469 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="rUVSdfp7MdDz" type="tTM8hIy8GNaf" name="" aggregation="none"/>
  470 + </UML:Association.connection>
  471 + </UML:Association>
  472 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="3BaBClOzRqz2" name="">
  473 + <UML:Association.connection>
  474 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="YzE24XRtzuLc" type="tTM8hIy8GNaf" name="" aggregation="aggregate"/>
  475 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" xmi.id="Z8jtkvsl6RwG" type="an76wmD6d9AN" name="" aggregation="none"/>
  476 + </UML:Association.connection>
  477 + </UML:Association>
  478 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="CLFbBCdhBsiD" name="">
  479 + <UML:Association.connection>
  480 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="N76M1PwaVfTD" type="JrepmBDIqpt5" name="" aggregation="composite"/>
  481 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="YJycktsuE5VN" type="an76wmD6d9AN" name="" aggregation="none"/>
  482 + </UML:Association.connection>
  483 + </UML:Association>
  484 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="SSn60ti0Hi7M" name="Coordenada">
  485 + <UML:Classifier.feature>
  486 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="ARwCGMyiGZVP" type="WhcdEhNGTPXc" name="geom"/>
  487 + <UML:Attribute visibility="public" isSpecification="false" xmi.id="KOJZGgVg6Jk5" type="4i4b5BkoCPyn" name="criterioGeocod"/>
  488 + </UML:Classifier.feature>
  489 + </UML:Class>
  490 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="1yvbfORhpxwl" name="">
  491 + <UML:Association.connection>
  492 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1..N" xmi.id="xb4LZwvCICvw" type="tTM8hIy8GNaf" name="" aggregation="none"/>
  493 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="BjjdcwEdtACY" type="SSn60ti0Hi7M" name="" aggregation="none"/>
  494 + </UML:Association.connection>
  495 + </UML:Association>
  496 + <UML:Association visibility="public" isSpecification="false" namespace="Logical View" xmi.id="WdDLZA6Wj9qJ" name="">
  497 + <UML:Association.connection>
  498 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="1" xmi.id="5lVLvQI69zjj" type="B6kIvg1gUhU3" name="" aggregation="none"/>
  499 + <UML:AssociationEnd changeability="changeable" visibility="public" isNavigable="true" isSpecification="false" multiplicity="*" xmi.id="tyKm6XJc8Wvh" type="SSn60ti0Hi7M" name="" aggregation="none"/>
  500 + </UML:Association.connection>
  501 + </UML:Association>
  502 + <UML:Class visibility="public" isSpecification="false" namespace="Logical View" isAbstract="false" isLeaf="false" isRoot="false" xmi.id="0lCIJN1IBOOh" name="TipoParidad"/>
459 503 </UML:Namespace.ownedElement>
460 504 <XMI.extension xmi.extender="umbrello">
461 505 <diagrams>
462   - <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="681" canvaswidth="1168" 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">
  506 + <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">
463 507 <widgets>
464   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="300" showattsigs="601" showstereotype="1" y="208" 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="119" showopsigs="601"/>
465   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="59" showattsigs="601" showstereotype="1" y="25" 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"/>
466   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="369" showattsigs="601" showstereotype="1" y="26" 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"/>
467   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="616" showattsigs="601" showstereotype="1" y="19" 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"/>
468   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="45" showattsigs="601" showstereotype="1" y="193" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
469   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="9" showattsigs="601" showstereotype="1" y="255" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
470   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="47" showattsigs="601" showstereotype="1" y="110" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="7e2rlhJ4EUgq" showscope="1" height="49" showopsigs="601"/>
  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"/>
  509 + <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 + <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 + <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 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="41" showattsigs="601" showstereotype="1" y="253" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="JWDdehHvWvjI" showscope="1" height="49" showopsigs="601"/>
  513 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="8" showattsigs="601" showstereotype="1" y="327" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="236" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="4wYvkPyCfH8G" showscope="1" height="63" showopsigs="601"/>
  514 + <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="41" showattsigs="601" showstereotype="1" y="191" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="160" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="7e2rlhJ4EUgq" showscope="1" height="49" showopsigs="601"/>
471 515 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="722" showattsigs="601" showstereotype="1" y="272" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="9xmfrTwvPUo7" showscope="1" height="49" showopsigs="601"/>
472   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="662" showattsigs="601" showstereotype="1" y="568" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="192" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="skIV1Qm93oyo" showscope="1" height="49" showopsigs="601"/>
473   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="374" showattsigs="601" showstereotype="1" y="396" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="UFqijWWsUGXL" showscope="1" height="63" showopsigs="601"/>
  516 + <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="416" showattsigs="601" showstereotype="1" y="371" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="UFqijWWsUGXL" showscope="1" height="63" showopsigs="601"/>
474 517 <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="605" showattsigs="601" showstereotype="1" y="193" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="196" isinstance="0" usefillcolor="1" fillcolor="none" xmi.id="jRE7u3EmnWHn" showscope="1" height="49" showopsigs="601"/>
475 518 <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="730" showattsigs="601" showstereotype="1" y="106" showattributes="1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" width="175" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="v3uyqqkK5a0o" showscope="1" height="35" showopsigs="601"/>
476 519 <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"/>
477   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="418" 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"/>
478   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="493" 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"/>
479   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="347" showattsigs="601" showstereotype="1" y="498" 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="133" showopsigs="601"/>
480   - <classwidget linecolor="none" usesdiagramfillcolor="1" linewidth="none" showoperations="1" usesdiagramusefillcolor="1" showpubliconly="1" showpackage="1" x="44" showattsigs="601" showstereotype="1" y="349" 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"/>
481   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="922" showattsigs="601" showstereotype="1" y="391" 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"/>
482   - <classwidget linecolor="#000000" usesdiagramfillcolor="0" linewidth="none" showoperations="1" usesdiagramusefillcolor="0" showpubliconly="1" showpackage="1" x="876" showattsigs="601" showstereotype="1" y="163" showattributes="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" width="218" isinstance="0" usefillcolor="1" fillcolor="#ffffff" xmi.id="KZG5QMEvjqxe" showscope="1" height="35" showopsigs="601"/>
  520 + <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 + <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"/>
  523 + <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 + <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"/>
483 527 </widgets>
484 528 <messages/>
485 529 <associations>
486 530  
487 531  
488 532  
489 533  
490 534  
491 535  
492 536  
493 537  
494 538  
495 539  
496 540  
497 541  
498 542  
499 543  
500 544  
501 545  
502 546  
... ... @@ -489,70 +533,64 @@
489 533 <endpoint endx="769" endy="141"/>
490 534 <point x="769" y="145"/>
491 535 </linepath>
492   - <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="XW9RvKY5w7Zj" height="18"/>
493   - <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="Y7YihjTkY1On" height="18"/>
  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"/>
494 538 </assocwidget>
495 539 <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="2" xmi.id="RwCbXCCXurNw" widgetbid="v3uyqqkK5a0o" totalcountb="3" type="503" linewidth="none">
496 540 <linepath>
497 541 <startpoint startx="832" starty="272"/>
498 542 <endpoint endx="832" endy="141"/>
499 543 </linepath>
500   - <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="JJBt00rVWzwQ" height="18"/>
501   - <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="JSVDZ2w57Uoo" height="18"/>
  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"/>
502 546 </assocwidget>
503   - <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="5BrTJmYUl7f8" widgetbid="skIV1Qm93oyo" totalcountb="3" type="501" linewidth="none">
504   - <linepath>
505   - <startpoint startx="553" starty="327"/>
506   - <endpoint endx="662" endy="568"/>
507   - </linepath>
508   - </assocwidget>
509 547 <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="HBC1Iq7Q0Ttn" widgetbid="jRE7u3EmnWHn" totalcountb="2" type="501" linewidth="none">
510 548 <linepath>
511   - <startpoint startx="553" starty="222"/>
512   - <endpoint endx="605" endy="222"/>
  549 + <startpoint startx="552" starty="226"/>
  550 + <endpoint endx="605" endy="226"/>
513 551 </linepath>
514 552 </assocwidget>
515   - <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="2bh04anWmWtq" widgetbid="UFqijWWsUGXL" totalcountb="2" type="501" linewidth="none">
  553 + <assocwidget indexa="6" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="2bh04anWmWtq" widgetbid="UFqijWWsUGXL" totalcountb="2" type="501" linewidth="none">
516 554 <linepath>
517   - <startpoint startx="469" starty="327"/>
518   - <endpoint endx="469" endy="396"/>
  555 + <startpoint startx="469" starty="324"/>
  556 + <endpoint endx="469" endy="371"/>
519 557 </linepath>
520 558 </assocwidget>
521   - <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="AVQuzHiT3vtQ" widgetbid="7e2rlhJ4EUgq" totalcountb="2" type="501" linewidth="none">
  559 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="AVQuzHiT3vtQ" widgetbid="7e2rlhJ4EUgq" totalcountb="2" type="501" linewidth="none">
522 560 <linepath>
523   - <startpoint startx="300" starty="208"/>
524   - <endpoint endx="207" endy="159"/>
  561 + <startpoint startx="299" starty="226"/>
  562 + <endpoint endx="201" endy="226"/>
525 563 </linepath>
526 564 </assocwidget>
527   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="zOk2HbQUv3hx" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="501" linewidth="none">
  565 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="zOk2HbQUv3hx" widgetbid="4wYvkPyCfH8G" totalcountb="2" type="501" linewidth="none">
528 566 <linepath>
529   - <startpoint startx="300" starty="285"/>
530   - <endpoint endx="245" endy="285"/>
  567 + <startpoint startx="299" starty="286"/>
  568 + <endpoint endx="226" endy="327"/>
  569 + <point x="226" y="286"/>
531 570 </linepath>
532 571 </assocwidget>
533   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="ujtqlalxmIoD" widgetbid="JWDdehHvWvjI" totalcountb="2" type="501" linewidth="none">
  572 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="ujtqlalxmIoD" widgetbid="JWDdehHvWvjI" totalcountb="2" type="501" linewidth="none">
534 573 <linepath>
535   - <startpoint startx="300" starty="222"/>
536   - <endpoint endx="205" endy="222"/>
  574 + <startpoint startx="299" starty="263"/>
  575 + <endpoint endx="201" endy="263"/>
537 576 </linepath>
538 577 </assocwidget>
539   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="11YlIKzGKBwa" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="501" linewidth="none">
  578 + <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="11YlIKzGKBwa" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="501" linewidth="none">
540 579 <linepath>
541   - <startpoint startx="553" starty="208"/>
542   - <endpoint endx="616" endy="82"/>
  580 + <startpoint startx="552" starty="219"/>
  581 + <endpoint endx="621" endy="63"/>
543 582 </linepath>
544 583 </assocwidget>
545   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="g5UyERWxSOpf" widgetbid="JrepmBDIqpt5" totalcountb="2" type="501" linewidth="none">
  584 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="g5UyERWxSOpf" widgetbid="JrepmBDIqpt5" totalcountb="2" type="501" linewidth="none">
546 585 <linepath>
547   - <startpoint startx="433" starty="208"/>
548   - <endpoint endx="433" endy="89"/>
  586 + <startpoint startx="500" starty="219"/>
  587 + <endpoint endx="500" endy="63"/>
549 588 </linepath>
550 589 </assocwidget>
551   - <assocwidget indexa="1" indexb="2" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="gNA8l0oeEeEh" widgetbid="BtctkDrlM8Ug" totalcountb="3" type="501" linewidth="none">
  590 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="gNA8l0oeEeEh" widgetbid="BtctkDrlM8Ug" totalcountb="2" type="501" linewidth="none">
552 591 <linepath>
553   - <startpoint startx="340" starty="208"/>
554   - <endpoint endx="235" endy="64"/>
555   - <point x="340" y="64"/>
  592 + <startpoint startx="299" starty="219"/>
  593 + <endpoint endx="185" endy="116"/>
556 594 </linepath>
557 595 </assocwidget>
558 596 <assocwidget indexa="2" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="h8hLBh6xWoje" widgetbid="nqgOB6HFGZ5m" totalcountb="2" type="510" linewidth="none">
559 597  
560 598  
561 599  
562 600  
563 601  
564 602  
565 603  
566 604  
567 605  
568 606  
569 607  
570 608  
... ... @@ -561,66 +599,48 @@
561 599 <endpoint endx="805" endy="458"/>
562 600 <point x="844" y="458"/>
563 601 </linepath>
564   - <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="CFXkFvWWChPC" height="18"/>
565   - <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="fFhCEcaV45jc" height="18"/>
  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"/>
566 604 </assocwidget>
567   - <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
  605 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="u04Qom3cEViN" widgetbid="6wPQBVstQYw3" totalcountb="2" type="501" linewidth="none">
568 606 <linepath>
569   - <startpoint startx="311" starty="327"/>
570   - <endpoint endx="204" endy="459"/>
571   - <point x="311" y="459"/>
  607 + <startpoint startx="311" starty="324"/>
  608 + <endpoint endx="243" endy="491"/>
  609 + <point x="311" y="491"/>
572 610 </linepath>
573 611 </assocwidget>
574   - <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="xk79DpWfhJWi" widgetbid="45gDAFCxsqL4" totalcountb="2" type="501" linewidth="none">
  612 + <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="xk79DpWfhJWi" widgetbid="45gDAFCxsqL4" totalcountb="2" type="501" linewidth="none">
575 613 <linepath>
576   - <startpoint startx="328" starty="327"/>
577   - <endpoint endx="204" endy="518"/>
578   - <point x="328" y="518"/>
  614 + <startpoint startx="329" starty="324"/>
  615 + <endpoint endx="243" endy="556"/>
  616 + <point x="329" y="556"/>
579 617 </linepath>
580 618 </assocwidget>
581 619 <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="90prHJZw6f0C" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="501" linewidth="none">
582 620 <linepath>
583   - <startpoint startx="553" starty="308"/>
584   - <endpoint endx="667" endy="437"/>
585   - <point x="667" y="308"/>
  621 + <startpoint startx="552" starty="295"/>
  622 + <endpoint endx="675" endy="437"/>
  623 + <point x="675" y="295"/>
586 624 </linepath>
587 625 </assocwidget>
588   - <assocwidget indexa="1" indexb="2" widgetaid="nqgOB6HFGZ5m" linecolor="none" totalcounta="2" xmi.id="qpa9LI6Hfzz0" widgetbid="skIV1Qm93oyo" totalcountb="3" type="503" linewidth="none">
  626 + <assocwidget indexa="5" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="wZ8M1u9f6AQT" widgetbid="B6kIvg1gUhU3" totalcountb="3" type="510" linewidth="none">
589 627 <linepath>
590   - <startpoint startx="739" starty="472"/>
591   - <endpoint endx="739" endy="568"/>
  628 + <startpoint startx="388" starty="324"/>
  629 + <endpoint endx="388" endy="475"/>
592 630 </linepath>
593   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="741" showstereotype="1" y="475" text="0..1" 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="5fhC8VyIjV2y" height="18"/>
594   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="742" showstereotype="1" y="549" 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="OYUbErlt4R3I" height="18"/>
  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"/>
595 633 </assocwidget>
596   - <assocwidget indexa="1" indexb="3" widgetaid="skIV1Qm93oyo" linecolor="none" totalcounta="2" xmi.id="OGLzSLNsoP5t" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
597   - <linepath>
598   - <startpoint startx="854" starty="595"/>
599   - <endpoint endx="877" endy="321"/>
600   - <point x="877" y="595"/>
601   - </linepath>
602   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="881" showstereotype="1" y="522" text="Vía de Referencia" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="703" width="111" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1dm5gThl6PxE" height="18"/>
603   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="857" showstereotype="1" y="576" text="*" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="701" width="14" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="swWbPXXo5zNH" height="18"/>
604   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="882" showstereotype="1" y="327" text="0..1" font="Sans Serif,9,-1,0,50,0,0,0,0,0" pretext="" role="702" width="32" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="r69vVCCWowcS" height="18"/>
605   - </assocwidget>
606   - <assocwidget indexa="3" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="6" xmi.id="wZ8M1u9f6AQT" widgetbid="B6kIvg1gUhU3" totalcountb="3" type="510" linewidth="none">
607   - <linepath>
608   - <startpoint startx="361" starty="327"/>
609   - <endpoint endx="361" endy="498"/>
610   - </linepath>
611   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="364" showstereotype="1" y="348" 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="PJEVg9iZ3C8R" height="18"/>
612   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="362" showstereotype="1" y="480" 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="jgFnfa2UgBOA" height="18"/>
613   - </assocwidget>
614 634 <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="4" xmi.id="w0Z5ax6axb3g" widgetbid="9xmfrTwvPUo7" totalcountb="2" type="501" linewidth="none">
615 635 <linepath>
616   - <startpoint startx="553" starty="292"/>
617   - <endpoint endx="722" endy="292"/>
  636 + <startpoint startx="552" starty="281"/>
  637 + <endpoint endx="722" endy="281"/>
618 638 </linepath>
619 639 </assocwidget>
620   - <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="F027j6D4NIkF" widgetbid="dICuM9h6UsS8" totalcountb="2" type="501" linewidth="none">
  640 + <assocwidget indexa="1" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="F027j6D4NIkF" widgetbid="dICuM9h6UsS8" totalcountb="2" type="501" linewidth="none">
621 641 <linepath>
622   - <startpoint startx="300" starty="327"/>
623   - <endpoint endx="204" endy="349"/>
  642 + <startpoint startx="299" starty="324"/>
  643 + <endpoint endx="244" endy="414"/>
624 644 </linepath>
625 645 </assocwidget>
626 646 <assocwidget indexa="1" indexb="2" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="4" xmi.id="yFOQUsTK4hoX" widgetbid="nqgOB6HFGZ5m" totalcountb="3" type="503" linewidth="none">
627 647  
628 648  
629 649  
630 650  
631 651  
632 652  
633 653  
634 654  
635 655  
636 656  
637 657  
638 658  
639 659  
640 660  
641 661  
642 662  
643 663  
644 664  
... ... @@ -628,71 +648,85 @@
628 648 <startpoint startx="785" starty="321"/>
629 649 <endpoint endx="785" endy="437"/>
630 650 </linepath>
631   - <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="v2xToJfiORef" height="18"/>
632   - <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="J0draN2j9gX6" height="18"/>
633   - <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="iVOK8pO1pLUc" height="18"/>
  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"/>
634 654 </assocwidget>
635 655 <assocwidget indexa="2" indexb="1" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="3" xmi.id="jWbih5XSFvh0" widgetbid="UFqijWWsUGXL" totalcountb="2" type="503" linewidth="none">
636 656 <linepath>
637   - <startpoint startx="452" starty="498"/>
638   - <endpoint endx="452" endy="459"/>
  657 + <startpoint startx="452" starty="475"/>
  658 + <endpoint endx="452" endy="434"/>
639 659 </linepath>
640 660 </assocwidget>
641   - <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="3" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="2" type="510" linewidth="none">
  661 + <assocwidget indexa="1" indexb="1" widgetaid="BtctkDrlM8Ug" linecolor="none" totalcounta="2" xmi.id="ZW1vOR74z6tq" widgetbid="JrepmBDIqpt5" totalcountb="3" type="510" linewidth="none">
642 662 <linepath>
643   - <startpoint startx="235" starty="42"/>
644   - <endpoint endx="369" endy="42"/>
645   - <point x="247" y="42"/>
  663 + <startpoint startx="133" starty="53"/>
  664 + <endpoint endx="340" endy="17"/>
  665 + <point x="133" y="17"/>
646 666 </linepath>
647   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="240" showstereotype="1" y="19" 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="f7I3YwgrvHgV" height="18"/>
648   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="354" showstereotype="1" y="25" 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="chElNmq6FEON" height="18"/>
  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"/>
649 669 </assocwidget>
650 670 <assocwidget indexa="1" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="2" xmi.id="wSYw991iByO4" widgetbid="UGLwdsYoj8hU" totalcountb="2" type="510" linewidth="none">
651 671 <linepath>
652   - <startpoint startx="545" starty="57"/>
653   - <endpoint endx="616" endy="57"/>
654   - <point x="615" y="57"/>
  672 + <startpoint startx="516" starty="31"/>
  673 + <endpoint endx="621" endy="31"/>
  674 + <point x="617" y="31"/>
655 675 </linepath>
656   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="548" showstereotype="1" y="32" 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="1nOr6qRlyjmU" height="18"/>
657   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="602" showstereotype="1" y="39" 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="eQKZg02IfG23" height="18"/>
  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"/>
658 678 </assocwidget>
659 679 <assocwidget indexa="1" indexb="1" widgetaid="UGLwdsYoj8hU" linecolor="none" totalcounta="2" xmi.id="oFsAUjbRPciw" widgetbid="v3uyqqkK5a0o" totalcountb="2" type="503" linewidth="none">
660 680 <linepath>
661   - <startpoint startx="812" starty="49"/>
662   - <endpoint endx="875" endy="106"/>
663   - <point x="875" y="49"/>
  681 + <startpoint startx="817" starty="10"/>
  682 + <endpoint endx="882" endy="106"/>
  683 + <point x="882" y="10"/>
664 684 </linepath>
665   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="815" showstereotype="1" y="28" 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="0s7E4VZ3GysL" height="18"/>
666   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="877" 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="mJ4i1rBfFVCv" height="18"/>
  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"/>
667 687 </assocwidget>
668   - <assocwidget indexa="1" indexb="2" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="3" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="3" type="503" linewidth="none">
  688 + <assocwidget indexa="1" indexb="3" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="2" xmi.id="33WRqx8ehYyk" widgetbid="9xmfrTwvPUo7" totalcountb="4" type="503" linewidth="none">
669 689 <linepath>
670   - <startpoint startx="978" starty="391"/>
671   - <endpoint endx="918" endy="305"/>
672   - <point x="978" y="305"/>
  690 + <startpoint startx="808" starty="548"/>
  691 + <endpoint endx="890" endy="321"/>
  692 + <point x="890" y="548"/>
673 693 </linepath>
674   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="962" showstereotype="1" y="372" 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="TEE9SEAR4Hf8" height="18"/>
675   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="921" showstereotype="1" y="308" 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="kEBzA4KvLOdM" height="18"/>
  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"/>
676 696 </assocwidget>
677   - <assocwidget indexa="2" indexb="2" widgetaid="xg2HZ89UTSe9" linecolor="none" totalcounta="3" xmi.id="0gawd74veI04" widgetbid="KZG5QMEvjqxe" totalcountb="3" type="503" linewidth="none">
  697 + <assocwidget indexa="2" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="5" xmi.id="3BaBClOzRqz2" widgetbid="an76wmD6d9AN" totalcountb="2" type="501" linewidth="none">
678 698 <linepath>
679   - <startpoint startx="991" starty="391"/>
680   - <endpoint endx="991" endy="198"/>
  699 + <startpoint startx="331" starty="219"/>
  700 + <endpoint endx="331" endy="150"/>
681 701 </linepath>
682   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="996" showstereotype="1" y="299" text="AbrevGenerica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="96" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="DozTHBMjPYsq" height="18"/>
683   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="372" 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="m2HqHuwz68yH" height="18"/>
684   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="993" showstereotype="1" y="202" 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="AIATfnqsapJp" height="18"/>
685 702 </assocwidget>
686   - <assocwidget indexa="1" indexb="1" widgetaid="9xmfrTwvPUo7" linecolor="none" totalcounta="3" xmi.id="6ufiCfmprjDt" widgetbid="KZG5QMEvjqxe" totalcountb="3" type="503" linewidth="none">
  703 + <assocwidget indexa="2" indexb="1" widgetaid="JrepmBDIqpt5" linecolor="none" totalcounta="3" xmi.id="CLFbBCdhBsiD" widgetbid="an76wmD6d9AN" totalcountb="2" type="510" linewidth="none">
687 704 <linepath>
688   - <startpoint startx="918" starty="291"/>
689   - <endpoint endx="978" endy="198"/>
690   - <point x="978" y="291"/>
  705 + <startpoint startx="340" starty="32"/>
  706 + <endpoint endx="275" endy="101"/>
  707 + <point x="275" y="32"/>
691 708 </linepath>
692   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="873" showstereotype="1" y="230" text="AbrevEspecifica" font="Sans Serif,9,-1,5,50,0,0,0,0,0" pretext="" role="703" width="104" isinstance="0" posttext="" usefillcolor="1" fillcolor="none" xmi.id="1eYOCOCzOTpf" height="18"/>
693   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="920" showstereotype="1" y="272" 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="LmfSsbh0srTX" height="18"/>
694   - <floatingtext linecolor="none" usesdiagramfillcolor="1" linewidth="none" usesdiagramusefillcolor="1" x="964" showstereotype="1" y="202" 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="cHNA7f06JWSV" height="18"/>
  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"/>
695 711 </assocwidget>
  712 + <assocwidget indexa="4" indexb="1" widgetaid="tTM8hIy8GNaf" linecolor="none" totalcounta="7" xmi.id="1yvbfORhpxwl" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
  713 + <linepath>
  714 + <startpoint startx="342" starty="324"/>
  715 + <endpoint endx="243" endy="626"/>
  716 + <point x="342" y="626"/>
  717 + </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"/>
  720 + </assocwidget>
  721 + <assocwidget indexa="1" indexb="2" widgetaid="B6kIvg1gUhU3" linecolor="none" totalcounta="2" xmi.id="WdDLZA6Wj9qJ" widgetbid="SSn60ti0Hi7M" totalcountb="3" type="503" linewidth="none">
  722 + <linepath>
  723 + <startpoint startx="456" starty="622"/>
  724 + <endpoint endx="243" endy="643"/>
  725 + <point x="456" y="643"/>
  726 + </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"/>
  729 + </assocwidget>
696 730 </associations>
697 731 </diagram>
698 732 </diagrams>
... ... @@ -714,7 +748,7 @@
714 748 </UML:Model>
715 749 </XMI.content>
716 750 <XMI.extensions xmi.extender="umbrello">
717   - <docsettings viewid="LivcEe3649X1" uniqueid="vfSJ6IxQ2ass" documentation=""/>
  751 + <docsettings viewid="LivcEe3649X1" uniqueid="kps2XaWjxILB" documentation=""/>
718 752 <listview>
719 753 <listitem open="1" type="800" id="Views">
720 754 <listitem open="1" type="801" id="Logical View">
... ... @@ -735,6 +769,10 @@
735 769 <listitem open="0" type="814" id="s7au96N5rPQO"/>
736 770 <listitem open="0" type="814" id="lhQygoTH4eBQ"/>
737 771 </listitem>
  772 + <listitem open="1" type="813" id="SSn60ti0Hi7M">
  773 + <listitem open="0" type="814" id="ARwCGMyiGZVP"/>
  774 + <listitem open="0" type="814" id="KOJZGgVg6Jk5"/>
  775 + </listitem>
738 776 <listitem open="1" type="813" id="JrepmBDIqpt5">
739 777 <listitem open="0" type="814" id="yuvmCS9ivIww"/>
740 778 <listitem open="0" type="814" id="Pf2uK5LWaGWq"/>
741 779  
... ... @@ -746,9 +784,19 @@
746 784 <listitem open="0" type="814" id="HAywdppmNMzm"/>
747 785 <listitem open="0" type="814" id="8pTcPkXhuTbV"/>
748 786 <listitem open="0" type="814" id="KVQtfUjIGMo4"/>
749   - <listitem open="0" type="814" id="eNXbtd8E7Z5m"/>
750   - <listitem open="0" type="814" id="09IlMBPyWuZQ"/>
  787 + <listitem open="0" type="814" id="CNoeG4DwyQAC"/>
751 788 </listitem>
  789 + <listitem open="1" type="813" id="B6kIvg1gUhU3">
  790 + <listitem open="0" type="814" id="vfSJ6IxQ2ass"/>
  791 + <listitem open="0" type="814" id="ngzobNmAliMT"/>
  792 + <listitem open="0" type="814" id="s8pgTEZeKJuD"/>
  793 + <listitem open="0" type="814" id="ytuSbMWO2TAb"/>
  794 + <listitem open="0" type="814" id="rwlcd63VEsBh"/>
  795 + <listitem open="0" type="814" id="4jLN0Day7URg"/>
  796 + <listitem open="0" type="814" id="ov2qOCPF7Bpk"/>
  797 + <listitem open="0" type="814" id="HsFVjOAl7T88"/>
  798 + <listitem open="0" type="814" id="kps2XaWjxILB"/>
  799 + </listitem>
752 800 <listitem open="1" type="813" id="UFqijWWsUGXL">
753 801 <listitem open="0" type="814" id="YHdHfnmKPbUi"/>
754 802 <listitem open="0" type="814" id="28i00TJXiwoO"/>
... ... @@ -764,6 +812,10 @@
764 812 <listitem open="0" type="814" id="iC8cHSUDoffC"/>
765 813 <listitem open="0" type="814" id="5yf1ano5Opmf"/>
766 814 </listitem>
  815 + <listitem open="1" type="813" id="an76wmD6d9AN">
  816 + <listitem open="0" type="814" id="kT1UkY4rfa5e"/>
  817 + <listitem open="0" type="814" id="1Q075SLa2rQm"/>
  818 + </listitem>
767 819 <listitem open="1" type="813" id="d3ZqEjji5qNM"/>
768 820 <listitem open="1" type="813" id="4wYvkPyCfH8G">
769 821 <listitem open="0" type="814" id="IPm7po0Vy88E"/>
770 822  
... ... @@ -791,19 +843,10 @@
791 843 <listitem open="0" type="814" id="VHBTNHhwr7G7"/>
792 844 <listitem open="0" type="814" id="DlOEvisprZ8k"/>
793 845 </listitem>
794   - <listitem open="1" type="813" id="B6kIvg1gUhU3">
795   - <listitem open="0" type="814" id="vfSJ6IxQ2ass"/>
796   - <listitem open="0" type="814" id="ngzobNmAliMT"/>
797   - <listitem open="0" type="814" id="s8pgTEZeKJuD"/>
798   - <listitem open="0" type="814" id="ytuSbMWO2TAb"/>
799   - <listitem open="0" type="814" id="rwlcd63VEsBh"/>
800   - <listitem open="0" type="814" id="4jLN0Day7URg"/>
801   - <listitem open="0" type="814" id="ov2qOCPF7Bpk"/>
802   - <listitem open="0" type="814" id="HsFVjOAl7T88"/>
803   - </listitem>
804 846 <listitem open="1" type="813" id="4i4b5BkoCPyn"/>
805 847 <listitem open="1" type="813" id="8Vu4Hrb8golj"/>
806 848 <listitem open="1" type="813" id="3o2H8oL0ircy"/>
  849 + <listitem open="1" type="813" id="0lCIJN1IBOOh"/>
807 850 <listitem open="1" type="813" id="vRnnY3skpGyi"/>
808 851 <listitem open="1" type="813" id="CTisWh0eVOdb"/>
809 852 <listitem open="1" type="813" id="nqgOB6HFGZ5m">
... ... @@ -816,7 +859,7 @@
816 859 <listitem open="1" type="813" id="xg2HZ89UTSe9">
817 860 <listitem open="0" type="814" id="TT1F82F8gHxU"/>
818 861 </listitem>
819   - <listitem open="0" type="830" id="Datatypes">
  862 + <listitem open="1" type="830" id="Datatypes">
820 863 <listitem open="1" type="829" id="XT9G38k8Vh3T"/>
821 864 <listitem open="1" type="829" id="5PxxxWWUqjGq"/>
822 865 <listitem open="1" type="829" id="6aMgotUEBgWz"/>
... ... @@ -838,6 +881,7 @@
838 881 <listitem open="1" type="829" id="gCEBGjygXMqu"/>
839 882 <listitem open="1" type="829" id="IYwfhG76btOd"/>
840 883 <listitem open="1" type="829" id="0lNUP6kRom2r"/>
  884 + <listitem open="1" type="829" id="SvdnBnsvEuNw"/>
841 885 <listitem open="1" type="829" id="1ms5tN4fguym"/>
842 886 <listitem open="1" type="829" id="I6V1nsU8aNjo"/>
843 887 <listitem open="1" type="829" id="xoSXB9KBtCEn"/>