Changeset 338

Show
Ignore:
Timestamp:
06/04/04 00:59:30 (5 years ago)
Author:
arjanmol
Message:

*** empty log message ***

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gaphor/ChangeLog

    r335 r338  
     12004-06-04  Arjan Molenaar  <arjanmolenaar@hetnet.nl> 
     2 
     3        * gaphor/UML/uml2.gaphor: changed Interfaces diagram, so namespaces 
     4        work properly. 
     5        TODO: should write integrety checks for the data model (check if 
     6        derived unions are propertly subsetted everywhere, typos, etc.) 
     7 
    182004-06-03  Arjan Molenaar  <arjanmolenaar@hetnet.nl> 
    29 

  • trunk/gaphor/gaphor/UML/elementfactory.py

    r330 r338  
    119119            try: 
    120120                apply(cb_data[0], (element, name) + cb_data[1:]) 
    121             except: 
    122                 pass 
     121            except Exception, e: 
     122                log.error('Notification of %s failed.' % cb_data[0], e) 
    123123 
    124124    def notify_model(self): 

  • trunk/gaphor/gaphor/UML/uml2.gaphor

    r334 r338  
    143143<orthogonal><val>0</val></orthogonal> 
    144144<horizontal><val>1</val></horizontal> 
    145 <points><val>[(71.0, -2.0), (-184.00000000000006, 0.96800000000001774)]</val></points> 
     145<points><val>[(71.0, -2.0), (-183.99999999999994, 0.96800000000001774)]</val></points> 
    146146<head_connection><ref refid="DCE:5BAD7874-4A87-11D7-B088-133D836EF880"/></head_connection> 
    147147<tail_connection><ref refid="DCE:F8247398-4A86-11D7-B086-133D836EF880"/></tail_connection> 
    …… 
    198198<orthogonal><val>0</val></orthogonal> 
    199199<horizontal><val>1</val></horizontal> 
    200 <points><val>[(0.0, 61.0), (140.0, 61.0)]</val></points> 
     200<points><val>[(0.0, 61.0), (140.00000000000006, 61.000000000000057)]</val></points> 
    201201<head_connection><ref refid="DCE:DECCED70-4A87-11D7-B089-133D836EF880"/></head_connection> 
    202202<tail_connection><ref refid="DCE:69148026-83D9-11D7-ADE2-4B1972AF3391"/></tail_connection> 
    …… 
    250250<orthogonal><val>0</val></orthogonal> 
    251251<horizontal><val>1</val></horizontal> 
    252 <points><val>[(2.5579538487363607e-13, -3.0), (19.644444444444048, 88.44394618834076)]</val></points> 
     252<points><val>[(2.8421709430404007e-13, -3.0000000000001137), (19.644444444444048, 88.443946188340874)]</val></points> 
    253253<head_connection><ref refid="DCE:DECCED70-4A87-11D7-B089-133D836EF880"/></head_connection> 
    254254<tail_connection><ref refid="DCE:441ED6C8-863A-11D7-8239-5A25B8C2F569"/></tail_connection> 
    …… 
    348348<orthogonal><val>0</val></orthogonal> 
    349349<horizontal><val>0</val></horizontal> 
    350 <points><val>[(-5.6843418860808015e-14, -2.0), (1.0, 75.0)]</val></points> 
     350<points><val>[(-5.6843418860808015e-14, -2.0000000000000142), (1.0, 75.0)]</val></points> 
    351351<head_connection><ref refid="DCE:724DDE10-AE12-11D8-9F3C-00C00C03A405"/></head_connection> 
    352352<tail_connection><ref refid="DCE:6E37C068-AE12-11D8-9F3C-00C00C03A405"/></tail_connection> 
    …… 
    454454<grid_ofs_x><val>0.0</val></grid_ofs_x> 
    455455<grid_ofs_y><val>0.0</val></grid_ofs_y> 
    456 <grid_color><val>255</val></grid_color> 
     456<grid_color><val>33023</val></grid_color> 
    457457<grid_bg><val>4294967295</val></grid_bg> 
    458458<root_affine><val>(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)</val></root_affine> 
    …… 
    530530<orthogonal><val>0</val></orthogonal> 
    531531<horizontal><val>1</val></horizontal> 
    532 <points><val>[(-5.6843418860808015e-14, 16.0), (0.14693877551019341, -85.0)]</val></points> 
     532<points><val>[(-5.6843418860808015e-14, 16.0), (0.14693877551013657, -85.000000000000028)]</val></points> 
    533533<head_connection><ref refid="DCE:DCD70090-A419-11D8-A88E-00061BC22919"/></head_connection> 
    534534<tail_connection><ref refid="DCE:601C11DA-A419-11D8-B4C8-00061BC22919"/></tail_connection> 
    …… 
    595595</LiteralSpecification><Diagram id="DCE:1FD159C8-A41B-11D8-BCB9-00061BC22919"><name><val><![CDATA[Artifacts]]></val></name> 
    596596<package><ref refid="DCE:C480ADC2-A41A-11D8-A88E-00061BC22919"/></package> 
    597 <canvas><extents><val>(128.0, 45.0, 659.0, 282.0)</val></extents> 
     597<canvas><extents><val>(128.0, 45.0, 659.0, 281.0)</val></extents> 
    598598<static_extents><val>0</val></static_extents> 
    599599<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    627627<orthogonal><val>0</val></orthogonal> 
    628628<horizontal><val>1</val></horizontal> 
    629 <points><val>[(0.0, -4.0), (2.3507462686567351, 106.00000000000003)]</val></points> 
     629<points><val>[(0.0, -4.0), (2.3507462686567351, 106.0)]</val></points> 
    630630<head_connection><ref refid="DCE:411A3968-A41B-11D8-BCB9-00061BC22919"/></head_connection> 
    631631<tail_connection><ref refid="DCE:28983A0C-A41B-11D8-BCB9-00061BC22919"/></tail_connection> 
    …… 
    673673</LiteralSpecification><Diagram id="DCE:47C3C202-8325-11D8-8D1E-00C00C03A405"><name><val><![CDATA[Actions]]></val></name> 
    674674<package><ref refid="DCE:E4B1E900-8322-11D8-8D1E-00C00C03A405"/></package> 
    675 <canvas><extents><val>(66.759999999999991, 50.0, 748.0, 389.0)</val></extents> 
     675<canvas><extents><val>(82.759999999999991, 50.0, 748.0, 389.0)</val></extents> 
    676676<static_extents><val>0</val></static_extents> 
    677677<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    792792<orthogonal><val>0</val></orthogonal> 
    793793<horizontal><val>1</val></horizontal> 
    794 <points><val>[(-21.0, -1.0), (-80.41605839416053, 87.0)]</val></points> 
     794<points><val>[(-21.0, -1.0), (-80.41605839416053, 87.000000000000057)]</val></points> 
    795795<head_connection><ref refid="DCE:2DF0AAAC-8404-11D8-82A2-7B88E55A3BEC"/></head_connection> 
    796796<tail_connection><ref refid="DCE:96EB8F86-8404-11D8-82A2-7B88E55A3BEC"/></tail_connection> 
    …… 
    10171017<grid_ofs_x><val>0.0</val></grid_ofs_x> 
    10181018<grid_ofs_y><val>0.0</val></grid_ofs_y> 
    1019 <grid_color><val>33023</val></grid_color> 
     1019<grid_color><val>255</val></grid_color> 
    10201020<grid_bg><val>4294967295</val></grid_bg> 
    10211021<root_affine><val>(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)</val></root_affine> 
    …… 
    10851085<orthogonal><val>0</val></orthogonal> 
    10861086<horizontal><val>1</val></horizontal> 
    1087 <points><val>[(-10.663285024154675, 1.0), (-3.3405996233054793, 54.0)]</val></points> 
     1087<points><val>[(-10.663285024154447, 1.0000000000000142), (-3.3405996233054793, 54.0)]</val></points> 
    10881088<head_connection><ref refid="DCE:6F1514F4-4B53-11D7-A5E6-6257AF3C5118"/></head_connection> 
    10891089<tail_connection><ref refid="DCE:7DDC7BDC-4B3D-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    11351135<orthogonal><val>1</val></orthogonal> 
    11361136<horizontal><val>1</val></horizontal> 
    1137 <points><val>[(3.0, -36.000000000000014), (275.0, -36.000000000000014), (275.0, 43.749163879598655), (463.0, 43.749163879598655)]</val></points> 
     1137<points><val>[(2.9999999999999432, -36.000000000000014), (275.0, -36.000000000000014), (275.0, 43.749163879598655), (463.0, 43.749163879598655)]</val></points> 
    11381138<head_connection><ref refid="DCE:61913AB0-4B3D-11D7-B391-02BBFE4396CE"/></head_connection> 
    11391139<tail_connection><ref refid="DCE:7DDC7BDC-4B3D-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    11681168<orthogonal><val>1</val></orthogonal> 
    11691169<horizontal><val>1</val></horizontal> 
    1170 <points><val>[(0.0, 0.0), (-214.0, 0.0), (-214.0, 130.46737967914441), (-1.0995475113121529, 130.46737967914441)]</val></points> 
     1170<points><val>[(0.0, 0.0), (-214.0, 0.0), (-214.0, 130.46737967914441), (-1.0995475113122097, 130.46737967914441)]</val></points> 
    11711171<head_connection><ref refid="DCE:6C8E65AC-4B3D-11D7-B391-02BBFE4396CE"/></head_connection> 
    11721172<tail_connection><ref refid="DCE:846FA01A-4B55-11D7-A5E6-6257AF3C5118"/></tail_connection> 
    …… 
    12151215<orthogonal><val>0</val></orthogonal> 
    12161216<horizontal><val>1</val></horizontal> 
    1217 <points><val>[(13.532778280542971, -3.0), (15.226804123711645, 54.0)]</val></points> 
     1217<points><val>[(13.532778280542971, -2.9999999999999858), (15.226804123711645, 54.0)]</val></points> 
    12181218<head_connection><ref refid="DCE:38B9F838-4B56-11D7-A5E6-6257AF3C5118"/></head_connection> 
    12191219<tail_connection><ref refid="DCE:F3BEEB38-4B55-11D7-A5E6-6257AF3C5118"/></tail_connection> 
    …… 
    12261226<orthogonal><val>0</val></orthogonal> 
    12271227<horizontal><val>1</val></horizontal> 
    1228 <points><val>[(-24.916518874835447, 1.0), (-15.226804123711418, 57.0)]</val></points> 
     1228<points><val>[(-24.916518874835674, 1.0), (-15.226804123711418, 57.0)]</val></points> 
    12291229<head_connection><ref refid="DCE:4EDEF382-4B56-11D7-A5E6-6257AF3C5118"/></head_connection> 
    12301230<tail_connection><ref refid="DCE:F3BEEB38-4B55-11D7-A5E6-6257AF3C5118"/></tail_connection> 
    …… 
    13271327<orthogonal><val>0</val></orthogonal> 
    13281328<horizontal><val>1</val></horizontal> 
    1329 <points><val>[(22.7456546708122, -2.4537838083979295), (42.0, 0.0)]</val></points> 
     1329<points><val>[(22.745654670811973, -2.4537838083979295), (42.0, 0.0)]</val></points> 
    13301330<head_connection><ref refid="DCE:2D5B72FE-863B-11D7-8239-5A25B8C2F569"/></head_connection> 
    13311331<tail_connection><ref refid="DCE:50CA96AC-863B-11D7-8239-5A25B8C2F569"/></tail_connection> 
    …… 
    17661766<orthogonal><val>0</val></orthogonal> 
    17671767<horizontal><val>1</val></horizontal> 
    1768 <points><val>[(-45.000000000000028, -25.347031963470357), (200.99999999999994, -27.0)]</val></points> 
     1768<points><val>[(-45.0, -25.347031963470329), (200.99999999999994, -27.0)]</val></points> 
    17691769<head_connection><ref refid="DCE:555EA868-6679-11D7-A84E-6C8643AD0CA4"/></head_connection> 
    17701770<tail_connection><ref refid="DCE:4B26A412-8320-11D8-BEC8-00C00C03A405"/></tail_connection> 
    …… 
    17791779<orthogonal><val>1</val></orthogonal> 
    17801780<horizontal><val>1</val></horizontal> 
    1781 <points><val>[(0.0, -50.0), (-152.0, -50.0), (-152.0, -3.0), (0.0, -3.0)]</val></points> 
     1781<points><val>[(0.0, -49.999999999999943), (-152.0, -49.999999999999943), (-152.0, -3.0), (0.0, -3.0)]</val></points> 
    17821782<head_connection><ref refid="DCE:4B26A412-8320-11D8-BEC8-00C00C03A405"/></head_connection> 
    17831783<tail_connection><ref refid="DCE:4B26A412-8320-11D8-BEC8-00C00C03A405"/></tail_connection> 
    …… 
    17991799<orthogonal><val>0</val></orthogonal> 
    18001800<horizontal><val>1</val></horizontal> 
    1801 <points><val>[(15.121428571428396, 0.0), (15.349999999999909, 68.0)]</val></points> 
     1801<points><val>[(15.12142857142851, 0.0), (15.349999999999909, 68.0)]</val></points> 
    18021802<head_connection><ref refid="DCE:4B26A412-8320-11D8-BEC8-00C00C03A405"/></head_connection> 
    18031803<tail_connection><ref refid="DCE:991BB40E-8321-11D8-BEC8-00C00C03A405"/></tail_connection> 
    …… 
    18301830<upperValue><ref refid="DCE:82766290-8404-11D8-82A2-7B88E55A3BEC"/></upperValue> 
    18311831</Property><LiteralSpecification id="DCE:EFA90F76-4864-11D8-A4FB-20895068F46E"><value><val><![CDATA[1]]></val></value> 
    1832 </LiteralSpecification><LiteralSpecification id="DCE:A69CED40-A417-11D8-B4C8-00061BC22919"></LiteralSpecification><LiteralString id="DCE:BB4D0B4C-2E06-11D8-A169-52D559F3DAB9"><value><val><![CDATA[false]]></val></value> 
     1832</LiteralSpecification><LiteralSpecification id="DCE:A69CED40-A417-11D8-B4C8-00061BC22919"><value><val><![CDATA[0]]></val></value> 
     1833</LiteralSpecification><LiteralString id="DCE:BB4D0B4C-2E06-11D8-A169-52D559F3DAB9"><value><val><![CDATA[false]]></val></value> 
    18331834</LiteralString><LiteralSpecification id="DCE:EF04C45A-4864-11D8-A4FB-20895068F46E"><value><val><![CDATA[subsets namespace, 
    18341835  redefinitionContext]]></val></value> 
    …… 
    19131914</Generalization><Property id="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"><aggregation><val><![CDATA[composite]]></val></aggregation> 
    19141915<association><ref refid="DCE:A69C2782-A417-11D8-B4C8-00061BC22919"/></association> 
     1916<class_><ref refid="DCE:7DDD179A-4B3D-11D7-B391-02BBFE4396CE"/></class_> 
     1917<isDerived><val>0</val></isDerived> 
    19151918<lowerValue><ref refid="DCE:A69CED40-A417-11D8-B4C8-00061BC22919"/></lowerValue> 
    1916 <owningAssociation><ref refid="DCE:A69C2782-A417-11D8-B4C8-00061BC22919"/></owningAssociation> 
    1917 <presentation><reflist></reflist></presentation><type><ref refid="DCE:3B6508EE-A35C-11D8-9D85-00C00C03A405"/></type> 
     1919<name><val><![CDATA[interface_]]></val></name> 
     1920<presentation><reflist></reflist></presentation><taggedValue><ref refid="DCE:A4DE972E-B469-11D8-BDF4-CAE8B7802210"/></taggedValue> 
     1921<type><ref refid="DCE:3B6508EE-A35C-11D8-9D85-00C00C03A405"/></type> 
     1922<upperValue><ref refid="DCE:A4DA73E4-B469-11D8-BDF4-CAE8B7802210"/></upperValue> 
    19181923</Property><LiteralSpecification id="DCE:23A6F288-DB15-11D7-8BD0-27F1E06F5E9F"><value><val><![CDATA[0]]></val></value> 
    19191924</LiteralSpecification><LiteralSpecification id="DCE:EF3C9300-4864-11D8-A4FB-20895068F46E"><value><val><![CDATA[1]]></val></value> 
    …… 
    21672172<orthogonal><val>0</val></orthogonal> 
    21682173<horizontal><val>1</val></horizontal> 
    2169 <points><val>[(-189.01796407185628, 176.0), (-188.0, 265.0)]</val></points> 
     2174<points><val>[(-189.01796407185628, 176.00000000000006), (-188.0, 265.0)]</val></points> 
    21702175<head_connection><ref refid="DCE:349C7A78-50A4-11D7-807A-302CB4EF44FD"/></head_connection> 
    21712176<tail_connection><ref refid="DCE:740C325C-50A4-11D7-807A-302CB4EF44FD"/></tail_connection> 
    …… 
    23832388</Property><Diagram id="DCE:539997D4-4B37-11D7-B391-02BBFE4396CE"><name><val><![CDATA[Features]]></val></name> 
    23842389<package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    2385 <canvas><extents><val>(40.0, 57.0, 1677.1196581196582, 674.0)</val></extents> 
     2390<canvas><extents><val>(38.0, 57.0, 1677.1196581196582, 674.0)</val></extents> 
    23862391<static_extents><val>0</val></static_extents> 
    23872392<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    23902395<grid_ofs_x><val>0.0</val></grid_ofs_x> 
    23912396<grid_ofs_y><val>0.0</val></grid_ofs_y> 
    2392 <grid_color><val>33023</val></grid_color> 
     2397<grid_color><val>255</val></grid_color> 
    23932398<grid_bg><val>4294967295</val></grid_bg> 
    23942399<root_affine><val>(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)</val></root_affine> 
    …… 
    24022407</item><item id="DCE:86C6436C-4B37-11D7-B391-02BBFE4396CE" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    24032408<show-operations><val>0</val></show-operations> 
    2404 <affine><val>(1.0, 0.0, 0.0, 1.0, 41.0, 202.0)</val></affine> 
     2409<affine><val>(1.0, 0.0, 0.0, 1.0, 39.0, 207.0)</val></affine> 
    24052410<width><val>103.0</val></width> 
    24062411<height><val>44.0</val></height> 
    …… 
    24222427<orthogonal><val>0</val></orthogonal> 
    24232428<horizontal><val>1</val></horizontal> 
    2424 <points><val>[(48.0, 37.999999999999943), (242.0, 42.455882352941103)]</val></points> 
     2429<points><val>[(46.0, 42.999999999999943), (242.0, 42.455882352941103)]</val></points> 
    24252430<head_connection><ref refid="DCE:86C6436C-4B37-11D7-B391-02BBFE4396CE"/></head_connection> 
    24262431<tail_connection><ref refid="DCE:A4ED1438-4B37-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    25502555<orthogonal><val>0</val></orthogonal> 
    25512556<horizontal><val>1</val></horizontal> 
    2552 <points><val>[(-12.320652173913004, -4.0), (-62.140287769784436, 88.0)]</val></points> 
     2557<points><val>[(-12.320652173913004, -2.9999999999999432), (-62.140287769784436, 88.0)]</val></points> 
    25532558<head_connection><ref refid="DCE:A7156672-83E0-11D7-ADE2-4B1972AF3391"/></head_connection> 
    25542559<tail_connection><ref refid="DCE:979B9E7C-4B38-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    26652670<orthogonal><val>0</val></orthogonal> 
    26662671<horizontal><val>1</val></horizontal> 
    2667 <points><val>[(8.9999999999997726, 1.1368683772161603e-13), (189.1196581196582, 1.0)]</val></points> 
     2672<points><val>[(9.0000000000002274, 2.2737367544323206e-13), (189.1196581196582, 1.0)]</val></points> 
    26682673<head_connection><ref refid="DCE:979B9E7C-4B38-11D7-B391-02BBFE4396CE"/></head_connection> 
    26692674<tail_connection><ref refid="DCE:1AADE0DA-4B3A-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    26822687<orthogonal><val>0</val></orthogonal> 
    26832688<horizontal><val>1</val></horizontal> 
    2684 <points><val>[(4.3458538666429831, 2.5182435656448661), (-6.0000000000002274, 45.0)]</val></points> 
     2689<points><val>[(4.3458538666427557, 2.5182435656447524), (-6.0000000000002274, 45.0)]</val></points> 
    26852690<head_connection><ref refid="DCE:DC962046-863A-11D7-8239-5A25B8C2F569"/></head_connection> 
    26862691<tail_connection><ref refid="DCE:FF11AE9C-863A-11D7-8239-5A25B8C2F569"/></tail_connection> 
    …… 
    28092814<orthogonal><val>0</val></orthogonal> 
    28102815<horizontal><val>1</val></horizontal> 
    2811 <points><val>[(0.0, -1.0000000000000284), (-2.8421709430404007e-14, 118.0)]</val></points> 
     2816<points><val>[(1.4210854715202004e-14, -0.99999999999997158), (-2.8421709430404007e-14, 118.0)]</val></points> 
    28122817<head_connection><ref refid="DCE:0D9DCE64-97BA-11D8-9E36-00C00C03A405"/></head_connection> 
    28132818<tail_connection><ref refid="DCE:3DAFB270-97BA-11D8-9E36-00C00C03A405"/></tail_connection> 
    …… 
    28852890<orthogonal><val>0</val></orthogonal> 
    28862891<horizontal><val>1</val></horizontal> 
    2887 <points><val>[(1.0, 0.0), (185.00000000000011, 2.7741935483871032)]</val></points> 
     2892<points><val>[(1.0, 0.0), (185.0, 2.7741935483871032)]</val></points> 
    28882893<head_connection><ref refid="DCE:33965FE4-97BA-11D8-9E36-00C00C03A405"/></head_connection> 
    28892894<tail_connection><ref refid="DCE:F740EC70-97BA-11D8-9E38-00C00C03A405"/></tail_connection> 
    …… 
    28982903<orthogonal><val>0</val></orthogonal> 
    28992904<horizontal><val>1</val></horizontal> 
    2900 <points><val>[(21.611680007830728, -1.0), (28.350000000000136, 57.0)]</val></points> 
     2905<points><val>[(21.611680007830728, -1.0), (28.350000000000023, 57.0)]</val></points> 
    29012906<head_connection><ref refid="DCE:ECAB3CAE-97BA-11D8-9E38-00C00C03A405"/></head_connection> 
    29022907<tail_connection><ref refid="DCE:F740EC70-97BA-11D8-9E38-00C00C03A405"/></tail_connection> 
    …… 
    32703275<orthogonal><val>0</val></orthogonal> 
    32713276<horizontal><val>1</val></horizontal> 
    3272 <points><val>[(-55.10714285714289, 97.714285714285609), (-68.428571428571445, 204.14285714285717)]</val></points> 
     3277<points><val>[(-55.10714285714289, 97.714285714285609), (-68.428571428571502, 204.14285714285717)]</val></points> 
    32733278<head_connection><ref refid="DCE:BDC0B818-4A88-11D7-B08C-133D836EF880"/></head_connection> 
    32743279<tail_connection><ref refid="DCE:5B4EF36E-509D-11D7-811E-AF5893A6470D"/></tail_connection> 
    …… 
    37233728<orthogonal><val>0</val></orthogonal> 
    37243729<horizontal><val>1</val></horizontal> 
    3725 <points><val>[(1.0, -2.8421709430404007e-14), (252.55555555555554, 0.0)]</val></points> 
     3730<points><val>[(1.0, -2.8421709430404007e-14), (252.55555555555566, 0.0)]</val></points> 
    37263731<head_connection><ref refid="DCE:5C468152-4A89-11D7-B08F-133D836EF880"/></head_connection> 
    37273732<tail_connection><ref refid="DCE:F7B024AE-4A89-11D7-B090-133D836EF880"/></tail_connection> 
    …… 
    39413946</Generalization><LiteralString id="DCE:BBD203EC-2E06-11D8-A169-52D559F3DAB9"></LiteralString><LiteralString id="DCE:BC306E1E-2E06-11D8-A169-52D559F3DAB9"></LiteralString><LiteralSpecification id="DCE:67584E30-8320-11D8-BEC8-00C00C03A405"></LiteralSpecification><Generalization id="DCE:71CB8F24-8320-11D8-BEC8-00C00C03A405"><general><ref refid="DCE:6C8F2E88-4B3D-11D7-B391-02BBFE4396CE"/></general> 
    39423947<presentation><reflist><ref refid="DCE:70929C42-8320-11D8-BEC8-00C00C03A405"/></reflist></presentation><specific><ref refid="DCE:4B2A095E-8320-11D8-BEC8-00C00C03A405"/></specific> 
    3943 </Generalization><LiteralSpecification id="DCE:CB47C7D0-A417-11D8-B4C8-00061BC22919"></LiteralSpecification><Association id="DCE:99C5AF80-4A89-11D7-B090-133D836EF880"><memberEnd><reflist><ref refid="DCE:99C69A58-4A89-11D7-B090-133D836EF880"/><ref refid="DCE:99C62C12-4A89-11D7-B090-133D836EF880"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:99C62C12-4A89-11D7-B090-133D836EF880"/></reflist></ownedEnd><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
     3948</Generalization><LiteralSpecification id="DCE:CB47C7D0-A417-11D8-B4C8-00061BC22919"><value><val><![CDATA[0]]></val></value> 
     3949</LiteralSpecification><Association id="DCE:99C5AF80-4A89-11D7-B090-133D836EF880"><memberEnd><reflist><ref refid="DCE:99C69A58-4A89-11D7-B090-133D836EF880"/><ref refid="DCE:99C62C12-4A89-11D7-B090-133D836EF880"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:99C62C12-4A89-11D7-B090-133D836EF880"/></reflist></ownedEnd><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    39443950<presentation><reflist><ref refid="DCE:97ABC8C4-4A89-11D7-B090-133D836EF880"/></reflist></presentation></Association><Association id="DCE:6A6F434A-A418-11D8-B4C8-00061BC22919"><memberEnd><reflist><ref refid="DCE:6A6F6CC0-A418-11D8-B4C8-00061BC22919"/><ref refid="DCE:6A6FBB30-A418-11D8-B4C8-00061BC22919"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:6A6FBB30-A418-11D8-B4C8-00061BC22919"/></reflist></ownedEnd><package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
    39453951<presentation><reflist><ref refid="DCE:6983BAD0-A418-11D8-B4C8-00061BC22919"/></reflist></presentation></Association><LiteralSpecification id="DCE:ED650C2C-4864-11D8-A4FB-20895068F46E"></LiteralSpecification><LiteralString id="DCE:BBCB76F8-2E06-11D8-A169-52D559F3DAB9"></LiteralString><Property id="DCE:54F98BE0-6692-11D7-A84E-6C8643AD0CA4"><association><ref refid="DCE:54F91F8E-6692-11D7-A84E-6C8643AD0CA4"/></association> 
    …… 
    41944200<orthogonal><val>0</val></orthogonal> 
    41954201<horizontal><val>1</val></horizontal> 
    4196 <points><val>[(-12.029126213592235, 0.0), (-200.0, 97.0)]</val></points> 
     4202<points><val>[(-12.029126213592235, 0.0), (-200.0, 96.999999999999972)]</val></points> 
    41974203<head_connection><ref refid="DCE:2F5A91CC-8405-11D8-82A2-7B88E55A3BEC"/></head_connection> 
    41984204<tail_connection><ref refid="DCE:39844D00-8405-11D8-82A2-7B88E55A3BEC"/></tail_connection> 
    …… 
    42274233<orthogonal><val>0</val></orthogonal> 
    42284234<horizontal><val>1</val></horizontal> 
    4229 <points><val>[(-7.2718446601941196, 0.0), (92.0, 99.0)]</val></points> 
     4235<points><val>[(-7.2718446601941196, 0.0), (92.0, 98.999999999999972)]</val></points> 
    42304236<head_connection><ref refid="DCE:2F5A91CC-8405-11D8-82A2-7B88E55A3BEC"/></head_connection> 
    42314237<tail_connection><ref refid="DCE:3DCEAB1C-8405-11D8-82A2-7B88E55A3BEC"/></tail_connection> 
    …… 
    44534459<orthogonal><val>0</val></orthogonal> 
    44544460<horizontal><val>1</val></horizontal> 
    4455 <points><val>[(0.9795918367348122, -1.0000000000000568), (0.0, 54.0)]</val></points> 
     4461<points><val>[(0.9795918367348122, -1.0000000000000568), (0.0, 53.999999999999943)]</val></points> 
    44564462<head_connection><ref refid="DCE:B10A179C-509E-11D7-9F0D-F80F4B06507D"/></head_connection> 
    44574463<tail_connection><ref refid="DCE:C9A01FAE-509E-11D7-9F0D-F80F4B06507D"/></tail_connection> 
    …… 
    47024708</LiteralSpecification><Diagram id="DCE:94ED9700-4B3A-11D7-B391-02BBFE4396CE"><name><val><![CDATA[Operations]]></val></name> 
    47034709<package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    4704 <canvas><extents><val>(89.0, 60.0, 818.0, 624.0)</val></extents> 
     4710<canvas><extents><val>(89.0, 60.0, 818.0, 620.0)</val></extents> 
    47054711<static_extents><val>0</val></static_extents> 
    47064712<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    47524758<orthogonal><val>0</val></orthogonal> 
    47534759<horizontal><val>1</val></horizontal> 
    4754 <points><val>[(92.000000000000114, 2.0000000000000284), (-301.0, 2.0)]</val></points> 
     4760<points><val>[(92.0, 2.0000000000000284), (-301.0, 2.0)]</val></points> 
    47554761<head_connection><ref refid="DCE:2CB7901A-4B3B-11D7-B391-02BBFE4396CE"/></head_connection> 
    47564762<tail_connection><ref refid="DCE:AB14591A-4B3A-11D7-B391-02BBFE4396CE"/></tail_connection> 
    …… 
    48844890</LiteralString><Association id="DCE:B751CA7E-6691-11D7-A84E-6C8643AD0CA4"><memberEnd><reflist><ref refid="DCE:B7523644-6691-11D7-A84E-6C8643AD0CA4"/><ref refid="DCE:B7520388-6691-11D7-A84E-6C8643AD0CA4"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:B7520388-6691-11D7-A84E-6C8643AD0CA4"/></reflist></ownedEnd><package><ref refid="DCE:5573D924-6690-11D7-A84E-6C8643AD0CA4"/></package> 
    48854891<presentation><reflist><ref refid="DCE:B607CF74-6691-11D7-A84E-6C8643AD0CA4"/></reflist></presentation></Association><LiteralSpecification id="DCE:756AB5BE-97BA-11D8-9E37-00C00C03A405"><value><val><![CDATA[*]]></val></value> 
    4886 </LiteralSpecification><Association id="DCE:A69C2782-A417-11D8-B4C8-00061BC22919"><memberEnd><reflist><ref refid="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"/><ref refid="DCE:A69C528C-A417-11D8-B4C8-00061BC22919"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"/></reflist></ownedEnd><package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
     4892</LiteralSpecification><Association id="DCE:A69C2782-A417-11D8-B4C8-00061BC22919"><memberEnd><reflist><ref refid="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"/><ref refid="DCE:A69C528C-A417-11D8-B4C8-00061BC22919"/></reflist></memberEnd><package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
    48874893<presentation><reflist><ref refid="DCE:A3DA76B4-A417-11D8-B4C8-00061BC22919"/></reflist></presentation></Association><LiteralSpecification id="DCE:4083A5DC-8406-11D8-82A2-7B88E55A3BEC"></LiteralSpecification><LiteralString id="DCE:BC0561EC-2E06-11D8-A169-52D559F3DAB9"></LiteralString><LiteralSpecification id="DCE:5B9D3704-8402-11D8-82A2-7B88E55A3BEC"><value><val><![CDATA[*]]></val></value> 
    48884894</LiteralSpecification><LiteralSpecification id="DCE:EDBE0D58-4864-11D8-A4FB-20895068F46E"><value><val><![CDATA[subsets member, ownedElement]]></val></value> 
    …… 
    50605066<orthogonal><val>0</val></orthogonal> 
    50615067<horizontal><val>1</val></horizontal> 
    5062 <points><val>[(2.0000000000000568, -1.0), (1.9999999999999432, 109.0)]</val></points> 
     5068<points><val>[(2.0, -1.0000000000000568), (2.0, 109.00000000000006)]</val></points> 
    50635069<head_connection><ref refid="DCE:10978112-8402-11D8-82A2-7B88E55A3BEC"/></head_connection> 
    50645070<tail_connection><ref refid="DCE:3CF0EBEC-8403-11D8-82A2-7B88E55A3BEC"/></tail_connection> 
    …… 
    50795085</Property><Diagram id="DCE:DA3B1A4E-8405-11D8-82A2-7B88E55A3BEC"><name><val><![CDATA[Groups]]></val></name> 
    50805086<package><ref refid="DCE:E4B1E900-8322-11D8-8D1E-00C00C03A405"/></package> 
    5081 <canvas><extents><val>(20.0, 43.0, 760.0, 385.00000000000006)</val></extents> 
     5087<canvas><extents><val>(20.0, 43.0, 760.0, 377.0)</val></extents> 
    50825088<static_extents><val>0</val></static_extents> 
    50835089<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    51695175<orthogonal><val>0</val></orthogonal> 
    51705176<horizontal><val>1</val></horizontal> 
    5171 <points><val>[(-33.0, 62.0), (-116.0, 87.000000000000057)]</val></points> 
     5177<points><val>[(-33.0, 62.0), (-116.0, 87.0)]</val></points> 
    51725178<head_connection><ref refid="DCE:FB5C328A-8405-11D8-82A2-7B88E55A3BEC"/></head_connection> 
    51735179<tail_connection><ref refid="DCE:C0147696-8406-11D8-82A2-7B88E55A3BEC"/></tail_connection> 
    …… 
    51965202</Property><Diagram id="DCE:E71AAA3E-45CE-11D7-B5CA-613352B2821F"><name><val><![CDATA[Root]]></val></name> 
    51975203<package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    5198 <canvas><extents><val>(24.0, 113.0, 697.0, 563.34375)</val></extents> 
     5204<canvas><extents><val>(24.0, 113.0, 694.0, 559.34375)</val></extents> 
    51995205<static_extents><val>0</val></static_extents> 
    52005206<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    55605566<orthogonal><val>0</val></orthogonal> 
    55615567<horizontal><val>1</val></horizontal> 
    5562 <points><val>[(-5.6843418860808015e-14, 2.0), (0.0, 96.000000000000028)]</val></points> 
     5568<points><val>[(-5.6843418860808015e-14, 2.0), (0.0, 96.0)]</val></points> 
    55635569<head_connection><ref refid="DCE:CA53F57E-A41C-11D8-B0B1-00061BC22919"/></head_connection> 
    55645570<tail_connection><ref refid="DCE:CE612128-A41C-11D8-B0B1-00061BC22919"/></tail_connection> 
    …… 
    57595765</LiteralSpecification><Diagram id="DCE:2D47DA48-50A5-11D7-807A-302CB4EF44FD"><name><val><![CDATA[Interfaces]]></val></name> 
    57605766<package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
    5761 <canvas><extents><val>(15.0, 85.0, 778.0, 652.0)</val></extents> 
     5767<canvas><extents><val>(50.0, 61.0, 857.0, 628.0)</val></extents> 
    57625768<static_extents><val>0</val></static_extents> 
    57635769<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    57665772<grid_ofs_x><val>0.0</val></grid_ofs_x> 
    57675773<grid_ofs_y><val>0.0</val></grid_ofs_y> 
    5768 <grid_color><val>33023</val></grid_color> 
     5774<grid_color><val>255</val></grid_color> 
    57695775<grid_bg><val>4294967295</val></grid_bg> 
    57705776<root_affine><val>(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)</val></root_affine> 
    57715777<item id="DCE:357C844A-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    57725778<show-operations><val>0</val></show-operations> 
    5773 <affine><val>(1.0, 0.0, 0.0, 1.0, 374.0, 86.0)</val></affine> 
     5779<affine><val>(1.0, 0.0, 0.0, 1.0, 453.0, 62.0)</val></affine> 
    57745780<width><val>112.0</val></width> 
    57755781<height><val>49.0</val></height> 
    …… 
    57785784</item><item id="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>1</val></show-attributes> 
    57795785<show-operations><val>0</val></show-operations> 
    5780 <affine><val>(1.0, 0.0, 0.0, 1.0, 379.0, 197.0)</val></affine> 
     5786<affine><val>(1.0, 0.0, 0.0, 1.0, 458.0, 173.0)</val></affine> 
    57815787<width><val>101.0</val></width> 
    57825788<height><val>143.0</val></height> 
    …… 
    57845790<subject><ref refid="DCE:3B6508EE-A35C-11D8-9D85-00C00C03A405"/></subject> 
    57855791</item><item id="DCE:499044B4-A35C-11D8-9D85-00C00C03A405" type="GeneralizationItem"><subject><ref refid="DCE:4A9BD768-A35C-11D8-9D85-00C00C03A405"/></subject> 
    5786 <affine><val>(1.0, 0.0, 0.0, 1.0, 588.0, 119.0)</val></affine> 
    5787 <line_width><val>2.0</val></line_width> 
    5788 <color><val>255</val></color> 
    5789 <cap><val>1</val></cap> 
    5790 <join><val>1</val></join> 
    5791 <orthogonal><val>0</val></orthogonal> 
    5792 <horizontal><val>1</val></horizontal> 
    5793 <points><val>[(-160.00000000000006, 16.0), (-159.51000000000005, 78.0)]</val></points> 
     5792<affine><val>(1.0, 0.0, 0.0, 1.0, 667.0, 95.0)</val></affine> 
     5793<line_width><val>2.0</val></line_width> 
     5794<color><val>255</val></color> 
     5795<cap><val>1</val></cap> 
     5796<join><val>1</val></join> 
     5797<orthogonal><val>0</val></orthogonal> 
     5798<horizontal><val>1</val></horizontal> 
     5799<points><val>[(-160.0, 16.0), (-159.5100000000001, 78.0)]</val></points> 
    57945800<head_connection><ref refid="DCE:357C844A-A35C-11D8-9D85-00C00C03A405"/></head_connection> 
    57955801<tail_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    57965802</item><item id="DCE:651CE0E8-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    57975803<show-operations><val>0</val></show-operations> 
    5798 <affine><val>(1.0, 0.0, 0.0, 1.0, 16.0, 194.0)</val></affine> 
     5804<affine><val>(1.0, 0.0, 0.0, 1.0, 52.0, 169.0)</val></affine> 
    57995805<width><val>104.0</val></width> 
    58005806<height><val>41.0</val></height> 
    …… 
    58035809</item><item id="DCE:74257314-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    58045810<show-operations><val>0</val></show-operations> 
    5805 <affine><val>(1.0, 0.0, 0.0, 1.0, 18.0, 272.0)</val></affine> 
     5811<affine><val>(1.0, 0.0, 0.0, 1.0, 51.0, 247.0)</val></affine> 
    58065812<width><val>108.0</val></width> 
    58075813<height><val>41.0</val></height> 
    …… 
    58105816</item><item id="DCE:8829F4D6-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>1</val></show-attributes> 
    58115817<show-operations><val>0</val></show-operations> 
    5812 <affine><val>(1.0, 0.0, 0.0, 1.0, 355.0, 453.0)</val></affine> 
     5818<affine><val>(1.0, 0.0, 0.0, 1.0, 434.0, 429.0)</val></affine> 
    58135819<width><val>151.0</val></width> 
    58145820<height><val>56.0</val></height> 
    …… 
    58175823</item><item id="DCE:9E2A4572-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    58185824<show-operations><val>0</val></show-operations> 
    5819 <affine><val>(1.0, 0.0, 0.0, 1.0, 101.0, 449.0)</val></affine> 
     5825<affine><val>(1.0, 0.0, 0.0, 1.0, 180.0, 425.0)</val></affine> 
    58205826<width><val>115.0</val></width> 
    58215827<height><val>56.0</val></height> 
    …… 
    58245830</item><item id="DCE:AA5E1724-A35C-11D8-9D85-00C00C03A405" type="ClassItem"><show-attributes><val>0</val></show-attributes> 
    58255831<show-operations><val>0</val></show-operations> 
    5826 <affine><val>(1.0, 0.0, 0.0, 1.0, 323.0, 610.0)</val></affine> 
     5832<affine><val>(1.0, 0.0, 0.0, 1.0, 402.0, 586.0)</val></affine> 
    58275833<width><val>192.0</val></width> 
    58285834<height><val>41.0</val></height> 
    …… 
    58305836<subject><ref refid="DCE:555F3576-6679-11D7-A84E-6C8643AD0CA4"/></subject> 
    58315837</item><item id="DCE:A3DA76B4-A417-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:A69C2782-A417-11D8-B4C8-00061BC22919"/></subject> 
    5832 <affine><val>(1.0, 0.0, 0.0, 1.0, 202.0, 208.0)</val></affine> 
    5833 <line_width><val>2.0</val></line_width> 
    5834 <color><val>255</val></color> 
    5835 <cap><val>1</val></cap> 
    5836 <join><val>1</val></join> 
    5837 <orthogonal><val>0</val></orthogonal> 
    5838 <horizontal><val>1</val></horizontal> 
    5839 <points><val>[(-81.999999999999986, 4.0), (177.0, 4.0)]</val></points> 
     5838<affine><val>(1.0, 0.0, 0.0, 1.0, 281.0, 184.0)</val></affine> 
     5839<line_width><val>2.0</val></line_width> 
     5840<color><val>255</val></color> 
     5841<cap><val>1</val></cap> 
     5842<join><val>1</val></join> 
     5843<orthogonal><val>0</val></orthogonal> 
     5844<horizontal><val>1</val></horizontal> 
     5845<points><val>[(-125.0, 3.0), (47.500000000000007, 4.0), (177.0, 4.0)]</val></points> 
    58405846<head_connection><ref refid="DCE:651CE0E8-A35C-11D8-9D85-00C00C03A405"/></head_connection> 
    58415847<tail_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    …… 
    58435849<tail_subject><ref refid="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"/></tail_subject> 
    58445850</item><item id="DCE:C926BA1A-A417-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:CB4709B0-A417-11D8-B4C8-00061BC22919"/></subject> 
    5845 <affine><val>(1.0, 0.0, 0.0, 1.0, 126.0, 293.0)</val></affine> 
    5846 <line_width><val>2.0</val></line_width> 
    5847 <color><val>255</val></color> 
    5848 <cap><val>1</val></cap> 
    5849 <join><val>1</val></join> 
    5850 <orthogonal><val>0</val></orthogonal> 
    5851 <horizontal><val>1</val></horizontal> 
    5852 <points><val>[(1.4210854715202004e-14, -5.6843418860808015e-14), (253.00000000000006, 0.0)]</val></points> 
     5851<affine><val>(1.0, 0.0, 0.0, 1.0, 205.0, 269.0)</val></affine> 
     5852<line_width><val>2.0</val></line_width> 
     5853<color><val>255</val></color> 
     5854<cap><val>1</val></cap> 
     5855<join><val>1</val></join> 
     5856<orthogonal><val>0</val></orthogonal> 
     5857<horizontal><val>1</val></horizontal> 
     5858<points><val>[(-46.000000000000028, -1.0000000000000568), (253.0, 0.0)]</val></points> 
    58535859<head_connection><ref refid="DCE:74257314-A35C-11D8-9D85-00C00C03A405"/></head_connection> 
    58545860<tail_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    …… 
    58565862<tail_subject><ref refid="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"/></tail_subject> 
    58575863</item><item id="DCE:ED3CF9A0-A417-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:EE13C07A-A417-11D8-B4C8-00061BC22919"/></subject> 
    5858 <affine><val>(1.0, 0.0, 0.0, 1.0, 481.0, 208.0)</val></affine> 
    5859 <line_width><val>2.0</val></line_width> 
    5860 <color><val>255</val></color> 
    5861 <cap><val>1</val></cap> 
    5862 <join><val>1</val></join> 
    5863 <orthogonal><val>0</val></orthogonal> 
    5864 <horizontal><val>1</val></horizontal> 
    5865 <points><val>[(-0.99999999999994316, 2.7982456140350678), (159.0, 3.0), (159.0, 46.0), (-1.0, 45.999999999999972)]</val></points> 
     5864<affine><val>(1.0, 0.0, 0.0, 1.0, 560.0, 184.0)</val></affine> 
     5865<line_width><val>2.0</val></line_width> 
     5866<color><val>255</val></color> 
     5867<cap><val>1</val></cap> 
     5868<join><val>1</val></join> 
     5869<orthogonal><val>0</val></orthogonal> 
     5870<horizontal><val>1</val></horizontal> 
     5871<points><val>[(-0.99999999999988631, 2.7982456140350678), (159.0, 3.0), (159.0, 46.0), (-1.0, 45.999999999999943)]</val></points> 
    58665872<head_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></head_connection> 
    58675873<tail_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    …… 
    58695875<tail_subject><ref refid="DCE:EE143C82-A417-11D8-B4C8-00061BC22919"/></tail_subject> 
    58705876</item><item id="DCE:2E5D51E6-A418-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:459B0E02-A418-11D8-B4C8-00061BC22919"/></subject> 
    5871 <affine><val>(1.0, 0.0, 0.0, 1.0, 479.0, 288.0)</val></affine> 
     5877<affine><val>(1.0, 0.0, 0.0, 1.0, 558.0, 264.0)</val></affine> 
    58725878<line_width><val>2.0</val></line_width> 
    58735879<color><val>255</val></color> 
    …… 
    58825888<tail_subject><ref refid="DCE:459B86B4-A418-11D8-B4C8-00061BC22919"/></tail_subject> 
    58835889</item><item id="DCE:6983BAD0-A418-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:6A6F434A-A418-11D8-B4C8-00061BC22919"/></subject> 
    5884 <affine><val>(1.0, 0.0, 0.0, 1.0, 427.0, 341.0)</val></affine> 
    5885 <line_width><val>2.0</val></line_width> 
    5886 <color><val>255</val></color> 
    5887 <cap><val>1</val></cap> 
    5888 <join><val>1</val></join> 
    5889 <orthogonal><val>0</val></orthogonal> 
    5890 <horizontal><val>1</val></horizontal> 
    5891 <points><val>[(5.6843418860808015e-14, -1.0), (0.0, 112.0)]</val></points> 
     5890<affine><val>(1.0, 0.0, 0.0, 1.0, 506.0, 317.0)</val></affine> 
     5891<line_width><val>2.0</val></line_width> 
     5892<color><val>255</val></color> 
     5893<cap><val>1</val></cap> 
     5894<join><val>1</val></join> 
     5895<orthogonal><val>0</val></orthogonal> 
     5896<horizontal><val>1</val></horizontal> 
     5897<points><val>[(0.0, -1.0000000000000568), (-5.6843418860808015e-14, 112.0)]</val></points> 
    58925898<head_connection><ref refid="DCE:3B61B1FA-A35C-11D8-9D85-00C00C03A405"/></head_connection> 
    58935899<tail_connection><ref refid="DCE:8829F4D6-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    …… 
    58955901<tail_subject><ref refid="DCE:6A6FBB30-A418-11D8-B4C8-00061BC22919"/></tail_subject> 
    58965902</item><item id="DCE:90FB2ABE-A418-11D8-B4C8-00061BC22919" type="GeneralizationItem"><subject><ref refid="DCE:91D4B02A-A418-11D8-B4C8-00061BC22919"/></subject> 
    5897 <affine><val>(1.0, 0.0, 0.0, 1.0, 427.0, 574.0)</val></affine> 
     5903<affine><val>(1.0, 0.0, 0.0, 1.0, 506.0, 550.0)</val></affine> 
    58985904<line_width><val>2.0</val></line_width> 
    58995905<color><val>255</val></color> 
    …… 
    59065912<tail_connection><ref refid="DCE:8829F4D6-A35C-11D8-9D85-00C00C03A405"/></tail_connection> 
    59075913</item><item id="DCE:C0F30262-A418-11D8-B4C8-00061BC22919" type="AssociationItem"><subject><ref refid="DCE:C229073A-A418-11D8-B4C8-00061BC22919"/></subject> 
    5908 <affine><val>(1.0, 0.0, 0.0, 1.0, 216.0, 476.0)</val></affine> 
     5914<affine><val>(1.0, 0.0, 0.0, 1.0, 295.0, 452.0)</val></affine> 
    59095915<line_width><val>2.0</val></line_width> 
    59105916<color><val>255</val></color> 
    …… 
    59185924<head_subject><ref refid="DCE:C2293130-A418-11D8-B4C8-00061BC22919"/></head_subject> 
    59195925<tail_subject><ref refid="DCE:C22988EA-A418-11D8-B4C8-00061BC22919"/></tail_subject> 
    5920 </item><item id="DCE:4A9BA614-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 619.0, 531.0)</val></affine> 
     5926</item><item id="DCE:4A9BA614-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 698.0, 507.0)</val></affine> 
    59215927<width><val>158.0</val></width> 
    59225928<height><val>28.0</val></height> 
    59235929<auto-resize><val>0</val></auto-resize> 
    59245930<subject><ref refid="DCE:4A9F20A0-AE13-11D8-9F3C-00C00C03A405"/></subject> 
    5925 </item><item id="DCE:5D7160DC-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 564.0, 607.0)</val></affine> 
     5931</item><item id="DCE:5D7160DC-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 643.0, 583.0)</val></affine> 
    59265932<width><val>106.0</val></width> 
    59275933<height><val>28.0</val></height> 
    59285934<auto-resize><val>0</val></auto-resize> 
    59295935<subject><ref refid="DCE:5D75F1F4-AE13-11D8-9F3C-00C00C03A405"/></subject> 
    5930 </item><item id="DCE:79FEB22C-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 576.0, 364.0)</val></affine> 
     5936</item><item id="DCE:79FEB22C-AE13-11D8-9F3C-00C00C03A405" type="CommentItem"><affine><val>(1.0, 0.0, 0.0, 1.0, 655.0, 340.0)</val></affine> 
    59315937<width><val>104.0</val></width> 
    59325938<height><val>28.0</val></height> 
    …… 
    60666072<orthogonal><val>0</val></orthogonal> 
    60676073<horizontal><val>1</val></horizontal> 
    6068 <points><val>[(-5.0386265159929735, -18.0), (-3.056338028168966, 19.0)]</val></points> 
     6074<points><val>[(-5.0386265159929735, -18.0), (-3.056338028168966, 19.000000000000057)]</val></points> 
    60696075<head_connection><ref refid="DCE:09D81820-50A3-11D7-807A-302CB4EF44FD"/></head_connection> 
    60706076<tail_connection><ref refid="DCE:160EBB4E-50A3-11D7-807A-302CB4EF44FD"/></tail_connection> 
    …… 
    60776083<orthogonal><val>0</val></orthogonal> 
    60786084<horizontal><val>1</val></horizontal> 
    6079 <points><val>[(0.0, -35.000000000000057), (319.0, -35.0)]</val></points> 
     6085<points><val>[(5.6843418860808015e-14, -35.0), (319.0, -35.0)]</val></points> 
    60806086<head_connection><ref refid="DCE:C4730890-50A1-11D7-807A-302CB4EF44FD"/></head_connection> 
    60816087<tail_connection><ref refid="DCE:160EBB4E-50A3-11D7-807A-302CB4EF44FD"/></tail_connection> 
    …… 
    60906096<orthogonal><val>0</val></orthogonal> 
    60916097<horizontal><val>1</val></horizontal> 
    6092 <points><val>[(318.00000000000011, -57.785714285713993), (-0.99999999999994316, -57.999999999999602)]</val></points> 
     6098<points><val>[(318.0, -57.78571428571405), (-1.0, -57.999999999999659)]</val></points> 
    60936099<head_connection><ref refid="DCE:160EBB4E-50A3-11D7-807A-302CB4EF44FD"/></head_connection> 
    60946100<tail_connection><ref refid="DCE:C4730890-50A1-11D7-807A-302CB4EF44FD"/></tail_connection> 
    …… 
    61736179<presentation><reflist><ref refid="DCE:F11D8C6C-4B38-11D7-B391-02BBFE4396CE"/></reflist></presentation><specific><ref refid="DCE:979C397C-4B38-11D7-B391-02BBFE4396CE"/></specific> 
    61746180</Generalization><Class id="DCE:AB14F544-4B3A-11D7-B391-02BBFE4396CE"><generalization><reflist><ref refid="DCE:00C028E4-8F99-11D8-B23A-00C00C03A405"/></reflist></generalization><name><val><![CDATA[Operation]]></val></name> 
    6175 <ownedAttribute><reflist><ref refid="DCE:C58D3BE0-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:B9BB4D5C-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:12A3CA4C-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:4CC324CA-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:90BB33FA-4B55-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:C6B7B4C8-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:F3B2B0C8-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:F14BFD06-202E-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:4A119576-83E1-11D7-ADE2-4B1972AF3391"/><ref refid="DCE:453743CA-4B3B-11D7-B391-02BBFE4396CE"/><ref refid="DCE:657FAA24-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:C9B92D32-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:941D5970-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:C8FE78CA-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:315EFD7A-83E1-11D7-ADE2-4B1972AF3391"/><ref refid="DCE:E771B8F2-202E-11D8-A078-8A3FE3E765F1"/></reflist></ownedAttribute><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
     6181<ownedAttribute><reflist><ref refid="DCE:C58D3BE0-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:B9BB4D5C-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:12A3CA4C-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:4CC324CA-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:90BB33FA-4B55-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:C6B7B4C8-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:F3B2B0C8-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:F14BFD06-202E-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:4A119576-83E1-11D7-ADE2-4B1972AF3391"/><ref refid="DCE:453743CA-4B3B-11D7-B391-02BBFE4396CE"/><ref refid="DCE:657FAA24-4B3C-11D7-B391-02BBFE4396CE"/><ref refid="DCE:C9B92D32-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:941D5970-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:C8FE78CA-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:315EFD7A-83E1-11D7-ADE2-4B1972AF3391"/><ref refid="DCE:E771B8F2-202E-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"/></reflist></ownedAttribute><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    61766182<presentation><reflist><ref refid="DCE:846FA01A-4B55-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:7DE81C50-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:AB14591A-4B3A-11D7-B391-02BBFE4396CE"/><ref refid="DCE:74257314-A35C-11D8-9D85-00C00C03A405"/></reflist></presentation></Class><Association id="DCE:BCEB5704-4B32-11D7-B391-02BBFE4396CE"><memberEnd><reflist><ref refid="DCE:BCEBC220-4B32-11D7-B391-02BBFE4396CE"/><ref refid="DCE:BCEB8FB0-4B32-11D7-B391-02BBFE4396CE"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:BCEBC220-4B32-11D7-B391-02BBFE4396CE"/></reflist></ownedEnd><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    61776183<presentation><reflist><ref refid="DCE:BC006294-4B32-11D7-B391-02BBFE4396CE"/></reflist></presentation></Association><Class id="DCE:4AB79F34-8403-11D8-82A2-7B88E55A3BEC"><generalization><reflist><ref refid="DCE:5E50732C-8403-11D8-82A2-7B88E55A3BEC"/></reflist></generalization><name><val><![CDATA[ControlFlow]]></val></name> 
    61786184<package><ref refid="DCE:E4B1E900-8322-11D8-8D1E-00C00C03A405"/></package> 
    61796185<presentation><reflist><ref refid="DCE:4AB3E40E-8403-11D8-82A2-7B88E55A3BEC"/></reflist></presentation></Class><LiteralString id="DCE:BB9CA922-2E06-11D8-A169-52D559F3DAB9"><value><val><![CDATA[AggregationKind]]></val></value> 
    6180 </LiteralString><Association id="DCE:CB4709B0-A417-11D8-B4C8-00061BC22919"><memberEnd><reflist><ref refid="DCE:CB473358-A417-11D8-B4C8-00061BC22919"/><ref refid="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"/></reflist></memberEnd><ownedEnd><reflist><ref refid="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"/></reflist></ownedEnd><package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
     6186</LiteralString><Association id="DCE:CB4709B0-A417-11D8-B4C8-00061BC22919"><memberEnd><reflist><ref refid="DCE:CB473358-A417-11D8-B4C8-00061BC22919"/><ref refid="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"/></reflist></memberEnd><package><ref refid="DCE:740CE396-50A4-11D7-807A-302CB4EF44FD"/></package> 
    61816187<presentation><reflist><ref refid="DCE:C926BA1A-A417-11D8-B4C8-00061BC22919"/></reflist></presentation></Association><LiteralSpecification id="DCE:ED7DBD3A-4864-11D8-A4FB-20895068F46E"></LiteralSpecification><Class id="DCE:7DDD179A-4B3D-11D7-B391-02BBFE4396CE"><generalization><reflist><ref refid="DCE:7C06DB8E-4B53-11D7-A5E6-6257AF3C5118"/></reflist></generalization><name><val><![CDATA[Property]]></val></name> 
    6182 <ownedAttribute><reflist><ref refid="DCE:F553874E-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:F90C3F76-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0261E788-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:02340140-202F-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:C315BC3A-4B57-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:3A844CD2-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:C0FF5892-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0E0139EC-4B56-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:8CB23AE8-4B56-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:38A97D1E-4B54-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:2F2CD980-863B-11D7-8239-5A25B8C2F569"/><ref refid="DCE:EBC42EBE-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0FEA2C38-202F-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:C5CC49BE-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0BC178A2-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0E1B7E56-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:E08638A8-4B57-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:E46BF7B4-4B52-11D7-A5E6-6257AF3C5118"/></reflist></ownedAttribute><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
     6188<ownedAttribute><reflist><ref refid="DCE:F553874E-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:F90C3F76-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0261E788-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:02340140-202F-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:C315BC3A-4B57-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:3A844CD2-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:C0FF5892-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0E0139EC-4B56-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:8CB23AE8-4B56-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:38A97D1E-4B54-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:2F2CD980-863B-11D7-8239-5A25B8C2F569"/><ref refid="DCE:EBC42EBE-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0FEA2C38-202F-11D8-A078-8A3FE3E765F1"/><ref refid="DCE:C5CC49BE-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0BC178A2-4B53-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:0E1B7E56-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:E08638A8-4B57-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:E46BF7B4-4B52-11D7-A5E6-6257AF3C5118"/><ref refid="DCE:A69CC5FE-A417-11D8-B4C8-00061BC22919"/></reflist></ownedAttribute><package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    61836189<presentation><reflist><ref refid="DCE:7DDC7BDC-4B3D-11D7-B391-02BBFE4396CE"/><ref refid="DCE:5EBD14E8-97BB-11D8-9E39-00C00C03A405"/><ref refid="DCE:02AD11F6-509C-11D7-811E-AF5893A6470D"/><ref refid="DCE:651CE0E8-A35C-11D8-9D85-00C00C03A405"/></reflist></presentation></Class><Class id="DCE:7D753EF0-464D-11D7-AA08-1B85D5275D8A"><generalization><reflist><ref refid="DCE:84C5B02A-464D-11D7-AA08-1B85D5275D8A"/></reflist></generalization><isAbstract><val>1</val></isAbstract> 
    61846190<name><val><![CDATA[Namespace]]></val></name> 
    …… 
    64526458<presentation><reflist><ref refid="DCE:5014B45C-8404-11D8-82A2-7B88E55A3BEC"/></reflist></presentation></Class><Diagram id="DCE:4E445586-50A4-11D7-807A-302CB4EF44FD"><name><val><![CDATA[Dependencies]]></val></name> 
    64536459<package><ref refid="DCE:349D1D20-50A4-11D7-807A-302CB4EF44FD"/></package> 
    6454 <canvas><extents><val>(46.0, 29.0, 914.49838187702267, 692.0)</val></extents> 
     6460<canvas><extents><val>(46.0, 29.0, 914.49838187702267, 688.0)</val></extents> 
    64556461<static_extents><val>0</val></static_extents> 
    64566462<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    65246530<orthogonal><val>0</val></orthogonal> 
    65256531<horizontal><val>1</val></horizontal> 
    6526 <points><val>[(-3.0000000000001137, -5.0000000000000142), (-3.0, 62.0)]</val></points> 
     6532<points><val>[(-3.0000000000000568, -5.0), (-3.0, 62.0)]</val></points> 
    65276533<head_connection><ref refid="DCE:FC28D722-65C5-11D7-89A9-9C62884CFFDE"/></head_connection> 
    65286534<tail_connection><ref refid="DCE:D7075AD6-65C5-11D7-89A9-9C62884CFFDE"/></tail_connection> 
    …… 
    68846890<orthogonal><val>0</val></orthogonal> 
    68856891<horizontal><val>1</val></horizontal> 
    6886 <points><val>[(27.0, 3.0000000000000568), (351.88000000000011, 2.0000000000000568)]</val></points> 
     6892<points><val>[(27.0, 3.0000000000000568), (351.87999999999988, 2.0)]</val></points> 
    68876893<head_connection><ref refid="DCE:403F722A-78D6-11D7-B68E-7835A4497977"/></head_connection> 
    68886894<tail_connection><ref refid="DCE:2CDCED42-78D6-11D7-B68E-7835A4497977"/></tail_connection> 
    …… 
    69066912</item></canvas></Diagram><Diagram id="DCE:D2653A36-464C-11D7-AA08-1B85D5275D8A"><name><val><![CDATA[Namespaces]]></val></name> 
    69076913<package><ref refid="DCE:E085A412-45CE-11D7-B5CA-613352B2821F"/></package> 
    6908 <canvas><extents><val>(89.666666666666629, 42.666666666666657, 1002.9999999999999, 1020.7841530054643)</val></extents> 
     6914<canvas><extents><val>(102.66666666666663, 42.666666666666657, 987.33333333333326, 1020.7841530054643)</val></extents> 
    69096915<static_extents><val>0</val></static_extents> 
    69106916<snap_to_grid><val>0</val></snap_to_grid> 
    …… 
    69926998<orthogonal><val>0</val></orthogonal> 
    69936999<horizontal><val>1</val></horizontal> 
    6994 <points><val>[(-44.000000000000057, 6.4068627450981239), (123.99999999999989, 5.3173333332924813)]</val></points> 
     7000<points><val>[(-44.0, 6.4068627450981239), (123.99999999999989, 5.3173333332924813)]</val></points> 
    69957001<head_connection><ref refid="DCE:6D97E670-464D-11D7-AA08-1B85D5275D8A"/></head_connection> 
    69967002<tail_connection><ref refid="DCE:7D74A628-464D-11D7-AA08-1B85D5275D8A"/></tail_connection> 
    …… 
    70947100<orthogonal><val>0</val></orthogonal> 
    70957101<horizontal><val>1</val></horizontal> 
    7096 <points><val>[(175.33333333333371, 105.33333333333337), (176.66666666666663, 213.33333333333337)]</val></points> 
     7102<points><val>[(175.33333333333371, 105.33333333333337), (176.66666666666674, 213.33333333333348)]</val></points> 
    70977103<head_connection><ref refid="DCE:A70E26A6-4695-11D7-B567-379CA7034986"/></head_connection> 
    70987104<tail_connection><ref refid="DCE:B4456442-4695-11D7-B567-379CA7034986"/></tail_connection> 
    …… 
    72167222<presentation><reflist><ref refid="DCE:FB5C328A-8405-11D8-82A2-7B88E55A3BEC"/></reflist></presentation></Class><LiteralString id="DCE:BB453F40-2E06-11D8-A169-52D559F3DAB9"></LiteralString><Property id="DCE:CB47A336-A417-11D8-B4C8-00061BC22919"><aggregation><val><![CDATA[composite]]></val></aggregation> 
    72177223<association><ref refid="DCE:CB4709B0-A417-11D8-B4C8-00061BC22919"/></association> 
     7224<class_><ref refid="DCE:AB14F544-4B3A-11D7-B391-02BBFE4396CE"/></class_> 
     7225<isDerived><val>0</val></isDerived> 
    72187226<lowerValue><ref refid="DCE:CB47C7D0-A417-11D8-B4C8-00061BC22919"/></lowerValue> 
    7219 <owningAssociation><ref refid="DCE:CB4709B0-A417-11D8-B4C8-00061BC22919"/></owningAssociation> 
    7220 <presentation><reflist></reflist></presentation><type><ref refid="DCE:3B6508EE-A35C-11D8-9D85-00C00C03A405"/></type> 
     7227<name><val><![CDATA[interface_]]></val></name> 
     7228<presentation><reflist></reflist></presentation><taggedValue><ref refid="DCE:7773E070-B469-11D8-BDF4-CAE8B7802210"/></taggedValue> 
     7229<type><ref refid="DCE:3B6508EE-A35C-11D8-9D85-00C00C03A405"/></type> 
     7230<upperValue><ref refid="DCE:776FBA22-B469-11D8-BDF4-CAE8B7802210"/></upperValue> 
    72217231</Property><Property id="DCE:F0547A32-8FD1-11D8-9422-00C00C03A405"><association><ref refid="DCE:F0533B36-8FD1-11D8-9422-00C00C03A405"/></association> 
    72227232