[Mobies-commit] [commit] r3592 - in UDM/trunk: etc include src/Uml
endre at redhat1.isis.vanderbilt.edu
endre at redhat1.isis.vanderbilt.edu
Tue Jan 4 14:06:55 CST 2011
Author: endre
Date: Tue Jan 4 14:06:55 2011
New Revision: 3592
Log:
Add a "rp_helper" association between AssociationRoles.
Source and destination roles of an association with an association class
may have now a "rp_helper" association role. This association is needed
to implement the new reference port methods in the DOM and MEM backends.
Modified:
UDM/trunk/etc/UmlInUml.xme
UDM/trunk/etc/Uml_udm.xml
UDM/trunk/include/Uml.h
UDM/trunk/src/Uml/Uml.cpp
UDM/trunk/src/Uml/Uml.h
UDM/trunk/src/Uml/Uml.xsd
UDM/trunk/src/Uml/Uml_xsd.h
Modified: UDM/trunk/etc/UmlInUml.xme
==============================================================================
--- UDM/trunk/etc/UmlInUml.xme Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/etc/UmlInUml.xme Tue Jan 4 14:06:55 2011 (r3592)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project SYSTEM "mga.dtd">
-<project guid="{830935A5-5866-4A3D-A9C8-4590DB5FFE5D}" cdate="Sat May 20 20:38:19 2006" mdate="Sat May 20 20:38:19 2006" version="" metaguid="{D8D4D1A7-F9C1-4B28-96A2-8A81DB4E2A79}" metaversion="" metaname="UML">
+<project guid="{41CEF817-7A0A-472B-A9C4-E56EC1B772A7}" cdate="Fri Dec 31 07:01:32 2010" mdate="Fri Dec 31 07:01:32 2010" version="" metaguid="{1913C77F-2986-4DA3-BD61-02F6C19FD44E}" metaversion="" metaname="UML">
<name>Uml</name>
<comment></comment>
<author></author>
- <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x3" kind="RootFolder">
+ <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x3" kind="RootFolder" guid="{7f959ba8-6f80-4e1c-bfc6-74576b7f2547}">
<name>Uml</name>
- <model id="id-0065-00000001" kind="Package" relid="0x3" childrelidcntr="0x3">
+ <model id="id-0065-00000001" kind="Package" guid="{c3e6b1ae-3675-4910-9564-1c8a75fa31d0}" relid="0x3" childrelidcntr="0x3">
<name>Uml</name>
<attribute kind="alias" status="meta">
<value></value>
@@ -15,7 +15,7 @@
<attribute kind="version">
<value>2.04</value>
</attribute>
- <model id="id-0065-00000002" kind="ClassDiagram" role="ClassDiagram" relid="0x3" childrelidcntr="0x2b">
+ <model id="id-0065-00000002" kind="ClassDiagram" role="ClassDiagram" guid="{eb67a7e5-3f0f-4337-90f8-efe15e0985b3}" relid="0x3" childrelidcntr="0x2c">
<name>Uml</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -26,7 +26,7 @@
</regnode>
</regnode>
</regnode>
- <atom id="id-0066-00000001" kind="Class" role="Class" relid="0x20">
+ <atom id="id-0066-00000001" kind="Class" role="Class" guid="{bc551a97-237e-4142-b61f-a0a6d91e85ce}" relid="0x20">
<name>ConstraintDefinition</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -57,7 +57,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000002" kind="Class" role="Class" relid="0x3">
+ <atom id="id-0066-00000002" kind="Class" role="Class" guid="{eb12c053-eb0e-4f13-aac5-e6c4725676f3}" relid="0x3">
<name>Attribute</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -92,7 +92,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000003" kind="Class" role="Class" relid="0xd">
+ <atom id="id-0066-00000003" kind="Class" role="Class" guid="{badf6e22-afb9-455a-9746-ddeb63d9ebc1}" relid="0xd">
<name>GenericRole</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -105,7 +105,7 @@
<regnode name="UML" isopaque="yes">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>423,82</value>
+ <value>413,70</value>
</regnode>
</regnode>
</regnode>
@@ -121,7 +121,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000004" kind="Inheritance" role="Inheritance" relid="0xe">
+ <atom id="id-0066-00000004" kind="Inheritance" role="Inheritance" guid="{04e05364-3861-488d-98f6-a0332275fed7}" relid="0xe">
<name>Inheritance</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -139,7 +139,7 @@
</regnode>
</regnode>
</atom>
- <atom id="id-0066-00000005" kind="Class" role="Class" relid="0x1e">
+ <atom id="id-0066-00000005" kind="Class" role="Class" guid="{b98ff5c4-624b-449e-ad42-562eb8723379}" relid="0x1e">
<name>Constraint</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -170,7 +170,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000006" kind="Class" role="Class" relid="0x2">
+ <atom id="id-0066-00000006" kind="Class" role="Class" guid="{f1d85302-fa3e-4f8e-a2d0-4c8a38b52776}" relid="0x2">
<name>Class</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -206,7 +206,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000007" kind="Class" role="Class" relid="0x1">
+ <atom id="id-0066-00000007" kind="Class" role="Class" guid="{dd994578-bf84-479e-8e80-8d7c40091179}" relid="0x1">
<name>Namespace</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -233,7 +233,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000008" kind="Class" role="Class" relid="0x7">
+ <atom id="id-0066-00000008" kind="Class" role="Class" guid="{d1fd515f-3cf4-4afd-b92a-bd29252bfd3b}" relid="0x7">
<name>Composition</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -265,7 +265,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000009" kind="Class" role="Class" relid="0x1a">
+ <atom id="id-0066-00000009" kind="Class" role="Class" guid="{cacc1371-4044-499e-b378-e3e9bf48ced6}" relid="0x1a">
<name>TaggedValue</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -294,7 +294,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-0000000a" kind="Class" role="Class" relid="0x16">
+ <atom id="id-0066-0000000a" kind="Class" role="Class" guid="{665af41a-5254-4621-a361-003bc723d928}" relid="0x16">
<name>Association</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -323,7 +323,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-0000000b" kind="Class" role="Class" relid="0x14">
+ <atom id="id-0066-0000000b" kind="Class" role="Class" guid="{c0816e29-37b7-4e4b-9eab-e988f482e6b3}" relid="0x14">
<name>AssociationRole</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -356,7 +356,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-0000000c" kind="Class" role="Class" relid="0x9">
+ <atom id="id-0066-0000000c" kind="Class" role="Class" guid="{1425dc32-1378-4e9a-b33d-d15eeda184fe}" relid="0x9">
<name>CompositionParentRole</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -386,7 +386,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-0000000d" kind="Class" role="Class" relid="0xa">
+ <atom id="id-0066-0000000d" kind="Class" role="Class" guid="{29a51304-ca0e-4324-9597-da9f83dce407}" relid="0xa">
<name>CompositionChildRole</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -419,7 +419,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-0000000e" kind="Class" role="Class" relid="0x26">
+ <atom id="id-0066-0000000e" kind="Class" role="Class" guid="{83fca712-3ac1-4103-a663-8a97ea994c73}" relid="0x26">
<name>Diagram</name>
<regnode name="PartRegs" isopaque="yes">
<value></value>
@@ -447,7 +447,7 @@
<value></value>
</attribute>
</atom>
- <connection id="id-0068-00000001" kind="Composition" role="Composition" relid="0x1c">
+ <connection id="id-0068-00000001" kind="Composition" role="Composition" guid="{fa0a12d7-e7c9-4295-88f8-1c1e70a9a636}" relid="0x1c">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -461,7 +461,7 @@
<connpoint role="src" target="id-0066-00000009"/>
<connpoint role="dst" target="id-0066-0000000a"/>
</connection>
- <connection id="id-0068-00000002" kind="Composition" role="Composition" relid="0x1d">
+ <connection id="id-0068-00000002" kind="Composition" role="Composition" guid="{5e1cd640-8d7a-43e9-b798-3f7b05e45dfa}" relid="0x1d">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -475,7 +475,7 @@
<connpoint role="dst" target="id-0066-00000007"/>
<connpoint role="src" target="id-0066-0000000a"/>
</connection>
- <connection id="id-0068-00000003" kind="Association" role="Association" relid="0x18">
+ <connection id="id-0068-00000003" kind="Association" role="Association" guid="{6e47c062-b500-4e97-bd3a-b194bcdae94e}" relid="0x18">
<name>Association</name>
<attribute kind="Stereotype" status="meta">
<value></value>
@@ -495,7 +495,7 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-0000000b"/>
</connection>
- <connection id="id-0068-00000004" kind="Association" role="Association" relid="0x13">
+ <connection id="id-0068-00000004" kind="Association" role="Association" guid="{d0e21d4d-b519-473c-a115-f2bea1e687d4}" relid="0x13">
<name>Association</name>
<attribute kind="Stereotype" status="meta">
<value></value>
@@ -515,7 +515,7 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-0000000d"/>
</connection>
- <connection id="id-0068-00000005" kind="Composition" role="Composition" relid="0x1b">
+ <connection id="id-0068-00000005" kind="Composition" role="Composition" guid="{10782b1d-9f0b-4832-8a59-7bfc65573d0a}" relid="0x1b">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -529,12 +529,12 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-00000009"/>
</connection>
- <connection id="id-0068-00000006" kind="Sub" role="Sub" relid="0x11">
+ <connection id="id-0068-00000006" kind="Sub" role="Sub" guid="{46ccbb62-9cf6-41b9-9902-52c72fab1685}" relid="0x11">
<name>Sub</name>
<connpoint role="src" target="id-0066-00000004"/>
<connpoint role="dst" target="id-0066-0000000c"/>
</connection>
- <connection id="id-0068-00000007" kind="Composition" role="Composition" relid="0x8">
+ <connection id="id-0068-00000007" kind="Composition" role="Composition" guid="{7964f09d-43fe-4068-bfe7-f797dea5050c}" relid="0x8">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -548,7 +548,7 @@
<connpoint role="dst" target="id-0066-00000007"/>
<connpoint role="src" target="id-0066-00000008"/>
</connection>
- <connection id="id-0068-00000008" kind="Composition" role="Composition" relid="0x1f">
+ <connection id="id-0068-00000008" kind="Composition" role="Composition" guid="{1aace374-7343-4af1-843c-9d7ef98e0fc6}" relid="0x1f">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -562,7 +562,7 @@
<connpoint role="src" target="id-0066-00000005"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-00000009" kind="Composition" role="Composition" relid="0x6">
+ <connection id="id-0068-00000009" kind="Composition" role="Composition" guid="{8257563b-d3b9-4cbb-a6f0-bc09e3526b1e}" relid="0x6">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -576,7 +576,7 @@
<connpoint role="src" target="id-0066-00000006"/>
<connpoint role="dst" target="id-0066-00000007"/>
</connection>
- <connection id="id-0068-0000000a" kind="Composition" role="Composition" relid="0x4">
+ <connection id="id-0068-0000000a" kind="Composition" role="Composition" guid="{74fb870a-ea17-48ef-af5e-c039f6f0e811}" relid="0x4">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -590,7 +590,7 @@
<connpoint role="src" target="id-0066-00000002"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-0000000b" kind="Association" role="Association" relid="0x5">
+ <connection id="id-0068-0000000b" kind="Association" role="Association" guid="{4e35dc35-a5b4-4df1-9287-1d00a97181ed}" relid="0x5">
<name>Association</name>
<attribute kind="Stereotype" status="meta">
<value></value>
@@ -610,7 +610,7 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-0000000c" kind="Association" role="Association" relid="0x12">
+ <connection id="id-0068-0000000c" kind="Association" role="Association" guid="{ae439006-9414-4d91-8487-6fbbbe86d11b}" relid="0x12">
<name>Association</name>
<attribute kind="Stereotype" status="meta">
<value></value>
@@ -630,7 +630,7 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-0000000c"/>
</connection>
- <connection id="id-0068-0000000d" kind="Composition" role="Composition" relid="0x17">
+ <connection id="id-0068-0000000d" kind="Composition" role="Composition" guid="{7f73c603-44cd-4422-a3eb-5e75158ee812}" relid="0x17">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -644,7 +644,7 @@
<connpoint role="dst" target="id-0066-0000000a"/>
<connpoint role="src" target="id-0066-0000000b"/>
</connection>
- <connection id="id-0068-0000000e" kind="Sub" role="Sub" relid="0x10">
+ <connection id="id-0068-0000000e" kind="Sub" role="Sub" guid="{c21384dc-2c30-420d-bbaf-1f227e8cfd4a}" relid="0x10">
<name>Sub</name>
<regnode name="autorouterPref" isopaque="yes">
<value>S</value>
@@ -652,7 +652,7 @@
<connpoint role="src" target="id-0066-00000004"/>
<connpoint role="dst" target="id-0066-0000000d"/>
</connection>
- <connection id="id-0068-0000000f" kind="Composition" role="Composition" relid="0xc">
+ <connection id="id-0068-0000000f" kind="Composition" role="Composition" guid="{9990a4d3-b32f-4ba2-99b4-1d4bf8d39326}" relid="0xc">
<name>Composition</name>
<regnode name="autorouterPref" isopaque="yes">
<value>Ne</value>
@@ -669,7 +669,7 @@
<connpoint role="dst" target="id-0066-00000008"/>
<connpoint role="src" target="id-0066-0000000d"/>
</connection>
- <connection id="id-0068-00000010" kind="Base" role="Base" relid="0xf">
+ <connection id="id-0068-00000010" kind="Base" role="Base" guid="{550bdb35-121c-4776-a8e5-fd1e9e0437ba}" relid="0xf">
<name>Base</name>
<regnode name="autorouterPref" isopaque="yes">
<value>S</value>
@@ -677,7 +677,7 @@
<connpoint role="src" target="id-0066-00000003"/>
<connpoint role="dst" target="id-0066-00000004"/>
</connection>
- <connection id="id-0068-00000011" kind="Composition" role="Composition" relid="0x21">
+ <connection id="id-0068-00000011" kind="Composition" role="Composition" guid="{a3efeb6f-6519-4912-854a-896f9c5193b0}" relid="0x21">
<name>Composition</name>
<regnode name="autorouterPref" isopaque="yes">
<value>Ns</value>
@@ -694,7 +694,7 @@
<connpoint role="src" target="id-0066-00000001"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-00000012" kind="Sub" role="Sub" relid="0x15">
+ <connection id="id-0068-00000012" kind="Sub" role="Sub" guid="{1d9413f4-2703-4c36-a804-80a433b6436a}" relid="0x15">
<name>Sub</name>
<regnode name="autorouterPref" isopaque="yes">
<value>Sn</value>
@@ -702,7 +702,7 @@
<connpoint role="src" target="id-0066-00000004"/>
<connpoint role="dst" target="id-0066-0000000b"/>
</connection>
- <connection id="id-0068-00000013" kind="Association" role="Association" relid="0x19">
+ <connection id="id-0068-00000013" kind="Association" role="Association" guid="{289215c8-6f9f-45c4-be84-30fd4ea862c8}" relid="0x19">
<name>Association</name>
<attribute kind="Stereotype" status="meta">
<value></value>
@@ -722,7 +722,7 @@
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0066-0000000a"/>
</connection>
- <connection id="id-0068-00000014" kind="Composition" role="Composition" relid="0xb">
+ <connection id="id-0068-00000014" kind="Composition" role="Composition" guid="{de68f13c-58a7-4804-96bf-39f5d78678ed}" relid="0xb">
<name>Composition</name>
<attribute kind="Cardinality">
<value>1</value>
@@ -736,7 +736,7 @@
<connpoint role="dst" target="id-0066-00000008"/>
<connpoint role="src" target="id-0066-0000000c"/>
</connection>
- <connection id="id-0068-00000015" kind="Composition" role="Composition" relid="0x27">
+ <connection id="id-0068-00000015" kind="Composition" role="Composition" guid="{6491afcb-fcda-47a6-92a8-b5009df85eca}" relid="0x27">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -750,7 +750,7 @@
<connpoint role="src" target="id-0066-00000007"/>
<connpoint role="dst" target="id-0066-0000000e"/>
</connection>
- <connection id="id-0068-00000016" kind="Composition" role="Composition" relid="0x28">
+ <connection id="id-0068-00000016" kind="Composition" role="Composition" guid="{3a6a3d78-ceb4-43b5-af32-29d9db97c8e7}" relid="0x28">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -764,7 +764,7 @@
<connpoint role="src" target="id-0066-00000008"/>
<connpoint role="dst" target="id-0066-0000000e"/>
</connection>
- <connection id="id-0068-00000017" kind="Composition" role="Composition" relid="0x29">
+ <connection id="id-0068-00000017" kind="Composition" role="Composition" guid="{d79e5023-bc59-44ba-915f-a9fb047075ad}" relid="0x29">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -778,7 +778,7 @@
<connpoint role="src" target="id-0066-0000000a"/>
<connpoint role="dst" target="id-0066-0000000e"/>
</connection>
- <connection id="id-0068-00000018" kind="Composition" role="Composition" relid="0x2a">
+ <connection id="id-0068-00000018" kind="Composition" role="Composition" guid="{3efda53e-8db0-4647-bb1b-e83e674d2be7}" relid="0x2a">
<name>Composition</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -792,7 +792,7 @@
<connpoint role="src" target="id-0066-00000006"/>
<connpoint role="dst" target="id-0066-0000000e"/>
</connection>
- <connection id="id-0068-00000019" kind="Composition" role="Composition" relid="0x2b">
+ <connection id="id-0068-00000019" kind="Composition" role="Composition" guid="{74a3299d-f56d-4a6a-ba73-2d24f4b9647a}" relid="0x2b">
<name>Composition</name>
<regnode name="autorouterPref" isopaque="yes">
<value>Nw</value>
@@ -809,6 +809,26 @@
<connpoint role="src" target="id-0066-00000007"/>
<connpoint role="dst" target="id-0066-00000007"/>
</connection>
+ <connection id="id-0068-0000001b" kind="Association" role="Association" guid="{bb2eea40-93cc-4f72-95dc-1d29f4336237}" relid="0x2c">
+ <name>Association</name>
+ <attribute kind="Stereotype" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="dstCardinality">
+ <value>0..1</value>
+ </attribute>
+ <attribute kind="dstRolename">
+ <value>rp_helper</value>
+ </attribute>
+ <attribute kind="srcCardinality">
+ <value>0..1</value>
+ </attribute>
+ <attribute kind="srcRolename">
+ <value>rp_helper_user</value>
+ </attribute>
+ <connpoint role="src" target="id-0066-0000000b"/>
+ <connpoint role="dst" target="id-0066-0000000b"/>
+ </connection>
</model>
</model>
</folder>
Modified: UDM/trunk/etc/Uml_udm.xml
==============================================================================
--- UDM/trunk/etc/Uml_udm.xml Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/etc/Uml_udm.xml Tue Jan 4 14:06:55 2011 (r3592)
@@ -1,150 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Diagram name="Uml" version="2.04" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="Uml.xsd">
- <Association name="Association" nonpersistent="false">
- <AssociationRole _id="id30" max="-1" min="0" name="childRoles" target="id3" isPrimary="false" isNavigable="true"/>
- <AssociationRole _id="id31" max="1" min="1" name="target" target="id7" isPrimary="false" isNavigable="true"/>
- </Association>
- <Association name="Association" nonpersistent="false">
- <AssociationRole _id="id32" max="-1" min="0" name="parentRoles" target="id5" isPrimary="false" isNavigable="true"/>
- <AssociationRole _id="id33" max="1" min="1" name="target" target="id7" isPrimary="false" isNavigable="true"/>
- </Association>
- <Association name="Association" nonpersistent="false">
- <AssociationRole _id="id34" max="-1" min="0" name="associationRoles" target="id6" isPrimary="false" isNavigable="true"/>
- <AssociationRole _id="id35" max="1" min="1" name="target" target="id7" isPrimary="false" isNavigable="true"/>
- </Association>
- <Association name="Association" nonpersistent="false">
- <AssociationRole _id="id36" max="1" min="0" name="association" target="idb" isPrimary="false" isNavigable="true"/>
- <AssociationRole _id="id37" max="1" min="0" name="assocClass" target="id7" isPrimary="false" isNavigable="true"/>
- </Association>
- <Association name="Association" nonpersistent="false">
- <AssociationRole _id="id38" max="-1" min="0" name="subTypes" target="id7" isPrimary="false" isNavigable="true"/>
- <AssociationRole _id="id39" max="-1" min="0" name="baseTypes" target="id7" isPrimary="false" isNavigable="true"/>
- </Association>
- <Class _id="id9" name="Diagram" isAbstract="false" parentRoles="ida idd id10 id13">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="version" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id3" name="CompositionChildRole" baseTypes="id4" childRoles="id1b" isAbstract="false" associationRoles="id30">
- <Attribute max="1" min="1" name="min" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="max" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id5" name="CompositionParentRole" baseTypes="id4" childRoles="id19" isAbstract="false" associationRoles="id32"/>
- <Class _id="id6" name="AssociationRole" baseTypes="id4" childRoles="id14" isAbstract="false" associationRoles="id34">
- <Attribute max="1" min="1" name="min" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="max" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="isPrimary" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="idb" name="Association" childRoles="idc id23" isAbstract="false" parentRoles="id15 id18" associationRoles="id36">
- <Attribute max="1" min="0" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="nonpersistent" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id16" name="TaggedValue" childRoles="id17 id2e" isAbstract="false">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="value" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="ide" name="Composition" childRoles="idf id21" isAbstract="false" parentRoles="id1a id1c">
- <Attribute max="1" min="0" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="nonpersistent" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id11" name="Namespace" childRoles="id12 id1d" isAbstract="false" parentRoles="id1e id20 id22 id24">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id7" name="Class" childRoles="id8 id1f" isAbstract="false" parentRoles="id27 id2a id2d id2f" associationRoles="id31 id33 id35 id37 id38 id39">
- <Attribute max="1" min="0" name="stereotype" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="isAbstract" type="Boolean" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="from" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id2b" name="Constraint" childRoles="id2c" isAbstract="false">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="description" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="expression" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id4" name="GenericRole" subTypes="id3 id5 id6" isAbstract="true">
- <Attribute max="1" min="0" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="isNavigable" type="Boolean" ordered="false" defvalue="true;" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id28" name="Attribute" childRoles="id29" isAbstract="false">
- <Attribute max="1" min="1" name="type" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="-1" min="0" name="defvalue" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="min" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="max" type="Integer" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="visibility" type="String" ordered="false" defvalue="public;" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="ordered" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="nonpersistent" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="registry" type="Boolean" ordered="false" defvalue="false;" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Class _id="id25" name="ConstraintDefinition" childRoles="id26" isAbstract="false">
- <Attribute max="1" min="1" name="name" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="stereotype" type="String" ordered="false" defvalue="method;" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="0" name="parameterList" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="expression" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- <Attribute max="1" min="1" name="returnType" type="String" ordered="false" registry="false" visibility="public" nonpersistent="false"/>
- </Class>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id8" max="-1" min="0" name="classes" target="id7" isNavigable="true"/>
- <CompositionParentRole _id="ida" name="parent" target="id9" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="idc" max="-1" min="0" name="associations" target="idb" isNavigable="true"/>
- <CompositionParentRole _id="idd" name="parent" target="id9" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="idf" max="-1" min="0" name="compositions" target="ide" isNavigable="true"/>
- <CompositionParentRole _id="id10" name="parent" target="id9" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id12" max="-1" min="0" name="namespaces" target="id11" isNavigable="true"/>
- <CompositionParentRole _id="id13" name="parent" target="id9" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id14" max="-1" min="0" name="roles" target="id6" isNavigable="true"/>
- <CompositionParentRole _id="id15" name="parent" target="idb" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id17" max="-1" min="0" name="tagValues" target="id16" isNavigable="true"/>
- <CompositionParentRole _id="id18" name="assocParent" target="idb" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id19" max="1" min="1" name="parentRole" target="id5" isNavigable="true"/>
- <CompositionParentRole _id="id1a" name="parent" target="ide" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id1b" max="1" min="1" name="childRole" target="id3" isNavigable="true"/>
- <CompositionParentRole _id="id1c" name="parent" target="ide" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id1d" max="-1" min="0" name="namespaces" target="id11" isNavigable="true"/>
- <CompositionParentRole _id="id1e" name="parent_ns" target="id11" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id1f" max="-1" min="0" name="classes" target="id7" isNavigable="true"/>
- <CompositionParentRole _id="id20" name="parent_ns" target="id11" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id21" max="-1" min="0" name="compositions" target="ide" isNavigable="true"/>
- <CompositionParentRole _id="id22" name="parent_ns" target="id11" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id23" max="-1" min="0" name="associations" target="idb" isNavigable="true"/>
- <CompositionParentRole _id="id24" name="parent_ns" target="id11" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id26" max="-1" min="0" name="definitions" target="id25" isNavigable="true"/>
- <CompositionParentRole _id="id27" name="parent" target="id7" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id29" max="-1" min="0" name="attributes" target="id28" isNavigable="true"/>
- <CompositionParentRole _id="id2a" name="parent" target="id7" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id2c" max="-1" min="0" name="constraints" target="id2b" isNavigable="true"/>
- <CompositionParentRole _id="id2d" name="parent" target="id7" isNavigable="true"/>
- </Composition>
- <Composition name="Composition" nonpersistent="false">
- <CompositionChildRole _id="id2e" max="-1" min="0" name="tagValues" target="id16" isNavigable="true"/>
- <CompositionParentRole _id="id2f" name="classParent" target="id7" isNavigable="true"/>
- </Composition>
-</Diagram>
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id30" isNavigable="true" isPrimary="false" max="-1" min="0" name="childRoles" target="id3"/>
+ <AssociationRole _id="id31" isNavigable="true" isPrimary="false" max="1" min="1" name="target" target="id7"/>
+ </Association>
+
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id32" isNavigable="true" isPrimary="false" max="-1" min="0" name="parentRoles" target="id5"/>
+ <AssociationRole _id="id33" isNavigable="true" isPrimary="false" max="1" min="1" name="target" target="id7"/>
+ </Association>
+
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id34" isNavigable="true" isPrimary="false" max="1" min="0" name="rp_helper_user" target="id6"/>
+ <AssociationRole _id="id35" isNavigable="true" isPrimary="false" max="1" min="0" name="rp_helper" target="id6"/>
+ </Association>
+
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id36" isNavigable="true" isPrimary="false" max="-1" min="0" name="associationRoles" target="id6"/>
+ <AssociationRole _id="id37" isNavigable="true" isPrimary="false" max="1" min="1" name="target" target="id7"/>
+ </Association>
+
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id38" isNavigable="true" isPrimary="false" max="1" min="0" name="association" target="idB"/>
+ <AssociationRole _id="id39" isNavigable="true" isPrimary="false" max="1" min="0" name="assocClass" target="id7"/>
+ </Association>
+
+ <Association name="Association" nonpersistent="false">
+ <AssociationRole _id="id3A" isNavigable="true" isPrimary="false" max="-1" min="0" name="subTypes" target="id7"/>
+ <AssociationRole _id="id3B" isNavigable="true" isPrimary="false" max="-1" min="0" name="baseTypes" target="id7"/>
+ </Association>
+
+ <Class _id="id9" isAbstract="false" name="Diagram" parentRoles="idA idD id10 id13">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="version" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id3" associationRoles="id30" baseTypes="id4" childRoles="id1B" isAbstract="false" name="CompositionChildRole">
+ <Attribute max="1" min="1" name="min" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ <Attribute max="1" min="1" name="max" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ </Class>
+
+ <Class _id="id5" associationRoles="id32" baseTypes="id4" childRoles="id19" isAbstract="false" name="CompositionParentRole"/>
+
+ <Class _id="id6" associationRoles="id34 id35 id36" baseTypes="id4" childRoles="id14" isAbstract="false" name="AssociationRole">
+ <Attribute max="1" min="1" name="min" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ <Attribute max="1" min="1" name="max" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="isPrimary" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ </Class>
+
+ <Class _id="idB" associationRoles="id38" childRoles="idC id23" isAbstract="false" name="Association" parentRoles="id15 id18">
+ <Attribute max="1" min="0" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="nonpersistent" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ </Class>
+
+ <Class _id="id16" childRoles="id17 id2e" isAbstract="false" name="TaggedValue">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="value" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="ide" childRoles="idF id21" isAbstract="false" name="Composition" parentRoles="id1A id1C">
+ <Attribute max="1" min="0" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="nonpersistent" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ </Class>
+
+ <Class _id="id11" childRoles="id12 id1D" isAbstract="false" name="Namespace" parentRoles="id1e id20 id22 id24">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id7" associationRoles="id31 id33 id37 id39 id3A id3B" childRoles="id8 id1F" isAbstract="false" name="Class" parentRoles="id27 id2A id2D id2F">
+ <Attribute max="1" min="0" name="stereotype" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="isAbstract" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="from" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id2B" childRoles="id2C" isAbstract="false" name="Constraint">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="description" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="expression" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Class _id="id4" isAbstract="true" name="GenericRole" subTypes="id3 id5 id6">
+ <Attribute max="1" min="0" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute defvalue="true;" max="1" min="0" name="isNavigable" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ </Class>
+
+ <Class _id="id28" childRoles="id29" isAbstract="false" name="Attribute">
+ <Attribute max="1" min="1" name="type" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="-1" min="0" name="defvalue" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="min" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ <Attribute max="1" min="1" name="max" nonpersistent="false" ordered="false" registry="false" type="Integer" visibility="public"/>
+ <Attribute defvalue="public;" max="1" min="0" name="visibility" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="ordered" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="nonpersistent" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ <Attribute defvalue="false;" max="1" min="0" name="registry" nonpersistent="false" ordered="false" registry="false" type="Boolean" visibility="public"/>
+ </Class>
+ <Class _id="id25" childRoles="id26" isAbstract="false" name="ConstraintDefinition">
+ <Attribute max="1" min="1" name="name" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute defvalue="method;" max="1" min="1" name="stereotype" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="0" name="parameterList" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="expression" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ <Attribute max="1" min="1" name="returnType" nonpersistent="false" ordered="false" registry="false" type="String" visibility="public"/>
+ </Class>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id8" isNavigable="true" max="-1" min="0" name="classes" target="id7"/>
+ <CompositionParentRole _id="idA" isNavigable="true" name="parent" target="id9"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="idC" isNavigable="true" max="-1" min="0" name="associations" target="idB"/>
+ <CompositionParentRole _id="idD" isNavigable="true" name="parent" target="id9"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="idF" isNavigable="true" max="-1" min="0" name="compositions" target="ide"/>
+ <CompositionParentRole _id="id10" isNavigable="true" name="parent" target="id9"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id12" isNavigable="true" max="-1" min="0" name="namespaces" target="id11"/>
+ <CompositionParentRole _id="id13" isNavigable="true" name="parent" target="id9"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id14" isNavigable="true" max="-1" min="0" name="roles" target="id6"/>
+ <CompositionParentRole _id="id15" isNavigable="true" name="parent" target="idB"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id17" isNavigable="true" max="-1" min="0" name="tagValues" target="id16"/>
+ <CompositionParentRole _id="id18" isNavigable="true" name="assocParent" target="idB"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id19" isNavigable="true" max="1" min="1" name="parentRole" target="id5"/>
+ <CompositionParentRole _id="id1A" isNavigable="true" name="parent" target="ide"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id1B" isNavigable="true" max="1" min="1" name="childRole" target="id3"/>
+ <CompositionParentRole _id="id1C" isNavigable="true" name="parent" target="ide"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id1D" isNavigable="true" max="-1" min="0" name="namespaces" target="id11"/>
+ <CompositionParentRole _id="id1e" isNavigable="true" name="parent_ns" target="id11"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id1F" isNavigable="true" max="-1" min="0" name="classes" target="id7"/>
+ <CompositionParentRole _id="id20" isNavigable="true" name="parent_ns" target="id11"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id21" isNavigable="true" max="-1" min="0" name="compositions" target="ide"/>
+ <CompositionParentRole _id="id22" isNavigable="true" name="parent_ns" target="id11"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id23" isNavigable="true" max="-1" min="0" name="associations" target="idB"/>
+ <CompositionParentRole _id="id24" isNavigable="true" name="parent_ns" target="id11"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id26" isNavigable="true" max="-1" min="0" name="definitions" target="id25"/>
+ <CompositionParentRole _id="id27" isNavigable="true" name="parent" target="id7"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id29" isNavigable="true" max="-1" min="0" name="attributes" target="id28"/>
+ <CompositionParentRole _id="id2A" isNavigable="true" name="parent" target="id7"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id2C" isNavigable="true" max="-1" min="0" name="constraints" target="id2B"/>
+ <CompositionParentRole _id="id2D" isNavigable="true" name="parent" target="id7"/>
+ </Composition>
+
+ <Composition name="Composition" nonpersistent="false">
+ <CompositionChildRole _id="id2e" isNavigable="true" max="-1" min="0" name="tagValues" target="id16"/>
+ <CompositionParentRole _id="id2F" isNavigable="true" name="classParent" target="id7"/>
+ </Composition>
+
+</Diagram>
Modified: UDM/trunk/include/Uml.h
==============================================================================
--- UDM/trunk/include/Uml.h Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/include/Uml.h Tue Jan 4 14:06:55 2011 (r3592)
@@ -2,18 +2,21 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.24 on Wed Jan 20 14:11:09 2010
+// generated with Udm version 3.27 on Fri Dec 31 08:14:18 2010
#include <UdmBase.h>
#if !defined(UDM_VERSION_MAJOR) || !defined(UDM_VERSION_MINOR)
# error "Udm headers too old, they do not define UDM_VERSION"
#elif UDM_VERSION_MAJOR < 3
-# error "Udm headers too old, minimum version required 3.0"
-#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 0
-# error "Udm headers too old, minimum version required 3.0"
+# error "Udm headers too old, minimum version required 3.27"
+#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 27
+# error "Udm headers too old, minimum version required 3.27"
#endif
+#include <Uml.h>
+
+
#ifdef min
#undef min
#endif
@@ -28,18 +31,18 @@
extern ::Uml::Diagram meta;
class UDM_DLL CompositionChildRole;
- class UDM_DLL Diagram;
+ class UDM_DLL GenericRole;
class UDM_DLL CompositionParentRole;
class UDM_DLL AssociationRole;
+ class UDM_DLL Class;
+ class UDM_DLL Diagram;
class UDM_DLL Association;
- class UDM_DLL TaggedValue;
class UDM_DLL Composition;
class UDM_DLL Namespace;
- class UDM_DLL Class;
- class UDM_DLL Constraint;
- class UDM_DLL GenericRole;
- class UDM_DLL Attribute;
+ class UDM_DLL TaggedValue;
class UDM_DLL ConstraintDefinition;
+ class UDM_DLL Attribute;
+ class UDM_DLL Constraint;
UDM_DLL void Initialize();
@@ -160,6 +163,8 @@
Udm::IntegerAttr max() const { return Udm::IntegerAttr(impl, meta_max); }
Udm::IntegerAttr min() const { return Udm::IntegerAttr(impl, meta_min); }
Udm::BooleanAttr isPrimary() const { return Udm::BooleanAttr(impl, meta_isPrimary); }
+ Udm::PointerAttr< AssociationRole> rp_helper() const { return Udm::PointerAttr< AssociationRole>(impl, meta_rp_helper); }
+ Udm::PointerAttr< AssociationRole> rp_helper_user() const { return Udm::PointerAttr< AssociationRole>(impl, meta_rp_helper_user); }
Udm::PointerAttr< Class> target() const { return Udm::PointerAttr< Class>(impl, meta_target); }
Udm::ParentAttr< ::Uml::Association> parent() const { return Udm::ParentAttr< ::Uml::Association>(impl, meta_parent); }
@@ -167,6 +172,8 @@
static ::Uml::Attribute meta_max;
static ::Uml::Attribute meta_min;
static ::Uml::Attribute meta_isPrimary;
+ static ::Uml::AssociationRole meta_rp_helper;
+ static ::Uml::AssociationRole meta_rp_helper_user;
static ::Uml::AssociationRole meta_target;
static ::Uml::CompositionParentRole meta_parent;
Modified: UDM/trunk/src/Uml/Uml.cpp
==============================================================================
--- UDM/trunk/src/Uml/Uml.cpp Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/src/Uml/Uml.cpp Tue Jan 4 14:06:55 2011 (r3592)
@@ -1,6 +1,6 @@
// cpp (meta datanetwork format) source file Uml.cpp
// generated from diagram Uml
-// generated on Wed Jan 20 14:11:09 2010
+// generated on Fri Dec 31 08:14:18 2010
#include "Uml.h"
#include <UmlExt.h>
@@ -29,6 +29,8 @@
::Uml::Attribute AssociationRole::meta_max;
::Uml::Attribute AssociationRole::meta_min;
::Uml::Attribute AssociationRole::meta_isPrimary;
+ ::Uml::AssociationRole AssociationRole::meta_rp_helper;
+ ::Uml::AssociationRole AssociationRole::meta_rp_helper_user;
::Uml::AssociationRole AssociationRole::meta_target;
::Uml::CompositionParentRole AssociationRole::meta_parent;
@@ -187,6 +189,8 @@
Class::meta_childRoles = ::Uml::CreateAssociationRole();
CompositionParentRole::meta_target = ::Uml::CreateAssociationRole();
Class::meta_parentRoles = ::Uml::CreateAssociationRole();
+ AssociationRole::meta_rp_helper = ::Uml::CreateAssociationRole();
+ AssociationRole::meta_rp_helper_user = ::Uml::CreateAssociationRole();
AssociationRole::meta_target = ::Uml::CreateAssociationRole();
Class::meta_associationRoles = ::Uml::CreateAssociationRole();
Association::meta_assocClass = ::Uml::CreateAssociationRole();
@@ -337,6 +341,13 @@
{
::Uml::Association ass = ::Uml::CreateAssociation();
::Uml::InitAssociation(ass, meta, "Association");
+ ::Uml::InitAssociationRole(AssociationRole::meta_rp_helper, ass, "rp_helper", true, false, 0, 1, AssociationRole::meta);
+ ::Uml::InitAssociationRole(AssociationRole::meta_rp_helper_user, ass, "rp_helper_user", true, false, 0, 1, AssociationRole::meta);
+
+ }
+ {
+ ::Uml::Association ass = ::Uml::CreateAssociation();
+ ::Uml::InitAssociation(ass, meta, "Association");
::Uml::InitAssociationRole(AssociationRole::meta_target, ass, "target", true, false, 1, 1, Class::meta);
::Uml::InitAssociationRole(Class::meta_associationRoles, ass, "associationRoles", true, false, 0, -1, AssociationRole::meta);
@@ -495,10 +506,6 @@
InitMetaLinks();
::Uml::InitDiagram(meta, "Uml", "2.04");
- UdmStatic::StaticDataNetwork* dn = new UdmStatic::StaticDataNetwork(diagram, 0);
- dn->rootobject = meta;
- dn->systemname = "Uml";
- dn->sem = Udm::CHANGES_LOST_DEFAULT;
_SetXsdStorage();
Modified: UDM/trunk/src/Uml/Uml.h
==============================================================================
--- UDM/trunk/src/Uml/Uml.h Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/src/Uml/Uml.h Tue Jan 4 14:06:55 2011 (r3592)
@@ -2,18 +2,21 @@
#define MOBIES_UML_H
// header file Uml.h generated from diagram Uml
-// generated with Udm version 3.24 on Wed Jan 20 14:11:09 2010
+// generated with Udm version 3.27 on Fri Dec 31 08:14:18 2010
#include <UdmBase.h>
#if !defined(UDM_VERSION_MAJOR) || !defined(UDM_VERSION_MINOR)
# error "Udm headers too old, they do not define UDM_VERSION"
#elif UDM_VERSION_MAJOR < 3
-# error "Udm headers too old, minimum version required 3.0"
-#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 0
-# error "Udm headers too old, minimum version required 3.0"
+# error "Udm headers too old, minimum version required 3.27"
+#elif UDM_VERSION_MAJOR == 3 && UDM_VERSION_MINOR < 27
+# error "Udm headers too old, minimum version required 3.27"
#endif
+#include <Uml.h>
+
+
#ifdef min
#undef min
#endif
@@ -160,6 +163,8 @@
Udm::IntegerAttr max() const { return Udm::IntegerAttr(impl, meta_max); }
Udm::IntegerAttr min() const { return Udm::IntegerAttr(impl, meta_min); }
Udm::BooleanAttr isPrimary() const { return Udm::BooleanAttr(impl, meta_isPrimary); }
+ Udm::PointerAttr< AssociationRole> rp_helper() const { return Udm::PointerAttr< AssociationRole>(impl, meta_rp_helper); }
+ Udm::PointerAttr< AssociationRole> rp_helper_user() const { return Udm::PointerAttr< AssociationRole>(impl, meta_rp_helper_user); }
Udm::PointerAttr< Class> target() const { return Udm::PointerAttr< Class>(impl, meta_target); }
Udm::ParentAttr< ::Uml::Association> parent() const { return Udm::ParentAttr< ::Uml::Association>(impl, meta_parent); }
@@ -167,6 +172,8 @@
static ::Uml::Attribute meta_max;
static ::Uml::Attribute meta_min;
static ::Uml::Attribute meta_isPrimary;
+ static ::Uml::AssociationRole meta_rp_helper;
+ static ::Uml::AssociationRole meta_rp_helper_user;
static ::Uml::AssociationRole meta_target;
static ::Uml::CompositionParentRole meta_parent;
Modified: UDM/trunk/src/Uml/Uml.xsd
==============================================================================
--- UDM/trunk/src/Uml/Uml.xsd Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/src/Uml/Uml.xsd Tue Jan 4 14:06:55 2011 (r3592)
@@ -3,7 +3,7 @@
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
>
-<!-- generated on Wed Jan 20 14:11:09 2010 -->
+<!-- generated on Fri Dec 31 08:14:17 2010 -->
<xsd:complexType name="CompositionChildRoleType">
@@ -40,6 +40,8 @@
<xsd:attribute name="max" type="xsd:long" use="required"/>
<xsd:attribute name="min" type="xsd:long" use="required"/>
<xsd:attribute name="isPrimary" type="xsd:boolean" default="false"/>
+ <xsd:attribute name="rp_helper_user" type="xsd:IDREF"/>
+ <xsd:attribute name="rp_helper" type="xsd:IDREF"/>
<xsd:attribute name="target" type="xsd:IDREF" use="required"/>
<xsd:attribute name="_id" type="xsd:ID"/>
<xsd:attribute name="_archetype" type="xsd:IDREF"/>
Modified: UDM/trunk/src/Uml/Uml_xsd.h
==============================================================================
--- UDM/trunk/src/Uml/Uml_xsd.h Fri Dec 31 12:13:58 2010 (r3591)
+++ UDM/trunk/src/Uml/Uml_xsd.h Tue Jan 4 14:06:55 2011 (r3592)
@@ -15,7 +15,7 @@
str +="<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n";
str +=" elementFormDefault=\"qualified\" \n";
str +=">\n";
- str +="<!-- generated on Wed Jan 20 14:11:09 2010 -->\n";
+// str +="<!-- generated on Fri Dec 31 08:14:17 2010 -->\n";
str +="\n";
str +="\n";
str +=" <xsd:complexType name=\"CompositionChildRoleType\">\n";
@@ -52,6 +52,8 @@
str +=" <xsd:attribute name=\"max\" type=\"xsd:long\" use=\"required\"/>\n";
str +=" <xsd:attribute name=\"min\" type=\"xsd:long\" use=\"required\"/>\n";
str +=" <xsd:attribute name=\"isPrimary\" type=\"xsd:boolean\" default=\"false\"/>\n";
+ str +=" <xsd:attribute name=\"rp_helper_user\" type=\"xsd:IDREF\"/>\n";
+ str +=" <xsd:attribute name=\"rp_helper\" type=\"xsd:IDREF\"/>\n";
str +=" <xsd:attribute name=\"target\" type=\"xsd:IDREF\" use=\"required\"/>\n";
str +=" <xsd:attribute name=\"_id\" type=\"xsd:ID\"/>\n";
str +=" <xsd:attribute name=\"_archetype\" type=\"xsd:IDREF\"/>\n";
More information about the Mobies-commit
mailing list