[Mobies-commit] [commit] r4042 - in UDM/trunk: src/UdmGme src/UdmUtil tests/test_ns2
ksmyth at redhat1.isis.vanderbilt.edu
ksmyth at redhat1.isis.vanderbilt.edu
Tue Apr 24 16:11:30 CDT 2012
Author: ksmyth
Date: Tue Apr 24 16:11:30 2012
New Revision: 4042
Log:
Fix bug where CompositionRole in Namespace isnt matched to GME role in CreateChild or GetChildren(CCR)
Modified:
UDM/trunk/src/UdmGme/UdmGme.cpp
UDM/trunk/src/UdmUtil/UdmUtil.cpp
UDM/trunk/tests/test_ns2/CHost.xme
UDM/trunk/tests/test_ns2/CHost_uml.xme
UDM/trunk/tests/test_ns2/main.cpp
Modified: UDM/trunk/src/UdmGme/UdmGme.cpp
==============================================================================
--- UDM/trunk/src/UdmGme/UdmGme.cpp Tue Apr 24 16:11:11 2012 (r4041)
+++ UDM/trunk/src/UdmGme/UdmGme.cpp Tue Apr 24 16:11:30 2012 (r4042)
@@ -1974,8 +1974,19 @@
{
//the CompositionRole of the contained FCO
string MetaRole((const char *)MGACOLL_ITER->MetaRole->Name);
+ string roleWithNamespaces = (string)role.name();
+ if (roleWithNamespaces.length() != 0)
+ {
+ Uml::Namespace ns = static_cast<Uml::Class>(role.target()).parent_ns();
+ while (ns)
+ {
+ roleWithNamespaces = static_cast<std::string>(ns.name()) + "::" + roleWithNamespaces;
+ ns = ns.parent_ns();
+ }
+ }
+
- if (MetaRole != (string)role.name())//most common case
+ if (MetaRole != roleWithNamespaces)//most common case
{
//get the possible MetaRoles for containment via this role
set<string> MetaRoleFilter = ((GmeDataNetwork*)mydn)->GetMetaRoleFilter(role);
@@ -2226,19 +2237,29 @@
//MakeShortRolename is not good - when ccr has no name, and it points towards an abstract base class,
//the returned string will be the name of the abstract base class, but it should be
- string rn = ccr.name();
- if (rn.empty())
+ string roleWithNamespaces = ccr.name();
+ if (roleWithNamespaces.empty())
{
string kn = PATHGET(kind);
rr = mmodel->RoleByName[SmartBSTR(kn.c_str())];
}
else
{
+ if (roleWithNamespaces.length() != 0)
+ {
+ Uml::Namespace ns = static_cast<Uml::Class>(ccr.target()).parent_ns();
+ while (ns)
+ {
+ roleWithNamespaces = static_cast<std::string>(ns.name()) + "::" + roleWithNamespaces;
+ ns = ns.parent_ns();
+ }
+ }
+
IMgaMetaRolesPtr rrs;
rrs = mmodel->Roles;
MGACOLL_ITERATE(IMgaMetaRole, rrs)
{
- if (rn == ToUdmRoleName(MGACOLL_ITER, ccr)) {
+ if (roleWithNamespaces == static_cast<const char*>(MGACOLL_ITER->GetName())) {
rr = MGACOLL_ITER;
break;
}
Modified: UDM/trunk/src/UdmUtil/UdmUtil.cpp
==============================================================================
--- UDM/trunk/src/UdmUtil/UdmUtil.cpp Tue Apr 24 16:11:11 2012 (r4041)
+++ UDM/trunk/src/UdmUtil/UdmUtil.cpp Tue Apr 24 16:11:30 2012 (r4042)
@@ -369,7 +369,7 @@
if(p_dstChild==&Udm::_null) // The object has not been created yet
{
- //getArhcetype() clone()-s it first
+ //getArchetype() clone()-s it first
ObjectImpl * p_srcChildArc = p_srcChild->getArchetype();
//destination archetype (-to be-) variable
ObjectImpl * p_dstChildArc= &Udm::_null;
@@ -500,7 +500,7 @@
//which where created by createChild() call
//attributes must be copied.
- //getArhcetype() clone()-s it first
+ //getArchetype() clone()-s it first
ObjectImpl * p_srcChildArc = p_srcChild->getArchetype();
if ( p_srcChildArc && (p_srcChildArc != &Udm::_null))
{
Modified: UDM/trunk/tests/test_ns2/CHost.xme
==============================================================================
--- UDM/trunk/tests/test_ns2/CHost.xme Tue Apr 24 16:11:11 2012 (r4041)
+++ UDM/trunk/tests/test_ns2/CHost.xme Tue Apr 24 16:11:30 2012 (r4042)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project SYSTEM "mga.dtd">
-<project guid="{2851A031-DE90-477D-8E8D-DCACD6BFABBE}" cdate="Sun Jun 03 19:54:29 2007" mdate="Sun Jun 03 19:54:29 2007" version="" metaguid="{D300EA57-7F64-4B0E-AE50-878BE38527DC}" metaversion="" metaname="MetaGME">
+<project guid="{1B94FA98-0DD4-4568-BB1B-CCA0DA2ABD51}" cdate="Tue Apr 24 15:30:44 2012" mdate="Tue Apr 24 15:30:44 2012" version="" metaguid="{9D3F9884-FE60-409C-8FC1-45789193989B}" metaversion="" metaname="MetaGME">
<name>CHost</name>
<comment></comment>
<author></author>
- <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x3" kind="RootFolder" guid="{C35E7708-033F-4963-A4B1-FD51532BC85B}">
+ <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x3" kind="RootFolder" guid="{c35e7708-033f-4963-a4b1-fd51532bc85b}">
<name>CHost</name>
- <folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x1" libref="MGA=AMeta.mga" kind="RootFolder" guid="{46102C55-B40F-4a5e-B543-C2FCFAC28C59}">
+ <folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x1" libref="MGA=AMeta.mga" kind="RootFolder" guid="{46102c55-b40f-4a5e-b543-c2fcfac28c59}">
<name>MGA=AMeta.mga</name>
<regnode name="Namespace" isopaque="yes">
<value>A</value>
@@ -28,8 +28,38 @@
</regnode>
<regnode name="AModel-1-Model" status="undefined">
<value></value>
+ <regnode name="KindAspects" status="undefined">
+ <value></value>
+ <regnode name="C::C2Model:A::Role1" status="undefined">
+ <value></value>
+ <regnode name="Aspect" isopaque="yes">
+ <value> </value>
+ </regnode>
+ </regnode>
+ <regnode name="C::C2Model:A::Role2" status="undefined">
+ <value></value>
+ <regnode name="Aspect" isopaque="yes">
+ <value> </value>
+ </regnode>
+ </regnode>
+ </regnode>
<regnode name="MetaRef" isopaque="yes">
<value>1005</value>
+ <regnode name="C::C2Model" status="undefined">
+ <value></value>
+ <regnode name="A::Role1" isopaque="yes">
+ <value>1019</value>
+ <regnode name="Aspect" isopaque="yes">
+ <value>1022</value>
+ </regnode>
+ </regnode>
+ <regnode name="A::Role2" isopaque="yes">
+ <value>1020</value>
+ <regnode name="Aspect" isopaque="yes">
+ <value>1023</value>
+ </regnode>
+ </regnode>
+ </regnode>
<regnode name="C::CModel" status="undefined">
<value></value>
<regnode name="A::AModel" isopaque="yes">
@@ -37,6 +67,21 @@
</regnode>
</regnode>
</regnode>
+ <regnode name="PrimaryAspects" status="undefined">
+ <value></value>
+ <regnode name="C::C2Model:A::Role1" status="undefined">
+ <value></value>
+ <regnode name="Aspect" isopaque="yes">
+ <value>yes</value>
+ </regnode>
+ </regnode>
+ <regnode name="C::C2Model:A::Role2" status="undefined">
+ <value></value>
+ <regnode name="Aspect" isopaque="yes">
+ <value>yes</value>
+ </regnode>
+ </regnode>
+ </regnode>
</regnode>
<regnode name="BAtom-3-Atom" status="undefined">
<value></value>
@@ -69,9 +114,9 @@
</regnode>
</regnode>
</regnode>
- <model id="id-0065-00000001" kind="ParadigmSheet" guid="{96233377-4430-4e2f-B1D4-3D09B76DDFC1}" relid="0x1" childrelidcntr="0xf">
+ <model id="id-0065-00000001" kind="ParadigmSheet" guid="{96233377-4430-4e2f-b1d4-3d09b76ddfc1}" relid="0x1" childrelidcntr="0xf">
<name>ParadigmSheet</name>
- <atom id="id-0066-00000001" kind="Atom" role="Atom" guid="{E4F26ED8-24D6-4e37-88F7-CB1630DB19F6}" relid="0x6">
+ <atom id="id-0066-00000001" kind="Atom" role="Atom" guid="{e4f26ed8-24d6-4e37-88f7-cb1630db19f6}" relid="0x6">
<name>DAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -100,6 +145,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -109,6 +157,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -121,12 +178,24 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeShown" status="meta">
<value>false</value>
</attribute>
@@ -139,11 +208,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000002" kind="Inheritance" role="Inheritance" guid="{36ABAA27-FC25-47ea-840E-B273745C8B2A}" relid="0x5">
+ <atom id="id-0066-00000002" kind="Inheritance" role="Inheritance" guid="{36abaa27-fc25-47ea-840e-b273745c8b2a}" relid="0x5">
<name>Inheritance</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -173,7 +254,7 @@
</regnode>
</regnode>
</atom>
- <atom id="id-0066-00000003" kind="Atom" role="Atom" guid="{E7097ED2-F60C-4be3-AACA-001EE482A209}" relid="0x4">
+ <atom id="id-0066-00000003" kind="Atom" role="Atom" guid="{e7097ed2-f60c-4be3-aaca-001ee482a209}" relid="0x4">
<name>CAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -202,6 +283,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -211,6 +295,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -223,12 +316,24 @@
<attribute kind="IsAbstract">
<value>true</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeShown" status="meta">
<value>false</value>
</attribute>
@@ -241,11 +346,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000004" kind="Atom" role="Atom" guid="{A2D15C8E-BF21-45d1-B28B-ED7DA3F0095C}" relid="0x3">
+ <atom id="id-0066-00000004" kind="Atom" role="Atom" guid="{a2d15c8e-bf21-45d1-b28b-ed7da3f0095c}" relid="0x3">
<name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -274,6 +391,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -283,6 +403,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -295,12 +424,24 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeShown" status="meta">
<value>false</value>
</attribute>
@@ -313,11 +454,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000005" kind="Atom" role="Atom" guid="{958E45FD-2C0E-463b-823E-1651A56C8735}" relid="0x2">
+ <atom id="id-0066-00000005" kind="Atom" role="Atom" guid="{958e45fd-2c0e-463b-823e-1651a56c8735}" relid="0x2">
<name>AAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -346,6 +499,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -355,6 +511,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -367,12 +532,24 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeShown" status="meta">
<value>false</value>
</attribute>
@@ -385,11 +562,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000006" kind="Model" role="Model" guid="{84F68CFF-2463-4895-9B21-35C0D769FBBB}" relid="0x1">
+ <atom id="id-0066-00000006" kind="Model" role="Model" guid="{84f68cff-2463-4895-9b21-35c0d769fbbb}" relid="0x1">
<name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -418,6 +607,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -427,6 +619,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -439,12 +640,27 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeInfoShown" status="meta">
<value>true</value>
</attribute>
@@ -460,21 +676,33 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <connection id="id-0068-00000001" kind="DerivedInheritance" role="DerivedInheritance" guid="{08E64B0B-AD58-4694-96BB-9136D771157C}" relid="0xd">
+ <connection id="id-0068-00000001" kind="DerivedInheritance" role="DerivedInheritance" guid="{08e64b0b-ad58-4694-96bb-9136d771157c}" relid="0xd">
<name>DerivedInheritance</name>
<connpoint role="dst" target="id-0066-00000001"/>
<connpoint role="src" target="id-0066-00000002"/>
</connection>
- <connection id="id-0068-00000002" kind="BaseInheritance" role="BaseInheritance" guid="{DFBA5886-1133-4519-B9D8-B8CA47E8399F}" relid="0xc">
+ <connection id="id-0068-00000002" kind="BaseInheritance" role="BaseInheritance" guid="{dfba5886-1133-4519-b9d8-b8ca47e8399f}" relid="0xc">
<name>BaseInheritance</name>
<connpoint role="dst" target="id-0066-00000002"/>
<connpoint role="src" target="id-0066-00000003"/>
</connection>
- <connection id="id-0068-00000003" kind="Containment" role="Containment" guid="{5FE19A27-2874-4668-A6E8-8D01C1625EC9}" relid="0x9">
+ <connection id="id-0068-00000003" kind="Containment" role="Containment" guid="{5fe19a27-2874-4668-a6e8-8d01c1625ec9}" relid="0x9">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -488,7 +716,7 @@
<connpoint role="src" target="id-0066-00000003"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-00000004" kind="Containment" role="Containment" guid="{C3D09DF1-1F55-4478-ADD4-F32597EB207F}" relid="0x8">
+ <connection id="id-0068-00000004" kind="Containment" role="Containment" guid="{c3d09df1-1f55-4478-add4-f32597eb207f}" relid="0x8">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -502,7 +730,7 @@
<connpoint role="src" target="id-0066-00000004"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-00000005" kind="Containment" role="Containment" guid="{508760E0-8FA1-4356-80BA-85561B6CF97A}" relid="0x7">
+ <connection id="id-0068-00000005" kind="Containment" role="Containment" guid="{508760e0-8fa1-4356-80ba-85561b6cf97a}" relid="0x7">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -516,12 +744,12 @@
<connpoint role="src" target="id-0066-00000005"/>
<connpoint role="dst" target="id-0066-00000006"/>
</connection>
- <connection id="id-0068-00000006" kind="HasAspect" role="HasAspect" guid="{3BB99129-A42C-4569-8811-ACB8BDDD748A}" relid="0xf">
+ <connection id="id-0068-00000006" kind="HasAspect" role="HasAspect" guid="{3bb99129-a42c-4569-8811-acb8bddd748a}" relid="0xf">
<name>HasAspect</name>
<connpoint role="dst" target="id-0066-00000006"/>
<connpoint role="src" target="id-0069-00000001"/>
</connection>
- <set id="id-0069-00000001" kind="Aspect" role="Aspect" guid="{DC3E78C5-01C6-487f-A67E-B92BFEE7D820}" relid="0xe">
+ <set id="id-0069-00000001" kind="Aspect" role="Aspect" guid="{dc3e78c5-01c6-487f-a67e-b92bfee7d820}" relid="0xe">
<name>AAspect</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -538,7 +766,7 @@
</set>
</model>
</folder>
- <folder id="id-006a-00000003" relid="0x3" childrelidcntr="0x1" libref="MGA=BMeta.mga" kind="RootFolder" guid="{36776A57-FEA3-41c3-9417-D2BC6B99384B}">
+ <folder id="id-006a-00000003" relid="0x3" childrelidcntr="0x1" libref="MGA=BMeta.mga" kind="RootFolder" guid="{36776a57-fea3-41c3-9417-d2bc6b99384b}">
<name>MGA=BMeta.mga</name>
<regnode name="Namespace" isopaque="yes">
<value>B</value>
@@ -570,9 +798,9 @@
</regnode>
</regnode>
</regnode>
- <model id="id-0065-00000002" kind="ParadigmSheet" guid="{371FB238-5E45-4eab-BDB6-75BB37BCC75D}" relid="0x1" childrelidcntr="0x5">
+ <model id="id-0065-00000002" kind="ParadigmSheet" guid="{371fb238-5e45-4eab-bdb6-75bb37bcc75d}" relid="0x1" childrelidcntr="0x5">
<name>ParadigmSheet</name>
- <atom id="id-0066-00000007" kind="Atom" role="Atom" guid="{BD82C557-5E6A-44a4-81C0-63078D1AECA2}" relid="0x2">
+ <atom id="id-0066-00000007" kind="Atom" role="Atom" guid="{bd82c557-5e6a-44a4-81c0-63078d1aeca2}" relid="0x2">
<name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -601,6 +829,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -610,6 +841,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -622,12 +862,24 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeShown" status="meta">
<value>false</value>
</attribute>
@@ -640,11 +892,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000008" kind="Model" role="Model" guid="{83E17643-964F-4404-A0AC-9604098EACBE}" relid="0x1">
+ <atom id="id-0066-00000008" kind="Model" role="Model" guid="{83e17643-964f-4404-a0ac-9604098eacbe}" relid="0x1">
<name>BModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -661,6 +925,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -670,6 +937,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -682,12 +958,27 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeInfoShown" status="meta">
<value>true</value>
</attribute>
@@ -703,16 +994,28 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <connection id="id-0068-00000007" kind="HasAspect" role="HasAspect" guid="{22F82EBD-4EA3-4450-8773-4FC0F32B2EC5}" relid="0x5">
+ <connection id="id-0068-00000007" kind="HasAspect" role="HasAspect" guid="{22f82ebd-4ea3-4450-8773-4fc0f32b2ec5}" relid="0x5">
<name>HasAspect</name>
<connpoint role="dst" target="id-0066-00000008"/>
<connpoint role="src" target="id-0069-00000002"/>
</connection>
- <connection id="id-0068-00000008" kind="Containment" role="Containment" guid="{4E73C727-44F6-42ad-81D9-E9EEFC4B67A8}" relid="0x3">
+ <connection id="id-0068-00000008" kind="Containment" role="Containment" guid="{4e73c727-44f6-42ad-81d9-e9eefc4b67a8}" relid="0x3">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -726,7 +1029,7 @@
<connpoint role="src" target="id-0066-00000007"/>
<connpoint role="dst" target="id-0066-00000008"/>
</connection>
- <set id="id-0069-00000002" kind="Aspect" role="Aspect" guid="{23FEE068-54C2-4b3c-9FE9-2242A7C51396}" relid="0x4">
+ <set id="id-0069-00000002" kind="Aspect" role="Aspect" guid="{23fee068-54c2-4b3c-9fe9-2242a7c51396}" relid="0x4">
<name>BAspect</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -811,6 +1114,12 @@
</regnode>
<regnode name="ParadigmSheet" status="undefined">
<value></value>
+ <regnode name="C2Model-a-Model" status="undefined">
+ <value></value>
+ <regnode name="MetaRef" isopaque="yes">
+ <value>1018</value>
+ </regnode>
+ </regnode>
<regnode name="CModel-2-Model" status="undefined">
<value></value>
<regnode name="MetaRef" isopaque="yes">
@@ -818,9 +1127,9 @@
</regnode>
</regnode>
</regnode>
- <model id="id-0065-00000003" kind="ParadigmSheet" guid="{020AFD7B-A2FB-4042-AA17-166ABCD79661}" relid="0x1" childrelidcntr="0x9">
+ <model id="id-0065-00000003" kind="ParadigmSheet" guid="{020afd7b-a2fb-4042-aa17-166abcd79661}" relid="0x1" childrelidcntr="0xe">
<name>ParadigmSheet</name>
- <atom id="id-0066-00000009" kind="Model" role="Model" guid="{E0BD2CFF-F970-4faf-A843-887B5F57CA0D}" relid="0x2">
+ <atom id="id-0066-00000009" kind="Model" role="Model" guid="{e0bd2cff-f970-4faf-a843-887b5f57ca0d}" relid="0x2">
<name>CModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -849,6 +1158,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -858,6 +1170,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -870,12 +1191,27 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeInfoShown" status="meta">
<value>true</value>
</attribute>
@@ -891,27 +1227,60 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</atom>
- <reference id="id-0067-00000001" kind="AtomProxy" role="AtomProxy" guid="{B63426F2-2BA4-44f7-8EBB-6F5990077CB4}" relid="0x3" referred="id-0066-00000003">
- <name>CAtom</name>
+ <atom id="id-0066-0000000a" kind="Model" role="Model" guid="{6983e331-8f38-4670-92fb-2bf8cbf26c98}" relid="0xa">
+ <name>C2Model</name>
<regnode name="PartRegs" status="undefined">
<value></value>
+ <regnode name="All" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>599,98</value>
+ </regnode>
+ </regnode>
+ <regnode name="Attributes" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>599,98</value>
+ </regnode>
+ </regnode>
<regnode name="ClassDiagram" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>43,125</value>
+ <value>613,35</value>
+ </regnode>
+ </regnode>
+ <regnode name="Constraints" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>599,98</value>
</regnode>
</regnode>
<regnode name="Visualization" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>148,153</value>
+ <value>599,98</value>
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -921,11 +1290,20 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
- <attribute kind="InRootFolder" status="meta">
- <value>false</value>
+ <attribute kind="InRootFolder">
+ <value>true</value>
</attribute>
<attribute kind="InstanceIcon" status="meta">
<value></value>
@@ -933,16 +1311,34 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
- <attribute kind="IsTypeShown" status="meta">
+ <attribute kind="IsResizable" status="meta">
<value>false</value>
</attribute>
- <attribute kind="NamePosition" status="meta">
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsTypeInfoShown" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsTypeShown" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="NamePosition" status="meta">
<value>4</value>
</attribute>
<attribute kind="NameWrapNum" status="meta">
@@ -951,11 +1347,119 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="SubTypeIcon" status="meta">
+ <value></value>
+ </attribute>
+ </atom>
+ <reference id="id-0067-00000001" kind="AtomProxy" role="AtomProxy" guid="{b63426f2-2ba4-44f7-8ebb-6f5990077cb4}" relid="0x3" referred="id-0066-00000003">
+ <name>CAtom</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="ClassDiagram" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>43,125</value>
+ </regnode>
+ </regnode>
+ <regnode name="Visualization" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>148,153</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Decorator" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="DisplayedName" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GeneralPreferences" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Icon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="InRootFolder" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="InstanceIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsHotspotEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsNameEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsTypeShown" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="NamePosition" status="meta">
+ <value>4</value>
+ </attribute>
+ <attribute kind="NameWrapNum" status="meta">
+ <value>0</value>
+ </attribute>
+ <attribute kind="PortIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</reference>
- <reference id="id-0067-00000002" kind="ModelProxy" role="ModelProxy" guid="{CC98AC9E-4E39-418e-ACBE-E2E59901441A}" relid="0x4" referred="id-0066-00000006">
+ <reference id="id-0067-00000002" kind="ModelProxy" role="ModelProxy" guid="{cc98ac9e-4e39-418e-acbe-e2e59901441a}" relid="0x4" referred="id-0066-00000006">
<name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -972,6 +1476,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -981,6 +1488,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -993,12 +1509,27 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeInfoShown" status="meta">
<value>true</value>
</attribute>
@@ -1014,11 +1545,23 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</reference>
- <reference id="id-0067-00000003" kind="ModelProxy" role="ModelProxy" guid="{06CBD352-F5FD-462b-AE8B-D993047BBAD2}" relid="0x5" referred="id-0066-00000008">
+ <reference id="id-0067-00000003" kind="ModelProxy" role="ModelProxy" guid="{06cbd352-f5fd-462b-ae8b-d993047bbad2}" relid="0x5" referred="id-0066-00000008">
<name>BModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -1035,6 +1578,9 @@
</regnode>
</regnode>
</regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Decorator" status="meta">
<value></value>
</attribute>
@@ -1044,6 +1590,15 @@
<attribute kind="GeneralPreferences" status="meta">
<value></value>
</attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="Icon" status="meta">
<value></value>
</attribute>
@@ -1056,12 +1611,27 @@
<attribute kind="IsAbstract" status="meta">
<value>false</value>
</attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsHotspotEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
<attribute kind="IsNameEnabled" status="meta">
<value>true</value>
</attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
<attribute kind="IsTypeInfoShown" status="meta">
<value>true</value>
</attribute>
@@ -1077,11 +1647,230 @@
<attribute kind="PortIcon" status="meta">
<value></value>
</attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
<attribute kind="SubTypeIcon" status="meta">
<value></value>
</attribute>
</reference>
- <connection id="id-0068-00000009" kind="Containment" role="Containment" guid="{A4B5A8FC-4B0D-4c2a-AF18-C7D13D611476}" relid="0x6">
+ <reference id="id-0067-00000004" kind="ModelProxy" role="ModelProxy" guid="{3295d204-e55d-406f-a1ba-e8d66171b8e5}" relid="0xb" referred="id-0066-00000006">
+ <name>AModel</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="ClassDiagram" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>569,175</value>
+ </regnode>
+ </regnode>
+ <regnode name="Visualization" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>8,13</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Decorator" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="DisplayedName" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GeneralPreferences" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Icon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="InRootFolder" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="InstanceIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsHotspotEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsNameEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsTypeInfoShown" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsTypeShown" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="NamePosition" status="meta">
+ <value>4</value>
+ </attribute>
+ <attribute kind="NameWrapNum" status="meta">
+ <value>0</value>
+ </attribute>
+ <attribute kind="PortIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="SubTypeIcon" status="meta">
+ <value></value>
+ </attribute>
+ </reference>
+ <reference id="id-0067-00000005" kind="ModelProxy" role="ModelProxy" guid="{eee83af4-d91d-415c-841f-9e2558c9ec7f}" relid="0xd" referred="id-0066-00000006">
+ <name>AModel</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="ClassDiagram" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>716,175</value>
+ </regnode>
+ <regnode name="preferredSize" isopaque="yes">
+ <value>109,58</value>
+ </regnode>
+ </regnode>
+ <regnode name="Visualization" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>8,13</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="AutoRouterPref" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Decorator" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="DisplayedName" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GeneralPreferences" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="GradientFillDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="HelpURL" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="Icon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="InRootFolder" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="InstanceIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsGradientFillEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsHotspotEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsModelAutoRouted" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsNameEnabled" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsResizable" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsRoundRectangleEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsShadowCastEnabled" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="IsTypeInfoShown" status="meta">
+ <value>true</value>
+ </attribute>
+ <attribute kind="IsTypeShown" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="NamePosition" status="meta">
+ <value>4</value>
+ </attribute>
+ <attribute kind="NameWrapNum" status="meta">
+ <value>0</value>
+ </attribute>
+ <attribute kind="PortIcon" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="RoundRectangleRadius" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowColor" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowDirection" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ShadowThickness" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="SubTypeIcon" status="meta">
+ <value></value>
+ </attribute>
+ </reference>
+ <connection id="id-0068-00000009" kind="Containment" role="Containment" guid="{a4b5a8fc-4b0d-4c2a-af18-c7d13d611476}" relid="0x6">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -1095,7 +1884,7 @@
<connpoint role="dst" target="id-0066-00000009"/>
<connpoint role="src" target="id-0067-00000001"/>
</connection>
- <connection id="id-0068-0000000a" kind="Containment" role="Containment" guid="{564CAED9-A3B5-4bea-ADF0-69AA297604EC}" relid="0x7">
+ <connection id="id-0068-0000000a" kind="Containment" role="Containment" guid="{564caed9-a3b5-4bea-adf0-69aa297604ec}" relid="0x7">
<name>Containment</name>
<regnode name="autorouterPref" isopaque="yes">
<value>s</value>
@@ -1112,7 +1901,7 @@
<connpoint role="dst" target="id-0066-00000009"/>
<connpoint role="src" target="id-0067-00000002"/>
</connection>
- <connection id="id-0068-0000000b" kind="Containment" role="Containment" guid="{F301E4C5-B1B6-4380-B83C-C23659206762}" relid="0x8">
+ <connection id="id-0068-0000000b" kind="Containment" role="Containment" guid="{f301e4c5-b1b6-4380-b83c-c23659206762}" relid="0x8">
<name>Containment</name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -1126,12 +1915,43 @@
<connpoint role="dst" target="id-0066-00000009"/>
<connpoint role="src" target="id-0067-00000003"/>
</connection>
- <connection id="id-0068-0000000c" kind="HasAspect" role="HasAspect" guid="{AB0640D7-80F7-41df-BF15-55AE10CD5EAB}" relid="0x9">
+ <connection id="id-0068-0000000c" kind="HasAspect" role="HasAspect" guid="{ab0640d7-80f7-41df-bf15-55ae10cd5eab}" relid="0x9">
<name>HasAspect</name>
<connpoint role="dst" target="id-0066-00000009"/>
<connpoint role="src" target="id-0069-00000003"/>
</connection>
- <set id="id-0069-00000003" kind="Aspect" role="Aspect" guid="{52247371-DBB0-41ca-B16A-86ABB403E4D9}" relid="0x1">
+ <connection id="id-0068-0000000d" kind="Containment" role="Containment" guid="{3f613489-4c83-4522-90da-7f1d84dfe526}" relid="0xc">
+ <name>Containment</name>
+ <attribute kind="Cardinality" status="meta">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="IsPort" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Rolename">
+ <value>Role1</value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-0000000a"/>
+ <connpoint role="src" target="id-0067-00000004"/>
+ </connection>
+ <connection id="id-0068-0000000e" kind="Containment" role="Containment" guid="{9418cd47-6bdd-41b3-92f7-c195585a3c5c}" relid="0xe">
+ <name>Containment</name>
+ <regnode name="autorouterPref" isopaque="yes">
+ <value>sN</value>
+ </regnode>
+ <attribute kind="Cardinality" status="meta">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="IsPort" status="meta">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Rolename">
+ <value>Role2</value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-0000000a"/>
+ <connpoint role="src" target="id-0067-00000005"/>
+ </connection>
+ <set id="id-0069-00000003" kind="Aspect" role="Aspect" guid="{52247371-dbb0-41ca-b16a-86abb403e4d9}" relid="0x1">
<name>CAspect</name>
<regnode name="PartRegs" status="undefined">
<value></value>
Modified: UDM/trunk/tests/test_ns2/CHost_uml.xme
==============================================================================
--- UDM/trunk/tests/test_ns2/CHost_uml.xme Tue Apr 24 16:11:11 2012 (r4041)
+++ UDM/trunk/tests/test_ns2/CHost_uml.xme Tue Apr 24 16:11:30 2012 (r4042)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project SYSTEM "mga.dtd">
-<project guid="{30520B08-4C58-420A-B4BE-507D556B6EF5}" cdate="Sun Jun 03 19:54:32 2007" mdate="Sun Jun 03 19:54:32 2007" version="" metaguid="{F1551138-4862-4D3E-BA90-6B5357D11B8F}" metaversion="" metaname="UML">
- <name>Root Folder</name>
+<project guid="{D7077755-9945-4D55-AA9D-A0D511C4C716}" cdate="Tue Apr 24 15:51:25 2012" mdate="Tue Apr 24 15:51:25 2012" version="" metaguid="{1913C77F-2986-4DA3-BD61-02F6C19FD44E}" metaversion="" metaname="UML">
+ <name>CHost</name>
<comment></comment>
<author></author>
- <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x1" kind="RootFolder" guid="{C30ED71E-4002-48ed-94AA-8497930DFF32}">
+ <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x1" kind="RootFolder" guid="{c9eace78-099d-4325-b8ea-0c2f46b84ec6}">
<name>CHost</name>
- <model id="id-0065-00000001" kind="Package" guid="{16029087-1596-4594-92C2-89518E5921CC}" relid="0x1" childrelidcntr="0x4">
+ <model id="id-0065-00000001" kind="Package" guid="{3150efc6-db6b-4e57-904e-7db807b60cb0}" relid="0x1" childrelidcntr="0x4">
<name>CHost</name>
<attribute kind="alias" status="meta">
<value></value>
@@ -15,11 +15,11 @@
<attribute kind="version" status="meta">
<value>1.00</value>
</attribute>
- <model id="id-0065-00000002" kind="Namespace" role="Namespace" guid="{91B6A340-93BD-44e7-937C-045A8C4E1409}" relid="0x1" childrelidcntr="0x2">
+ <model id="id-0065-00000002" kind="Namespace" role="Namespace" guid="{f65601ef-d736-49c4-a2ee-7ce7761e5aa9}" relid="0x1" childrelidcntr="0x2">
<name>C</name>
- <model id="id-0065-00000003" kind="ClassDiagram" role="ClassDiagram" guid="{F236A175-5C7C-4c17-886F-8F3C088419D5}" relid="0x1" childrelidcntr="0x11">
+ <model id="id-0065-00000003" kind="ClassDiagram" role="ClassDiagram" guid="{d5ad79f6-172c-4266-a39e-9bbffb3b3eb9}" relid="0x1" childrelidcntr="0x13">
<name>zC_GMEInheritanceSheet</name>
- <atom id="id-0066-00000001" kind="Class" role="Class" guid="{B155E46D-9ED8-4299-B43C-EB18B1034091}" relid="0x1">
+ <atom id="id-0066-00000001" kind="Class" role="Class" guid="{620062dc-e194-4cb5-a8a6-61684f405e22}" relid="0x1">
<name>MgaObject</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -48,7 +48,7 @@
<value></value>
</attribute>
</atom>
- <atom id="id-0066-00000002" kind="Inheritance" role="Inheritance" guid="{45E8E416-E6B7-40cb-9CEF-4AE184530761}" relid="0x2">
+ <atom id="id-0066-00000002" kind="Inheritance" role="Inheritance" guid="{485e01f2-eeb3-4fc5-bc80-337fe6f1e395}" relid="0x2">
<name></name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -66,7 +66,7 @@
</regnode>
</regnode>
</atom>
- <reference id="id-0067-00000007" kind="ClassCopy" role="ClassCopy" guid="{BC31882F-57AA-4e78-B0A1-02D473386AEE}" relid="0x4" referred="id-0066-00000004">
+ <reference id="id-0067-0000000a" kind="ClassCopy" role="ClassCopy" guid="{a2e7f86c-06e7-4a35-ad4d-f6ca0c5ae8c4}" relid="0x4" referred="id-0066-00000007">
<name>CAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -87,7 +87,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000008" kind="ClassCopy" role="ClassCopy" guid="{C1BE7E77-DB82-4f83-9EE8-40E066938906}" relid="0x6" referred="id-0066-00000005">
+ <reference id="id-0067-0000000b" kind="ClassCopy" role="ClassCopy" guid="{1bc34a44-6be0-489d-aab4-3fb2f2e6a459}" relid="0x6" referred="id-0066-00000009">
<name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -108,7 +108,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000009" kind="ClassCopy" role="ClassCopy" guid="{4AF3DCF3-9F7D-4ca6-AF38-53D5A7B78D57}" relid="0x8" referred="id-0066-00000006">
+ <reference id="id-0067-0000000c" kind="ClassCopy" role="ClassCopy" guid="{4213fc27-04f7-4ceb-ae73-da68b1ae4c6a}" relid="0x8" referred="id-0066-00000008">
<name>AAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -129,7 +129,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-0000000a" kind="ClassCopy" role="ClassCopy" guid="{91A1EDEE-5701-4173-A3EB-9558C7ADC33E}" relid="0xa" referred="id-0066-00000007">
+ <reference id="id-0067-0000000d" kind="ClassCopy" role="ClassCopy" guid="{2004a453-347a-4893-a1e7-6de0ebc65a22}" relid="0xa" referred="id-0066-00000006">
<name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -150,7 +150,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-0000000b" kind="ClassCopy" role="ClassCopy" guid="{A91F8D71-F84C-4844-887B-CBCC81EE9E7E}" relid="0xc" referred="id-0066-00000009">
+ <reference id="id-0067-0000000e" kind="ClassCopy" role="ClassCopy" guid="{85376b65-eba3-43c4-9396-36c8b727c843}" relid="0xc" referred="id-0066-00000005">
<name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -171,7 +171,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-0000000c" kind="ClassCopy" role="ClassCopy" guid="{E6E4332D-B2FC-443d-A182-A3600B2B5497}" relid="0xe" referred="id-0066-0000000a">
+ <reference id="id-0067-0000000f" kind="ClassCopy" role="ClassCopy" guid="{37c453d9-93af-49f9-9d7f-59fd5d6f85de}" relid="0xe" referred="id-0066-00000004">
<name>BModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -192,7 +192,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-0000000d" kind="ClassCopy" role="ClassCopy" guid="{9E2B0638-824B-4c50-B856-392A0967094D}" relid="0x10" referred="id-0066-0000000b">
+ <reference id="id-0067-00000010" kind="ClassCopy" role="ClassCopy" guid="{dafa7b41-2b8c-4bf0-a486-c26167533acd}" relid="0x10" referred="id-0066-0000000c">
<name>CModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -213,50 +213,103 @@
<value>false</value>
</attribute>
</reference>
- <connection id="id-0068-00000001" kind="Base" role="Base" guid="{95F29E75-F6DE-4001-B450-7C3426FD4363}" relid="0x3">
+ <reference id="id-0067-00000011" kind="ClassCopy" role="ClassCopy" guid="{1b47e43b-cbe8-40ea-b76a-85f5e4be04eb}" relid="0x12" referred="id-0066-0000000b">
+ <name>C2Model</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="Constraints" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>1050,200</value>
+ </regnode>
+ </regnode>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>1050,200</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <connection id="id-0068-00000001" kind="Base" role="Base" guid="{208ee14c-7c3d-4702-9de7-eb7a3552969d}" relid="0x3">
<name></name>
<connpoint role="src" target="id-0066-00000001"/>
<connpoint role="dst" target="id-0066-00000002"/>
</connection>
- <connection id="id-0068-0000000f" kind="Sub" role="Sub" guid="{83A898BA-954C-45ee-B8F3-6C05F84BEEDA}" relid="0x5">
+ <connection id="id-0068-00000012" kind="Sub" role="Sub" guid="{065e5238-bd3f-4d66-81cf-524f2c20f8cf}" relid="0x5">
+ <name></name>
+ <connpoint role="src" target="id-0066-00000002"/>
+ <connpoint role="dst" target="id-0067-0000000a"/>
+ </connection>
+ <connection id="id-0068-00000013" kind="Sub" role="Sub" guid="{be21e17a-225b-4fab-bbf4-f3d0de0a7cc8}" relid="0x7">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-00000007"/>
+ <connpoint role="dst" target="id-0067-0000000b"/>
</connection>
- <connection id="id-0068-00000010" kind="Sub" role="Sub" guid="{CE1E5676-29CF-4e30-9600-B845D5D6E1E2}" relid="0x7">
+ <connection id="id-0068-00000014" kind="Sub" role="Sub" guid="{609306fd-bcab-40e5-8bb5-6d0885d88f4d}" relid="0x9">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-00000008"/>
+ <connpoint role="dst" target="id-0067-0000000c"/>
</connection>
- <connection id="id-0068-00000011" kind="Sub" role="Sub" guid="{3105183C-6D98-4575-B878-0C93175FE39E}" relid="0x9">
+ <connection id="id-0068-00000015" kind="Sub" role="Sub" guid="{317449a5-8e8e-4dc8-84c1-7535ce6fcbde}" relid="0xb">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-00000009"/>
+ <connpoint role="dst" target="id-0067-0000000d"/>
</connection>
- <connection id="id-0068-00000012" kind="Sub" role="Sub" guid="{FFF6F5A8-A6E1-43e5-BEFF-1DD52B78FDB2}" relid="0xb">
+ <connection id="id-0068-00000016" kind="Sub" role="Sub" guid="{8342d944-309f-4bb3-95e9-b6dc28aed850}" relid="0xd">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-0000000a"/>
+ <connpoint role="dst" target="id-0067-0000000e"/>
</connection>
- <connection id="id-0068-00000013" kind="Sub" role="Sub" guid="{E63CE9A3-568C-42d1-8DA0-2F251298B451}" relid="0xd">
+ <connection id="id-0068-00000017" kind="Sub" role="Sub" guid="{39d2a538-947a-4dd7-b9eb-eda60a901675}" relid="0xf">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-0000000b"/>
+ <connpoint role="dst" target="id-0067-0000000f"/>
</connection>
- <connection id="id-0068-00000014" kind="Sub" role="Sub" guid="{64E3CBA3-27B5-4a1f-BDD2-AB6F88A34254}" relid="0xf">
+ <connection id="id-0068-00000018" kind="Sub" role="Sub" guid="{7411d3f3-5553-42d9-a44b-5437f15969f0}" relid="0x11">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-0000000c"/>
+ <connpoint role="dst" target="id-0067-00000010"/>
</connection>
- <connection id="id-0068-00000015" kind="Sub" role="Sub" guid="{E9C7277D-0776-4987-AB5E-14FBFA2B3EFE}" relid="0x11">
+ <connection id="id-0068-00000019" kind="Sub" role="Sub" guid="{e740e351-ff1f-4fb0-8a8f-9669bdb21efd}" relid="0x13">
<name></name>
<connpoint role="src" target="id-0066-00000002"/>
- <connpoint role="dst" target="id-0067-0000000d"/>
+ <connpoint role="dst" target="id-0067-00000011"/>
</connection>
</model>
- <model id="id-0065-00000005" kind="ClassDiagram" role="ClassDiagram" guid="{02AC19AA-D3F4-4e30-B6DC-B446BEDF13F5}" relid="0x2" childrelidcntr="0x7">
+ <model id="id-0065-00000005" kind="ClassDiagram" role="ClassDiagram" guid="{f8ac4508-c245-4f06-b49d-609e412227fe}" relid="0x2" childrelidcntr="0xc">
<name>ParadigmSheet</name>
- <atom id="id-0066-0000000b" kind="Class" role="Class" guid="{9EFB35C0-1068-45d9-9C21-06DBD736777B}" relid="0x1">
+ <atom id="id-0066-0000000b" kind="Class" role="Class" guid="{8e75afc9-ba9c-4e52-a5da-8c4fa66e844f}" relid="0x1">
+ <name>C2Model</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="Constraints" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>599,98</value>
+ </regnode>
+ </regnode>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>613,35</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype">
+ <value>Model</value>
+ </attribute>
+ </atom>
+ <atom id="id-0066-0000000c" kind="Class" role="Class" guid="{6b2ed115-c7de-4faf-8e2a-d2aac5e64f0b}" relid="0x2">
<name>CModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -283,14 +336,14 @@
<value>Model</value>
</attribute>
</atom>
- <reference id="id-0067-00000004" kind="ClassCopy" role="ClassCopy" guid="{11559363-4A0D-41af-9336-0715AAF6D2C8}" relid="0x2" referred="id-0066-00000004">
- <name>CAtom</name>
+ <reference id="id-0067-00000005" kind="ClassCopy" role="ClassCopy" guid="{4012afa6-d085-45d4-b372-aa5298ec0766}" relid="0x3" referred="id-0066-00000006">
+ <name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="UML" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>43,125</value>
+ <value>716,175</value>
</regnode>
</regnode>
</regnode>
@@ -298,14 +351,14 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000005" kind="ClassCopy" role="ClassCopy" guid="{5211AA4E-EE97-4ec7-952E-0B2D413B94AC}" relid="0x4" referred="id-0066-00000007">
+ <reference id="id-0067-00000006" kind="ClassCopy" role="ClassCopy" guid="{a602b025-ad8e-41f8-bb72-3a9596a659ef}" relid="0x5" referred="id-0066-00000006">
<name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="UML" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>190,146</value>
+ <value>569,175</value>
</regnode>
</regnode>
</regnode>
@@ -313,7 +366,7 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000006" kind="ClassCopy" role="ClassCopy" guid="{7C9FFDEB-5822-495d-B2B0-A631B2FC8E94}" relid="0x6" referred="id-0066-0000000a">
+ <reference id="id-0067-00000007" kind="ClassCopy" role="ClassCopy" guid="{e61ae76c-a010-4d5d-9885-11c337403770}" relid="0x7" referred="id-0066-00000004">
<name>BModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -328,21 +381,65 @@
<value>false</value>
</attribute>
</reference>
- <connection id="id-0068-0000000c" kind="Composition" role="Composition" guid="{6C05352A-4E6A-4912-8C08-9C3CC2F896D0}" relid="0x3">
+ <reference id="id-0067-00000008" kind="ClassCopy" role="ClassCopy" guid="{b83529c4-fcaa-4272-bdd2-03401d21878e}" relid="0x9" referred="id-0066-00000006">
+ <name>AModel</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>190,146</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <reference id="id-0067-00000009" kind="ClassCopy" role="ClassCopy" guid="{09f1fc90-e515-4f57-be00-c6f28150d1b5}" relid="0xb" referred="id-0066-00000007">
+ <name>CAtom</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>43,125</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <connection id="id-0068-0000000d" kind="Composition" role="Composition" guid="{d83a3187-f763-431a-b035-1152d7e874f8}" relid="0x4">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
</attribute>
<attribute kind="ChildRole">
+ <value>Role2</value>
+ </attribute>
+ <attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
+ <connpoint role="dst" target="id-0066-0000000b"/>
+ <connpoint role="src" target="id-0067-00000005"/>
+ </connection>
+ <connection id="id-0068-0000000e" kind="Composition" role="Composition" guid="{41a5cbac-08a3-466e-b0f6-de992e07f22d}" relid="0x6">
+ <name></name>
+ <attribute kind="Cardinality">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="ChildRole">
+ <value>Role1</value>
+ </attribute>
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
<connpoint role="dst" target="id-0066-0000000b"/>
- <connpoint role="src" target="id-0067-00000004"/>
+ <connpoint role="src" target="id-0067-00000006"/>
</connection>
- <connection id="id-0068-0000000d" kind="Composition" role="Composition" guid="{C13DF14B-B64F-4d8d-B350-D9B9B4A3EDBA}" relid="0x5">
+ <connection id="id-0068-0000000f" kind="Composition" role="Composition" guid="{c7de4a36-9a1b-4fda-a046-e54402f09cd5}" relid="0x8">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -353,10 +450,10 @@
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
- <connpoint role="dst" target="id-0066-0000000b"/>
- <connpoint role="src" target="id-0067-00000005"/>
+ <connpoint role="dst" target="id-0066-0000000c"/>
+ <connpoint role="src" target="id-0067-00000007"/>
</connection>
- <connection id="id-0068-0000000e" kind="Composition" role="Composition" guid="{4D9B246F-499F-4b36-BC6B-2B8BB4054054}" relid="0x7">
+ <connection id="id-0068-00000010" kind="Composition" role="Composition" guid="{3c1c99c1-88ad-4b48-ae9b-ccca6a421280}" relid="0xa">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -367,14 +464,28 @@
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
- <connpoint role="dst" target="id-0066-0000000b"/>
- <connpoint role="src" target="id-0067-00000006"/>
+ <connpoint role="dst" target="id-0066-0000000c"/>
+ <connpoint role="src" target="id-0067-00000008"/>
+ </connection>
+ <connection id="id-0068-00000011" kind="Composition" role="Composition" guid="{a79da21b-6bb6-4375-b4c4-06c48c473513}" relid="0xc">
+ <name></name>
+ <attribute kind="Cardinality">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="ChildRole">
+ <value></value>
+ </attribute>
+ <attribute kind="ParentRole" status="meta">
+ <value></value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-0000000c"/>
+ <connpoint role="src" target="id-0067-00000009"/>
</connection>
</model>
</model>
- <model id="id-0065-00000004" kind="ClassDiagram" role="ClassDiagram" guid="{154723BF-FA2B-4f89-9E8B-4723B530C940}" relid="0x2" childrelidcntr="0x8">
+ <model id="id-0065-00000004" kind="ClassDiagram" role="ClassDiagram" guid="{b30569d5-e0d1-4901-8430-71b021f88d95}" relid="0x2" childrelidcntr="0xa">
<name>zC_RootFolderCompositionSheet</name>
- <atom id="id-0066-00000003" kind="Class" role="Class" guid="{DDC9C60D-F431-44ab-9F6D-6D05B0E944A3}" relid="0x1">
+ <atom id="id-0066-00000003" kind="Class" role="Class" guid="{b345650a-fb03-4857-89da-1318f43e3668}" relid="0x1">
<name>RootFolder</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -402,8 +513,8 @@
<value>Folder</value>
</attribute>
</atom>
- <reference id="id-0067-00000001" kind="ClassCopy" role="ClassCopy" guid="{58737C8F-790B-41d3-A3AB-79DD3C01DAD8}" relid="0x3" referred="id-0066-00000007">
- <name>AModel</name>
+ <reference id="id-0067-00000001" kind="ClassCopy" role="ClassCopy" guid="{3f4b1f94-8c75-4178-8e61-1819a4be9a39}" relid="0x3" referred="id-0066-00000004">
+ <name>BModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
@@ -423,8 +534,8 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000002" kind="ClassCopy" role="ClassCopy" guid="{05893B85-61E4-426e-86D0-05F956893744}" relid="0x5" referred="id-0066-0000000a">
- <name>BModel</name>
+ <reference id="id-0067-00000002" kind="ClassCopy" role="ClassCopy" guid="{afd22375-cf28-44be-ba74-c250724d0b87}" relid="0x5" referred="id-0066-00000006">
+ <name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
@@ -444,8 +555,8 @@
<value>false</value>
</attribute>
</reference>
- <reference id="id-0067-00000003" kind="ClassCopy" role="ClassCopy" guid="{C748A305-3B2C-44f0-A7BC-41F0C86B8E95}" relid="0x7" referred="id-0066-0000000b">
- <name>CModel</name>
+ <reference id="id-0067-00000003" kind="ClassCopy" role="ClassCopy" guid="{ee45d0c6-b630-475e-b755-a6a0bf9a36cd}" relid="0x7" referred="id-0066-0000000b">
+ <name>C2Model</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
@@ -465,7 +576,28 @@
<value>false</value>
</attribute>
</reference>
- <connection id="id-0068-00000002" kind="Composition" role="Composition" guid="{3BB60DC4-0B2D-40c3-8546-43D016C467E5}" relid="0x2">
+ <reference id="id-0067-00000004" kind="ClassCopy" role="ClassCopy" guid="{25976644-2f92-454f-9ab9-ec7a329f8d66}" relid="0x9" referred="id-0066-0000000c">
+ <name>CModel</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="Constraints" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>450,200</value>
+ </regnode>
+ </regnode>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>450,200</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="IsAbstract" status="meta">
+ <value>false</value>
+ </attribute>
+ </reference>
+ <connection id="id-0068-00000002" kind="Composition" role="Composition" guid="{bc663646-4494-46fb-9ac8-5a542cc0ef72}" relid="0x2">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -479,7 +611,7 @@
<connpoint role="dst" target="id-0066-00000003"/>
<connpoint role="src" target="id-0066-00000003"/>
</connection>
- <connection id="id-0068-00000003" kind="Composition" role="Composition" guid="{601B823E-5BF1-49ad-B2C1-CB2C51061050}" relid="0x4">
+ <connection id="id-0068-00000003" kind="Composition" role="Composition" guid="{51aa8342-3dd4-4909-8ca0-18c53fe18d07}" relid="0x4">
<name></name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -493,7 +625,7 @@
<connpoint role="dst" target="id-0066-00000003"/>
<connpoint role="src" target="id-0067-00000001"/>
</connection>
- <connection id="id-0068-00000004" kind="Composition" role="Composition" guid="{FC7998E3-2440-4b69-B204-134807382007}" relid="0x6">
+ <connection id="id-0068-00000004" kind="Composition" role="Composition" guid="{f3e7aa39-ec07-4fa1-a921-928b45cdd41f}" relid="0x6">
<name></name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -507,7 +639,7 @@
<connpoint role="dst" target="id-0066-00000003"/>
<connpoint role="src" target="id-0067-00000002"/>
</connection>
- <connection id="id-0068-00000005" kind="Composition" role="Composition" guid="{94D76753-6D7A-422d-B1D5-EA6EA4DB8D6E}" relid="0x8">
+ <connection id="id-0068-00000005" kind="Composition" role="Composition" guid="{2a9a6f25-4987-4630-b303-d31374108491}" relid="0x8">
<name></name>
<attribute kind="Cardinality" status="meta">
<value>0..*</value>
@@ -521,25 +653,60 @@
<connpoint role="dst" target="id-0066-00000003"/>
<connpoint role="src" target="id-0067-00000003"/>
</connection>
+ <connection id="id-0068-00000006" kind="Composition" role="Composition" guid="{5f76aa28-dd66-4e5b-b6e6-b48d844c3feb}" relid="0xa">
+ <name></name>
+ <attribute kind="Cardinality" status="meta">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="ChildRole" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="ParentRole" status="meta">
+ <value></value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-00000003"/>
+ <connpoint role="src" target="id-0067-00000004"/>
+ </connection>
</model>
- <model id="id-0065-00000006" kind="Namespace" role="Namespace" guid="{9D9A684D-BFF4-485e-83D8-D621FEC36045}" relid="0x3" childrelidcntr="0x1">
- <name>A</name>
- <model id="id-0065-00000007" kind="ClassDiagram" role="ClassDiagram" guid="{33D49663-081D-49ed-B166-177CE0F8C28F}" relid="0x1" childrelidcntr="0xb">
+ <model id="id-0065-00000006" kind="Namespace" role="Namespace" guid="{62f0af51-5d69-41b1-88c8-e290cfdf8a9a}" relid="0x3" childrelidcntr="0x1">
+ <name>B</name>
+ <model id="id-0065-00000007" kind="ClassDiagram" role="ClassDiagram" guid="{38b88faa-56fe-4cbe-a148-e43648cd09d8}" relid="0x1" childrelidcntr="0x3">
<name>ParadigmSheet</name>
- <atom id="id-0066-00000004" kind="Class" role="Class" guid="{41FBC511-838E-4421-B649-77EE3EB62287}" relid="0x1">
- <name>CAtom</name>
+ <atom id="id-0066-00000004" kind="Class" role="Class" guid="{81d9565f-0816-472f-8178-f9a908ae0e0e}" relid="0x1">
+ <name>BModel</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>162,13</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract">
+ <value>false</value>
+ </attribute>
+ <attribute kind="Stereotype">
+ <value>Model</value>
+ </attribute>
+ </atom>
+ <atom id="id-0066-00000005" kind="Class" role="Class" guid="{5879693d-ecc9-4fbc-99fa-fa0257c1b270}" relid="0x2">
+ <name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>387,142</value>
+ <value>170,149</value>
</regnode>
</regnode>
<regnode name="UML" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>379,27</value>
+ <value>170,149</value>
</regnode>
</regnode>
</regnode>
@@ -547,26 +714,46 @@
<value></value>
</attribute>
<attribute kind="IsAbstract">
- <value>true</value>
+ <value>false</value>
</attribute>
<attribute kind="Stereotype">
<value>Atom</value>
</attribute>
</atom>
- <atom id="id-0066-00000005" kind="Class" role="Class" guid="{25BFBE20-6274-4fbc-8DB6-DE692F3165F4}" relid="0x2">
- <name>BAtom</name>
+ <connection id="id-0068-00000007" kind="Composition" role="Composition" guid="{f7c860de-a1ba-418e-b24d-5540ff1d5b2a}" relid="0x3">
+ <name></name>
+ <attribute kind="Cardinality">
+ <value>0..*</value>
+ </attribute>
+ <attribute kind="ChildRole">
+ <value></value>
+ </attribute>
+ <attribute kind="ParentRole" status="meta">
+ <value></value>
+ </attribute>
+ <connpoint role="dst" target="id-0066-00000004"/>
+ <connpoint role="src" target="id-0066-00000005"/>
+ </connection>
+ </model>
+ </model>
+ <model id="id-0065-00000008" kind="Namespace" role="Namespace" guid="{264e8136-f0e5-4e91-8c40-a2613ca56ad4}" relid="0x4" childrelidcntr="0x1">
+ <name>A</name>
+ <model id="id-0065-00000009" kind="ClassDiagram" role="ClassDiagram" guid="{fa8cb3a9-bdad-4e19-9c8d-68f1e1dd353a}" relid="0x1" childrelidcntr="0xb">
+ <name>ParadigmSheet</name>
+ <atom id="id-0066-00000006" kind="Class" role="Class" guid="{b3f9bff7-b64d-474e-a4c7-6a60e52e602a}" relid="0x1">
+ <name>AModel</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>240,142</value>
+ <value>198,30</value>
</regnode>
</regnode>
<regnode name="UML" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>240,142</value>
+ <value>198,30</value>
</regnode>
</regnode>
</regnode>
@@ -577,10 +764,37 @@
<value>false</value>
</attribute>
<attribute kind="Stereotype">
+ <value>Model</value>
+ </attribute>
+ </atom>
+ <atom id="id-0066-00000007" kind="Class" role="Class" guid="{877d0f24-003c-46aa-96ed-c252fd4f3d35}" relid="0x2">
+ <name>CAtom</name>
+ <regnode name="PartRegs" status="undefined">
+ <value></value>
+ <regnode name="Constraints" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>387,142</value>
+ </regnode>
+ </regnode>
+ <regnode name="UML" status="undefined">
+ <value></value>
+ <regnode name="Position" isopaque="yes">
+ <value>379,27</value>
+ </regnode>
+ </regnode>
+ </regnode>
+ <attribute kind="Attributes" status="meta">
+ <value></value>
+ </attribute>
+ <attribute kind="IsAbstract">
+ <value>true</value>
+ </attribute>
+ <attribute kind="Stereotype">
<value>Atom</value>
</attribute>
</atom>
- <atom id="id-0066-00000006" kind="Class" role="Class" guid="{B2CD70FC-E32F-46c0-AE7F-354318F39C0A}" relid="0x3">
+ <atom id="id-0066-00000008" kind="Class" role="Class" guid="{a4fbd272-879a-44c2-9831-1d1c0943d284}" relid="0x3">
<name>AAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -607,20 +821,20 @@
<value>Atom</value>
</attribute>
</atom>
- <atom id="id-0066-00000007" kind="Class" role="Class" guid="{37744919-8BB4-4af3-B8C5-E5316F896B02}" relid="0x4">
- <name>AModel</name>
+ <atom id="id-0066-00000009" kind="Class" role="Class" guid="{031c5dd5-e43b-4d4d-8d5a-7a7e1f246297}" relid="0x4">
+ <name>BAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
<regnode name="Constraints" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>198,30</value>
+ <value>240,142</value>
</regnode>
</regnode>
<regnode name="UML" status="undefined">
<value></value>
<regnode name="Position" isopaque="yes">
- <value>198,30</value>
+ <value>240,142</value>
</regnode>
</regnode>
</regnode>
@@ -631,10 +845,10 @@
<value>false</value>
</attribute>
<attribute kind="Stereotype">
- <value>Model</value>
+ <value>Atom</value>
</attribute>
</atom>
- <atom id="id-0066-00000008" kind="Class" role="Class" guid="{55BA6769-12A0-4234-A548-9F12133DF04B}" relid="0x5">
+ <atom id="id-0066-0000000a" kind="Class" role="Class" guid="{2f22e25e-2c83-4a14-b631-d1a5a3da564b}" relid="0x5">
<name>DAtom</name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -661,7 +875,7 @@
<value>Atom</value>
</attribute>
</atom>
- <atom id="id-0066-0000000c" kind="Inheritance" role="Inheritance" guid="{1D13CCE3-B55E-43eb-B281-B14EE5F584D5}" relid="0x9">
+ <atom id="id-0066-0000000d" kind="Inheritance" role="Inheritance" guid="{9f4b8ffc-60e3-4095-b4d5-1054d9a2421f}" relid="0x9">
<name></name>
<regnode name="PartRegs" status="undefined">
<value></value>
@@ -679,7 +893,7 @@
</regnode>
</regnode>
</atom>
- <connection id="id-0068-00000006" kind="Composition" role="Composition" guid="{E2129BED-8DB8-4761-941F-8F6280305A06}" relid="0x6">
+ <connection id="id-0068-00000008" kind="Composition" role="Composition" guid="{5ff4a704-27ef-4909-a740-45c3b214cdd5}" relid="0x6">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -690,10 +904,10 @@
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
- <connpoint role="src" target="id-0066-00000004"/>
- <connpoint role="dst" target="id-0066-00000007"/>
+ <connpoint role="dst" target="id-0066-00000006"/>
+ <connpoint role="src" target="id-0066-00000007"/>
</connection>
- <connection id="id-0068-00000007" kind="Composition" role="Composition" guid="{3BF3F4E5-05D2-4507-A1E6-0F671943BCAF}" relid="0x7">
+ <connection id="id-0068-00000009" kind="Composition" role="Composition" guid="{ccec26e5-6021-4c61-ad8b-c54bb24dc100}" relid="0x7">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -704,10 +918,10 @@
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
- <connpoint role="src" target="id-0066-00000005"/>
- <connpoint role="dst" target="id-0066-00000007"/>
+ <connpoint role="dst" target="id-0066-00000006"/>
+ <connpoint role="src" target="id-0066-00000008"/>
</connection>
- <connection id="id-0068-00000008" kind="Composition" role="Composition" guid="{B9C2CF94-A18B-4d51-8F15-8FDD2DA2433C}" relid="0x8">
+ <connection id="id-0068-0000000a" kind="Composition" role="Composition" guid="{17a9e368-beb7-4c97-8c88-e3ad5b2e087d}" relid="0x8">
<name></name>
<attribute kind="Cardinality">
<value>0..*</value>
@@ -718,86 +932,18 @@
<attribute kind="ParentRole" status="meta">
<value></value>
</attribute>
- <connpoint role="src" target="id-0066-00000006"/>
- <connpoint role="dst" target="id-0066-00000007"/>
- </connection>
- <connection id="id-0068-00000009" kind="Base" role="Base" guid="{5D973700-BD38-406e-82AA-B8622E89E6AC}" relid="0xa">
- <name></name>
- <connpoint role="src" target="id-0066-00000004"/>
- <connpoint role="dst" target="id-0066-0000000c"/>
+ <connpoint role="dst" target="id-0066-00000006"/>
+ <connpoint role="src" target="id-0066-00000009"/>
</connection>
- <connection id="id-0068-0000000a" kind="Sub" role="Sub" guid="{4ADFBDC8-2777-41da-82C9-F991806864B3}" relid="0xb">
+ <connection id="id-0068-0000000b" kind="Base" role="Base" guid="{1b0b1cb3-461d-47db-853c-540177e6130c}" relid="0xa">
<name></name>
- <connpoint role="dst" target="id-0066-00000008"/>
- <connpoint role="src" target="id-0066-0000000c"/>
+ <connpoint role="src" target="id-0066-00000007"/>
+ <connpoint role="dst" target="id-0066-0000000d"/>
</connection>
- </model>
- </model>
- <model id="id-0065-00000008" kind="Namespace" role="Namespace" guid="{3E1BC62F-842B-40ec-8974-2F0F6F2C71AA}" relid="0x4" childrelidcntr="0x1">
- <name>B</name>
- <model id="id-0065-00000009" kind="ClassDiagram" role="ClassDiagram" guid="{CA2DD9F1-B355-4361-BC4E-097092BF921D}" relid="0x1" childrelidcntr="0x3">
- <name>ParadigmSheet</name>
- <atom id="id-0066-00000009" kind="Class" role="Class" guid="{B23F7571-2488-45fb-BCCB-99E32B9EF04C}" relid="0x1">
- <name>BAtom</name>
- <regnode name="PartRegs" status="undefined">
- <value></value>
- <regnode name="Constraints" status="undefined">
- <value></value>
- <regnode name="Position" isopaque="yes">
- <value>170,149</value>
- </regnode>
- </regnode>
- <regnode name="UML" status="undefined">
- <value></value>
- <regnode name="Position" isopaque="yes">
- <value>170,149</value>
- </regnode>
- </regnode>
- </regnode>
- <attribute kind="Attributes" status="meta">
- <value></value>
- </attribute>
- <attribute kind="IsAbstract">
- <value>false</value>
- </attribute>
- <attribute kind="Stereotype">
- <value>Atom</value>
- </attribute>
- </atom>
- <atom id="id-0066-0000000a" kind="Class" role="Class" guid="{243FAB15-7A03-412b-8109-22315EDE745C}" relid="0x2">
- <name>BModel</name>
- <regnode name="PartRegs" status="undefined">
- <value></value>
- <regnode name="UML" status="undefined">
- <value></value>
- <regnode name="Position" isopaque="yes">
- <value>162,13</value>
- </regnode>
- </regnode>
- </regnode>
- <attribute kind="Attributes" status="meta">
- <value></value>
- </attribute>
- <attribute kind="IsAbstract">
- <value>false</value>
- </attribute>
- <attribute kind="Stereotype">
- <value>Model</value>
- </attribute>
- </atom>
- <connection id="id-0068-0000000b" kind="Composition" role="Composition" guid="{7692BE29-BED0-4cf5-888F-CA489E772860}" relid="0x3">
+ <connection id="id-0068-0000000c" kind="Sub" role="Sub" guid="{9bfc5659-9415-4e55-83cb-e2964f3f9583}" relid="0xb">
<name></name>
- <attribute kind="Cardinality">
- <value>0..*</value>
- </attribute>
- <attribute kind="ChildRole">
- <value></value>
- </attribute>
- <attribute kind="ParentRole" status="meta">
- <value></value>
- </attribute>
- <connpoint role="src" target="id-0066-00000009"/>
<connpoint role="dst" target="id-0066-0000000a"/>
+ <connpoint role="src" target="id-0066-0000000d"/>
</connection>
</model>
</model>
Modified: UDM/trunk/tests/test_ns2/main.cpp
==============================================================================
--- UDM/trunk/tests/test_ns2/main.cpp Tue Apr 24 16:11:11 2012 (r4041)
+++ UDM/trunk/tests/test_ns2/main.cpp Tue Apr 24 16:11:30 2012 (r4042)
@@ -18,6 +18,18 @@
CHost::A::DAtom d = CHost::A::DAtom::Create(cm);
d.name() = "A::DAtom obj";
+ CHost::C::C2Model c2m = CHost::C::C2Model::Create(rf);
+
+ CHost::A::AModel a2 = CHost::A::AModel::Create(c2m, CHost::C::C2Model::meta_Role1);
+ CHost::A::AModel a3 = CHost::A::AModel::Create(c2m, CHost::C::C2Model::meta_Role2);
+
+ std::set<CHost::A::AModel> role1s = (std::set<CHost::A::AModel>)c2m.Role1();
+ if (role1s.size() == 0)
+ throw udm_exception("role1s is empty");
+ std::set<CHost::A::AModel> role2s = (std::set<CHost::A::AModel>)c2m.Role2();
+ if (role2s.size() == 0)
+ throw udm_exception("role2s is empty");
+
out.CloseWithUpdate();
}
More information about the Mobies-commit
mailing list