summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Eidsness2014-06-24 08:41:30 (EDT)
committerAndrew Eidsness2014-06-24 08:41:30 (EDT)
commita5f196660d87ec2438d6d0cd7791ac32b5aa3c5b (patch)
treef3fedbd81c8910a0b79bc893275847d276e0c440
parenta72d17ac6495c592a4104c7afa3be504c4319680 (diff)
downloadorg.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.zip
org.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.tar.gz
org.eclipse.papyrus-a5f196660d87ec2438d6d0cd7791ac32b5aa3c5b.tar.bz2
Bug 422532: Create Volatile stereotyperefs/changes/23/28823/3
This fixes a problem where volatile was included in the EStorageClass enum. This does not match the C++ language spec and caused problems (see Bugs 425594, 425597, and 425598) when the StorageClass stereotype was applied to invalid language elements. I've removed volatile from that enum and removed the extension from StorageClass to Parameter and Property. I've also introduced a new Volatile stereotype and created new extensions that mirror the ones for Const. I've updated the code generator to use this stereotype in the same places that Const is currently checked. I also fixed a problem where const (and now volatile) was generated for static member functions. I've updated the TestCDTIntegration model but not the other ones yet. I would like to make sure this change is OK before making changes to the other two test models. When generating the profile I found that uml.ecore and types.ecore were not found. I've changed the C_Cpp.ecore file to use the platform: URIs for these references but I'm not convinced that is the right solution. I've also updated the namespace URI from /1 to /2. This change was needed to get existing models to reapply the profile. I think that is the expected method. Change-Id: Ic572ac6a549d2c2421632a2b66414066d366b608 Signed-off-by: Andrew Eidsness <andrewe@jfront.com>
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl396
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl700
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl12
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl160
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl52
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java39
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore112
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel290
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation323
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml200
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java9
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java126
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java57
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java108
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java11
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java48
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java123
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java289
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java18
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java21
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml40
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java4
28 files changed, 1856 insertions, 1304 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
index 00dc5ae..03689dc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl
@@ -88,7 +88,7 @@
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
</argument>
@@ -168,7 +168,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&#x9;"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
</argument>
@@ -291,7 +291,7 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1407" endPosition="1495" value="&#xA;return a list of owned attributes, since this is not supported directly on a classifier"/>
+ <body startPosition="1419" endPosition="1507" value="&#xA;return a list of owned attributes, since this is not supported directly on a classifier"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Query" name="getOwnedAttributes" visibility="Public" type="/3/Sequence(Property)">
<parameter name="cl">
@@ -400,7 +400,7 @@
</expression>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1952" endPosition="2091" value="&#xA;Loop over attributes. Check that the attribute is not a static const.&#xA;Constant static attributes are declared within the class declaration"/>
+ <body startPosition="1964" endPosition="2103" value="&#xA;Loop over attributes. Check that the attribute is not a static const.&#xA;Constant static attributes are declared within the class declaration"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppStaticAttributes" visibility="Public">
<body xsi:type="mtl:TemplateInvocation">
@@ -609,12 +609,12 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</eParameters>
</eOperations>
- <eOperations name="modConst">
+ <eOperations name="modCVQualifier">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="../../utils/Modifier.emtl#/0/modConst"/>
+ <references href="../../utils/Modifier.emtl#/0/modCVQualifier"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -1055,7 +1055,7 @@
</eAnnotations>
<eAnnotations source="positions.20" references="/0/CppAttributeDeclaration">
<details key="start" value="692"/>
- <details key="end" value="962"/>
+ <details key="end" value="968"/>
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.21" references="/0/CppAttributeDeclaration/%">
@@ -1085,7 +1085,7 @@
</eAnnotations>
<eAnnotations source="positions.26" references="/0/CppAttributeDeclaration/%.3">
<details key="start" value="792"/>
- <details key="end" value="802"/>
+ <details key="end" value="808"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.27" references="/0/CppAttributeDeclaration/%.3/self">
@@ -1094,23 +1094,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.28" references="/0/CppAttributeDeclaration/%.4">
- <details key="start" value="805"/>
- <details key="end" value="838"/>
+ <details key="start" value="811"/>
+ <details key="end" value="844"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.29" references="/0/CppAttributeDeclaration/%.4/%">
- <details key="start" value="805"/>
- <details key="end" value="819"/>
+ <details key="start" value="811"/>
+ <details key="end" value="825"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.30" references="/0/CppAttributeDeclaration/%.4/%/attribute">
- <details key="start" value="805"/>
- <details key="end" value="814"/>
+ <details key="start" value="811"/>
+ <details key="end" value="820"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.31" references="/0/CppAttributeDeclaration/%.5">
- <details key="start" value="841"/>
- <details key="end" value="849"/>
+ <details key="start" value="847"/>
+ <details key="end" value="855"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.32" references="/0/CppAttributeDeclaration/%.5/self">
@@ -1119,8 +1119,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.33" references="/0/CppAttributeDeclaration/%.6">
- <details key="start" value="852"/>
- <details key="end" value="860"/>
+ <details key="start" value="858"/>
+ <details key="end" value="866"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.34" references="/0/CppAttributeDeclaration/%.6/self">
@@ -1129,23 +1129,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.35" references="/0/CppAttributeDeclaration/%.7">
- <details key="start" value="862"/>
- <details key="end" value="863"/>
+ <details key="start" value="868"/>
+ <details key="end" value="869"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.36" references="/0/CppAttributeDeclaration/%.8">
- <details key="start" value="864"/>
- <details key="end" value="878"/>
+ <details key="start" value="870"/>
+ <details key="end" value="884"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.37" references="/0/CppAttributeDeclaration/%.8/attribute">
- <details key="start" value="864"/>
- <details key="end" value="873"/>
+ <details key="start" value="870"/>
+ <details key="end" value="879"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.38" references="/0/CppAttributeDeclaration/%.9">
- <details key="start" value="881"/>
- <details key="end" value="891"/>
+ <details key="start" value="887"/>
+ <details key="end" value="897"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.39" references="/0/CppAttributeDeclaration/%.9/self">
@@ -1154,13 +1154,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.40" references="/0/CppAttributeDeclaration/%.10">
- <details key="start" value="893"/>
- <details key="end" value="949"/>
+ <details key="start" value="899"/>
+ <details key="end" value="955"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.41" references="/0/CppAttributeDeclaration/%.10/%">
- <details key="start" value="928"/>
- <details key="end" value="942"/>
+ <details key="start" value="934"/>
+ <details key="end" value="948"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.42" references="/0/CppAttributeDeclaration/%.10/%/self">
@@ -1169,8 +1169,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.43" references="/0/CppAttributeDeclaration/%.10/%.1">
- <details key="start" value="897"/>
- <details key="end" value="926"/>
+ <details key="start" value="903"/>
+ <details key="end" value="932"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.44" references="/0/CppAttributeDeclaration/%.10/%.1/self">
@@ -1179,13 +1179,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.45" references="/0/CppAttributeDeclaration/%.10/%.1/%">
- <details key="start" value="912"/>
- <details key="end" value="924"/>
+ <details key="start" value="918"/>
+ <details key="end" value="930"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.46" references="/0/CppAttributeDeclaration/%.11">
- <details key="start" value="949"/>
- <details key="end" value="950"/>
+ <details key="start" value="955"/>
+ <details key="end" value="956"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.47" references="/0/CppAttributeDeclaration/attribute">
@@ -1194,18 +1194,18 @@
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.48" references="/0/CppAttributeImplementation">
- <details key="start" value="965"/>
- <details key="end" value="1168"/>
+ <details key="start" value="971"/>
+ <details key="end" value="1180"/>
<details key="line" value="25"/>
</eAnnotations>
<eAnnotations source="positions.49" references="/0/CppAttributeImplementation/%">
- <details key="start" value="1032"/>
- <details key="end" value="1033"/>
+ <details key="start" value="1038"/>
+ <details key="end" value="1039"/>
<details key="line" value="26"/>
</eAnnotations>
<eAnnotations source="positions.50" references="/0/CppAttributeImplementation/%.1">
- <details key="start" value="1034"/>
- <details key="end" value="1049"/>
+ <details key="start" value="1040"/>
+ <details key="end" value="1055"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.51" references="/0/CppAttributeImplementation/%.1/self">
@@ -1214,13 +1214,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.52" references="/0/CppAttributeImplementation/%.2">
- <details key="start" value="1051"/>
- <details key="end" value="1053"/>
+ <details key="start" value="1057"/>
+ <details key="end" value="1059"/>
<details key="line" value="27"/>
</eAnnotations>
<eAnnotations source="positions.53" references="/0/CppAttributeImplementation/%.3">
- <details key="start" value="1054"/>
- <details key="end" value="1064"/>
+ <details key="start" value="1060"/>
+ <details key="end" value="1076"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.54" references="/0/CppAttributeImplementation/%.3/self">
@@ -1229,23 +1229,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.55" references="/0/CppAttributeImplementation/%.4">
- <details key="start" value="1067"/>
- <details key="end" value="1100"/>
+ <details key="start" value="1079"/>
+ <details key="end" value="1112"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.56" references="/0/CppAttributeImplementation/%.4/%">
- <details key="start" value="1067"/>
- <details key="end" value="1081"/>
+ <details key="start" value="1079"/>
+ <details key="end" value="1093"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.57" references="/0/CppAttributeImplementation/%.4/%/attribute">
- <details key="start" value="1067"/>
- <details key="end" value="1076"/>
+ <details key="start" value="1079"/>
+ <details key="end" value="1088"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.58" references="/0/CppAttributeImplementation/%.5">
- <details key="start" value="1103"/>
- <details key="end" value="1111"/>
+ <details key="start" value="1115"/>
+ <details key="end" value="1123"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.59" references="/0/CppAttributeImplementation/%.5/self">
@@ -1254,8 +1254,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.60" references="/0/CppAttributeImplementation/%.6">
- <details key="start" value="1114"/>
- <details key="end" value="1122"/>
+ <details key="start" value="1126"/>
+ <details key="end" value="1134"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.61" references="/0/CppAttributeImplementation/%.6/self">
@@ -1264,23 +1264,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.62" references="/0/CppAttributeImplementation/%.7">
- <details key="start" value="1124"/>
- <details key="end" value="1125"/>
+ <details key="start" value="1136"/>
+ <details key="end" value="1137"/>
<details key="line" value="27"/>
</eAnnotations>
<eAnnotations source="positions.63" references="/0/CppAttributeImplementation/%.8">
- <details key="start" value="1126"/>
- <details key="end" value="1140"/>
+ <details key="start" value="1138"/>
+ <details key="end" value="1152"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.64" references="/0/CppAttributeImplementation/%.8/attribute">
- <details key="start" value="1126"/>
- <details key="end" value="1135"/>
+ <details key="start" value="1138"/>
+ <details key="end" value="1147"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.65" references="/0/CppAttributeImplementation/%.9">
- <details key="start" value="1143"/>
- <details key="end" value="1153"/>
+ <details key="start" value="1155"/>
+ <details key="end" value="1165"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.66" references="/0/CppAttributeImplementation/%.9/self">
@@ -1289,23 +1289,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.67" references="/0/CppAttributeImplementation/%.10">
- <details key="start" value="1155"/>
- <details key="end" value="1156"/>
+ <details key="start" value="1167"/>
+ <details key="end" value="1168"/>
<details key="line" value="27"/>
</eAnnotations>
<eAnnotations source="positions.68" references="/0/CppAttributeImplementation/attribute">
- <details key="start" value="1009"/>
- <details key="end" value="1029"/>
+ <details key="start" value="1015"/>
+ <details key="end" value="1035"/>
<details key="line" value="25"/>
</eAnnotations>
<eAnnotations source="positions.69" references="/0/CppStaticAttributeImplementation">
- <details key="start" value="1170"/>
- <details key="end" value="1396"/>
+ <details key="start" value="1182"/>
+ <details key="end" value="1408"/>
<details key="line" value="30"/>
</eAnnotations>
<eAnnotations source="positions.70" references="/0/CppStaticAttributeImplementation/%">
- <details key="start" value="1244"/>
- <details key="end" value="1259"/>
+ <details key="start" value="1256"/>
+ <details key="end" value="1271"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.71" references="/0/CppStaticAttributeImplementation/%/self">
@@ -1314,18 +1314,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.72" references="/0/CppStaticAttributeImplementation/%.1">
- <details key="start" value="1261"/>
- <details key="end" value="1262"/>
+ <details key="start" value="1273"/>
+ <details key="end" value="1274"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.73" references="/0/CppStaticAttributeImplementation/%.2">
- <details key="start" value="1263"/>
- <details key="end" value="1286"/>
+ <details key="start" value="1275"/>
+ <details key="end" value="1298"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.74" references="/0/CppStaticAttributeImplementation/%.2/%">
- <details key="start" value="1263"/>
- <details key="end" value="1267"/>
+ <details key="start" value="1275"/>
+ <details key="end" value="1279"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.75" references="/0/CppStaticAttributeImplementation/%.2/%/self">
@@ -1334,8 +1334,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.76" references="/0/CppStaticAttributeImplementation/%.3">
- <details key="start" value="1289"/>
- <details key="end" value="1297"/>
+ <details key="start" value="1301"/>
+ <details key="end" value="1309"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.77" references="/0/CppStaticAttributeImplementation/%.3/self">
@@ -1344,8 +1344,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.78" references="/0/CppStaticAttributeImplementation/%.4">
- <details key="start" value="1300"/>
- <details key="end" value="1308"/>
+ <details key="start" value="1312"/>
+ <details key="end" value="1320"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.79" references="/0/CppStaticAttributeImplementation/%.4/self">
@@ -1354,43 +1354,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.80" references="/0/CppStaticAttributeImplementation/%.5">
- <details key="start" value="1310"/>
- <details key="end" value="1311"/>
+ <details key="start" value="1322"/>
+ <details key="end" value="1323"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.81" references="/0/CppStaticAttributeImplementation/%.6">
- <details key="start" value="1312"/>
- <details key="end" value="1332"/>
+ <details key="start" value="1324"/>
+ <details key="end" value="1344"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.82" references="/0/CppStaticAttributeImplementation/%.6/%">
- <details key="start" value="1312"/>
- <details key="end" value="1327"/>
+ <details key="start" value="1324"/>
+ <details key="end" value="1339"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.83" references="/0/CppStaticAttributeImplementation/%.6/%/attribute">
- <details key="start" value="1312"/>
- <details key="end" value="1321"/>
+ <details key="start" value="1324"/>
+ <details key="end" value="1333"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.84" references="/0/CppStaticAttributeImplementation/%.7">
- <details key="start" value="1334"/>
- <details key="end" value="1336"/>
+ <details key="start" value="1346"/>
+ <details key="end" value="1348"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.85" references="/0/CppStaticAttributeImplementation/%.8">
- <details key="start" value="1337"/>
- <details key="end" value="1351"/>
+ <details key="start" value="1349"/>
+ <details key="end" value="1363"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.86" references="/0/CppStaticAttributeImplementation/%.8/attribute">
- <details key="start" value="1337"/>
- <details key="end" value="1346"/>
+ <details key="start" value="1349"/>
+ <details key="end" value="1358"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.87" references="/0/CppStaticAttributeImplementation/%.9">
- <details key="start" value="1354"/>
- <details key="end" value="1364"/>
+ <details key="start" value="1366"/>
+ <details key="end" value="1376"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.88" references="/0/CppStaticAttributeImplementation/%.9/self">
@@ -1399,8 +1399,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.89" references="/0/CppStaticAttributeImplementation/%.10">
- <details key="start" value="1367"/>
- <details key="end" value="1381"/>
+ <details key="start" value="1379"/>
+ <details key="end" value="1393"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.90" references="/0/CppStaticAttributeImplementation/%.10/self">
@@ -1409,58 +1409,58 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.91" references="/0/CppStaticAttributeImplementation/%.11">
- <details key="start" value="1383"/>
- <details key="end" value="1384"/>
+ <details key="start" value="1395"/>
+ <details key="end" value="1396"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.92" references="/0/CppStaticAttributeImplementation/attribute">
- <details key="start" value="1220"/>
- <details key="end" value="1240"/>
+ <details key="start" value="1232"/>
+ <details key="end" value="1252"/>
<details key="line" value="30"/>
</eAnnotations>
<eAnnotations source="positions.93" references="/0/%">
- <details key="start" value="1399"/>
- <details key="end" value="1497"/>
+ <details key="start" value="1411"/>
+ <details key="end" value="1509"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.94" references="/0/getOwnedAttributes">
- <details key="start" value="1498"/>
- <details key="end" value="1941"/>
+ <details key="start" value="1510"/>
+ <details key="end" value="1953"/>
<details key="line" value="38"/>
</eAnnotations>
<eAnnotations source="positions.95" references="/0/getOwnedAttributes/cl">
- <details key="start" value="1531"/>
- <details key="end" value="1546"/>
+ <details key="start" value="1543"/>
+ <details key="end" value="1558"/>
<details key="line" value="38"/>
</eAnnotations>
<eAnnotations source="positions.96" references="/0/getOwnedAttributes/%">
- <details key="start" value="1572"/>
- <details key="end" value="1938"/>
+ <details key="start" value="1584"/>
+ <details key="end" value="1950"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.97" references="/0/getOwnedAttributes/%/%">
- <details key="start" value="1575"/>
- <details key="end" value="1596"/>
+ <details key="start" value="1587"/>
+ <details key="end" value="1608"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.98" references="/0/getOwnedAttributes/%/%/cl">
- <details key="start" value="1575"/>
- <details key="end" value="1577"/>
+ <details key="start" value="1587"/>
+ <details key="end" value="1589"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.99" references="/0/getOwnedAttributes/%/%/%">
- <details key="start" value="1590"/>
- <details key="end" value="1595"/>
+ <details key="start" value="1602"/>
+ <details key="end" value="1607"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.100" references="/0/getOwnedAttributes/%/%.1">
- <details key="start" value="1604"/>
- <details key="end" value="1635"/>
+ <details key="start" value="1616"/>
+ <details key="end" value="1647"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.101" references="/0/getOwnedAttributes/%/%.1/%">
- <details key="start" value="1604"/>
- <details key="end" value="1620"/>
+ <details key="start" value="1616"/>
+ <details key="end" value="1632"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.102" references="/0/getOwnedAttributes/%/%.1/%/self">
@@ -1469,38 +1469,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.103" references="/0/getOwnedAttributes/%/%.1/%/%">
- <details key="start" value="1614"/>
- <details key="end" value="1619"/>
+ <details key="start" value="1626"/>
+ <details key="end" value="1631"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.104" references="/0/getOwnedAttributes/%/%.2">
- <details key="start" value="1644"/>
- <details key="end" value="1931"/>
+ <details key="start" value="1656"/>
+ <details key="end" value="1943"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.105" references="/0/getOwnedAttributes/%/%.2/%">
- <details key="start" value="1647"/>
- <details key="end" value="1671"/>
+ <details key="start" value="1659"/>
+ <details key="end" value="1683"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.106" references="/0/getOwnedAttributes/%/%.2/%/cl">
- <details key="start" value="1647"/>
- <details key="end" value="1649"/>
+ <details key="start" value="1659"/>
+ <details key="end" value="1661"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.107" references="/0/getOwnedAttributes/%/%.2/%/%">
- <details key="start" value="1662"/>
- <details key="end" value="1670"/>
+ <details key="start" value="1674"/>
+ <details key="end" value="1682"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.108" references="/0/getOwnedAttributes/%/%.2/%.1">
- <details key="start" value="1680"/>
- <details key="end" value="1714"/>
+ <details key="start" value="1692"/>
+ <details key="end" value="1726"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.109" references="/0/getOwnedAttributes/%/%.2/%.1/%">
- <details key="start" value="1680"/>
- <details key="end" value="1699"/>
+ <details key="start" value="1692"/>
+ <details key="end" value="1711"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.110" references="/0/getOwnedAttributes/%/%.2/%.1/%/self">
@@ -1509,38 +1509,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.111" references="/0/getOwnedAttributes/%/%.2/%.1/%/%">
- <details key="start" value="1690"/>
- <details key="end" value="1698"/>
+ <details key="start" value="1702"/>
+ <details key="end" value="1710"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.112" references="/0/getOwnedAttributes/%/%.2/%.2">
- <details key="start" value="1725"/>
- <details key="end" value="1923"/>
+ <details key="start" value="1737"/>
+ <details key="end" value="1935"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.113" references="/0/getOwnedAttributes/%/%.2/%.2/%">
- <details key="start" value="1728"/>
- <details key="end" value="1753"/>
+ <details key="start" value="1740"/>
+ <details key="end" value="1765"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.114" references="/0/getOwnedAttributes/%/%.2/%.2/%/cl">
- <details key="start" value="1728"/>
- <details key="end" value="1730"/>
+ <details key="start" value="1740"/>
+ <details key="end" value="1742"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.115" references="/0/getOwnedAttributes/%/%.2/%.2/%/%">
- <details key="start" value="1743"/>
- <details key="end" value="1752"/>
+ <details key="start" value="1755"/>
+ <details key="end" value="1764"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.116" references="/0/getOwnedAttributes/%/%.2/%.2/%.1">
- <details key="start" value="1763"/>
- <details key="end" value="1798"/>
+ <details key="start" value="1775"/>
+ <details key="end" value="1810"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.117" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%">
- <details key="start" value="1763"/>
- <details key="end" value="1783"/>
+ <details key="start" value="1775"/>
+ <details key="end" value="1795"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.118" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/self">
@@ -1549,38 +1549,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.119" references="/0/getOwnedAttributes/%/%.2/%.2/%.1/%/%">
- <details key="start" value="1773"/>
- <details key="end" value="1782"/>
+ <details key="start" value="1785"/>
+ <details key="end" value="1794"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.120" references="/0/getOwnedAttributes/%/%.2/%.2/%.2">
- <details key="start" value="1811"/>
- <details key="end" value="1914"/>
+ <details key="start" value="1823"/>
+ <details key="end" value="1926"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.121" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%">
- <details key="start" value="1814"/>
- <details key="end" value="1836"/>
+ <details key="start" value="1826"/>
+ <details key="end" value="1848"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.122" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/cl">
- <details key="start" value="1814"/>
- <details key="end" value="1816"/>
+ <details key="start" value="1826"/>
+ <details key="end" value="1828"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.123" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%/%">
- <details key="start" value="1829"/>
- <details key="end" value="1835"/>
+ <details key="start" value="1841"/>
+ <details key="end" value="1847"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.124" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1">
- <details key="start" value="1847"/>
- <details key="end" value="1879"/>
+ <details key="start" value="1859"/>
+ <details key="end" value="1891"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.125" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%">
- <details key="start" value="1847"/>
- <details key="end" value="1864"/>
+ <details key="start" value="1859"/>
+ <details key="end" value="1876"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.126" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/self">
@@ -1589,28 +1589,28 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.127" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.1/%/%">
- <details key="start" value="1857"/>
- <details key="end" value="1863"/>
+ <details key="start" value="1869"/>
+ <details key="end" value="1875"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.128" references="/0/getOwnedAttributes/%/%.2/%.2/%.2/%.2">
- <details key="start" value="1894"/>
- <details key="end" value="1904"/>
+ <details key="start" value="1906"/>
+ <details key="end" value="1916"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.129" references="/0/%.1">
- <details key="start" value="1944"/>
- <details key="end" value="2093"/>
+ <details key="start" value="1956"/>
+ <details key="end" value="2105"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.130" references="/0/CppStaticAttributes">
- <details key="start" value="2095"/>
- <details key="end" value="2332"/>
+ <details key="start" value="2107"/>
+ <details key="end" value="2344"/>
<details key="line" value="62"/>
</eAnnotations>
<eAnnotations source="positions.131" references="/0/CppStaticAttributes/%">
- <details key="start" value="2159"/>
- <details key="end" value="2182"/>
+ <details key="start" value="2171"/>
+ <details key="end" value="2194"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.132" references="/0/CppStaticAttributes/%/self">
@@ -1619,23 +1619,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.133" references="/0/CppStaticAttributes/%.1">
- <details key="start" value="2184"/>
- <details key="end" value="2185"/>
+ <details key="start" value="2196"/>
+ <details key="end" value="2197"/>
<details key="line" value="64"/>
</eAnnotations>
<eAnnotations source="positions.134" references="/0/CppStaticAttributes/%.2">
- <details key="start" value="2185"/>
- <details key="end" value="2320"/>
+ <details key="start" value="2197"/>
+ <details key="end" value="2332"/>
<details key="line" value="64"/>
</eAnnotations>
<eAnnotations source="positions.135" references="/0/CppStaticAttributes/%.2/%">
- <details key="start" value="2215"/>
- <details key="end" value="2313"/>
+ <details key="start" value="2227"/>
+ <details key="end" value="2325"/>
<details key="line" value="65"/>
</eAnnotations>
<eAnnotations source="positions.136" references="/0/CppStaticAttributes/%.2/%/%">
- <details key="start" value="2269"/>
- <details key="end" value="2303"/>
+ <details key="start" value="2281"/>
+ <details key="end" value="2315"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.137" references="/0/CppStaticAttributes/%.2/%/%/self">
@@ -1644,18 +1644,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.138" references="/0/CppStaticAttributes/%.2/%/%.1">
- <details key="start" value="2305"/>
- <details key="end" value="2307"/>
+ <details key="start" value="2317"/>
+ <details key="end" value="2319"/>
<details key="line" value="67"/>
</eAnnotations>
<eAnnotations source="positions.139" references="/0/CppStaticAttributes/%.2/%/%.2">
- <details key="start" value="2218"/>
- <details key="end" value="2266"/>
+ <details key="start" value="2230"/>
+ <details key="end" value="2278"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.140" references="/0/CppStaticAttributes/%.2/%/%.2/%">
- <details key="start" value="2219"/>
- <details key="end" value="2227"/>
+ <details key="start" value="2231"/>
+ <details key="end" value="2239"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.141" references="/0/CppStaticAttributes/%.2/%/%.2/%/self">
@@ -1664,13 +1664,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.142" references="/0/CppStaticAttributes/%.2/%/%.2/%.1">
- <details key="start" value="2232"/>
- <details key="end" value="2265"/>
+ <details key="start" value="2244"/>
+ <details key="end" value="2277"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.143" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%">
- <details key="start" value="2237"/>
- <details key="end" value="2264"/>
+ <details key="start" value="2249"/>
+ <details key="end" value="2276"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.144" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/self">
@@ -1679,13 +1679,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.145" references="/0/CppStaticAttributes/%.2/%/%.2/%.1/%/%">
- <details key="start" value="2251"/>
- <details key="end" value="2263"/>
+ <details key="start" value="2263"/>
+ <details key="end" value="2275"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.146" references="/0/CppStaticAttributes/%.2/%.1">
- <details key="start" value="2191"/>
- <details key="end" value="2211"/>
+ <details key="start" value="2203"/>
+ <details key="end" value="2223"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.147" references="/0/CppStaticAttributes/%.2/%.1/self">
@@ -1694,8 +1694,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.148" references="/0/CppStaticAttributes/classifier">
- <details key="start" value="2132"/>
- <details key="end" value="2155"/>
+ <details key="start" value="2144"/>
+ <details key="end" value="2167"/>
<details key="line" value="62"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
index d2b364f..d94e14d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
@@ -18,13 +18,13 @@
[template public CppAttributeDeclaration(attribute : Property)]
[CppElementDoc()/]
-[staticValue()/][modConst()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if];
+[staticValue()/][modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/][if (hasStereotype(C_Cpp::Const))][defaultValue()/][/if];
[/template]
[template public CppAttributeImplementation(attribute : Property)]
[CppElementDoc()/]
- [modConst()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
+ [modCVQualifier()/][attribute.type.cppQualifiedName()/][modPtr()/][modRef()/] [attribute.name/][modArray()/];
[/template]
[template public CppStaticAttributeImplementation(attribute : Property)]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
index 5a9f299..151d49f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
@@ -319,7 +319,7 @@
</source>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect/temp1">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
</argument>
@@ -403,7 +403,7 @@
<else>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="mtl:QueryInvocation">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
@@ -550,7 +550,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/67">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
</argument>
@@ -608,7 +608,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/>
</argument>
@@ -622,7 +622,7 @@
<body xsi:type="mtl:IfBlock">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" : "/>
<body xsi:type="ocl.ecore:PropertyCallExp">
- <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<source xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/>
<source xsi:type="mtl:QueryInvocation">
@@ -672,7 +672,7 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="3141" endPosition="3211" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
+ <body startPosition="3165" endPosition="3235" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="getBodyInTemplate" visibility="Public">
<body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/trim">
@@ -878,7 +878,7 @@
</body>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/120">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/>
</argument>
@@ -954,7 +954,7 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/132">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/>
</argument>
@@ -1287,12 +1287,12 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</eParameters>
</eOperations>
- <eOperations name="modConst">
+ <eOperations name="modCVQualifier">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -2332,12 +2332,12 @@
</eAnnotations>
<eAnnotations source="positions.84" references="/0/CppReturnSpec">
<details key="start" value="1792"/>
- <details key="end" value="2045"/>
+ <details key="end" value="2051"/>
<details key="line" value="57"/>
</eAnnotations>
<eAnnotations source="positions.85" references="/0/CppReturnSpec/%">
<details key="start" value="1847"/>
- <details key="end" value="2033"/>
+ <details key="end" value="2039"/>
<details key="line" value="58"/>
</eAnnotations>
<eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%">
@@ -2387,12 +2387,12 @@
</eAnnotations>
<eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2">
<details key="start" value="1914"/>
- <details key="end" value="2028"/>
+ <details key="end" value="2034"/>
<details key="line" value="58"/>
</eAnnotations>
<eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect">
<details key="start" value="1921"/>
- <details key="end" value="1946"/>
+ <details key="end" value="1952"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect/%">
@@ -2421,18 +2421,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/%">
- <details key="start" value="1948"/>
- <details key="end" value="1949"/>
+ <details key="start" value="1954"/>
+ <details key="end" value="1955"/>
<details key="line" value="58"/>
</eAnnotations>
<eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/%.1">
- <details key="start" value="1950"/>
- <details key="end" value="1973"/>
+ <details key="start" value="1956"/>
+ <details key="end" value="1979"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/%.1/%">
- <details key="start" value="1950"/>
- <details key="end" value="1954"/>
+ <details key="start" value="1956"/>
+ <details key="end" value="1960"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
@@ -2441,13 +2441,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.106" references="/0/CppReturnSpec/%/%.2/collect.1">
- <details key="start" value="1976"/>
- <details key="end" value="1999"/>
+ <details key="start" value="1982"/>
+ <details key="end" value="2005"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.107" references="/0/CppReturnSpec/%/%.2/collect.1/%">
- <details key="start" value="1976"/>
- <details key="end" value="1990"/>
+ <details key="start" value="1982"/>
+ <details key="end" value="1996"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.108" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
@@ -2471,13 +2471,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.112" references="/0/CppReturnSpec/%/%.2/collect.2">
- <details key="start" value="2002"/>
- <details key="end" value="2025"/>
+ <details key="start" value="2008"/>
+ <details key="end" value="2031"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.113" references="/0/CppReturnSpec/%/%.2/collect.2/%">
- <details key="start" value="2002"/>
- <details key="end" value="2016"/>
+ <details key="start" value="2008"/>
+ <details key="end" value="2022"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.114" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
@@ -2501,8 +2501,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.118" references="/0/CppReturnSpec/%/%.2/%.2">
- <details key="start" value="2027"/>
- <details key="end" value="2028"/>
+ <details key="start" value="2033"/>
+ <details key="end" value="2034"/>
<details key="line" value="58"/>
</eAnnotations>
<eAnnotations source="positions.119" references="/0/CppReturnSpec/operation">
@@ -2511,28 +2511,28 @@
<details key="line" value="57"/>
</eAnnotations>
<eAnnotations source="positions.120" references="/0/CppReturnSpec.1">
- <details key="start" value="2048"/>
- <details key="end" value="2280"/>
+ <details key="start" value="2054"/>
+ <details key="end" value="2292"/>
<details key="line" value="62"/>
</eAnnotations>
<eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%">
- <details key="start" value="2101"/>
- <details key="end" value="2268"/>
+ <details key="start" value="2107"/>
+ <details key="end" value="2280"/>
<details key="line" value="63"/>
</eAnnotations>
<eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%">
- <details key="start" value="2129"/>
- <details key="end" value="2134"/>
+ <details key="start" value="2135"/>
+ <details key="end" value="2140"/>
<details key="line" value="63"/>
</eAnnotations>
<eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.1">
- <details key="start" value="2105"/>
- <details key="end" value="2128"/>
+ <details key="start" value="2111"/>
+ <details key="end" value="2134"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.1/%">
- <details key="start" value="2106"/>
- <details key="end" value="2120"/>
+ <details key="start" value="2112"/>
+ <details key="end" value="2126"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.1/%/self">
@@ -2541,23 +2541,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.1/%.1">
- <details key="start" value="2123"/>
- <details key="end" value="2127"/>
+ <details key="start" value="2129"/>
+ <details key="end" value="2133"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2">
- <details key="start" value="2134"/>
- <details key="end" value="2263"/>
+ <details key="start" value="2140"/>
+ <details key="end" value="2275"/>
<details key="line" value="63"/>
</eAnnotations>
<eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%">
- <details key="start" value="2141"/>
- <details key="end" value="2166"/>
+ <details key="start" value="2147"/>
+ <details key="end" value="2178"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%/%">
- <details key="start" value="2141"/>
- <details key="end" value="2155"/>
+ <details key="start" value="2147"/>
+ <details key="end" value="2161"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.130" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
@@ -2566,23 +2566,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.131" references="/0/CppReturnSpec.1/%/%.2/%.1">
- <details key="start" value="2168"/>
- <details key="end" value="2169"/>
+ <details key="start" value="2180"/>
+ <details key="end" value="2181"/>
<details key="line" value="63"/>
</eAnnotations>
<eAnnotations source="positions.132" references="/0/CppReturnSpec.1/%/%.2/%.2">
- <details key="start" value="2170"/>
- <details key="end" value="2208"/>
+ <details key="start" value="2182"/>
+ <details key="end" value="2220"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.133" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
- <details key="start" value="2170"/>
- <details key="end" value="2189"/>
+ <details key="start" value="2182"/>
+ <details key="end" value="2201"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.134" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
- <details key="start" value="2170"/>
- <details key="end" value="2184"/>
+ <details key="start" value="2182"/>
+ <details key="end" value="2196"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.135" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
@@ -2591,13 +2591,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.136" references="/0/CppReturnSpec.1/%/%.2/%.3">
- <details key="start" value="2211"/>
- <details key="end" value="2234"/>
+ <details key="start" value="2223"/>
+ <details key="end" value="2246"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.137" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
- <details key="start" value="2211"/>
- <details key="end" value="2225"/>
+ <details key="start" value="2223"/>
+ <details key="end" value="2237"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.138" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
@@ -2606,13 +2606,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.139" references="/0/CppReturnSpec.1/%/%.2/%.4">
- <details key="start" value="2237"/>
- <details key="end" value="2260"/>
+ <details key="start" value="2249"/>
+ <details key="end" value="2272"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.140" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
- <details key="start" value="2237"/>
- <details key="end" value="2251"/>
+ <details key="start" value="2249"/>
+ <details key="end" value="2263"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.141" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
@@ -2621,33 +2621,33 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.142" references="/0/CppReturnSpec.1/%/%.2/%.5">
- <details key="start" value="2262"/>
- <details key="end" value="2263"/>
+ <details key="start" value="2274"/>
+ <details key="end" value="2275"/>
<details key="line" value="63"/>
</eAnnotations>
<eAnnotations source="positions.143" references="/0/CppReturnSpec.1/behavior">
- <details key="start" value="2079"/>
- <details key="end" value="2098"/>
+ <details key="start" value="2085"/>
+ <details key="end" value="2104"/>
<details key="line" value="62"/>
</eAnnotations>
<eAnnotations source="positions.144" references="/0/InlineTxt">
- <details key="start" value="2283"/>
- <details key="end" value="2382"/>
+ <details key="start" value="2295"/>
+ <details key="end" value="2394"/>
<details key="line" value="67"/>
</eAnnotations>
<eAnnotations source="positions.145" references="/0/InlineTxt/%">
- <details key="start" value="2330"/>
- <details key="end" value="2370"/>
+ <details key="start" value="2342"/>
+ <details key="end" value="2382"/>
<details key="line" value="68"/>
</eAnnotations>
<eAnnotations source="positions.146" references="/0/InlineTxt/%/%">
- <details key="start" value="2358"/>
- <details key="end" value="2365"/>
+ <details key="start" value="2370"/>
+ <details key="end" value="2377"/>
<details key="line" value="68"/>
</eAnnotations>
<eAnnotations source="positions.147" references="/0/InlineTxt/%/%.1">
- <details key="start" value="2334"/>
- <details key="end" value="2357"/>
+ <details key="start" value="2346"/>
+ <details key="end" value="2369"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.148" references="/0/InlineTxt/%/%.1/self">
@@ -2656,33 +2656,33 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.149" references="/0/InlineTxt/%/%.1/%">
- <details key="start" value="2349"/>
- <details key="end" value="2355"/>
+ <details key="start" value="2361"/>
+ <details key="end" value="2367"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.150" references="/0/InlineTxt/element">
- <details key="start" value="2310"/>
- <details key="end" value="2327"/>
+ <details key="start" value="2322"/>
+ <details key="end" value="2339"/>
<details key="line" value="67"/>
</eAnnotations>
<eAnnotations source="positions.151" references="/0/staticTxt">
- <details key="start" value="2385"/>
- <details key="end" value="2475"/>
+ <details key="start" value="2397"/>
+ <details key="end" value="2487"/>
<details key="line" value="72"/>
</eAnnotations>
<eAnnotations source="positions.152" references="/0/staticTxt/%">
- <details key="start" value="2436"/>
- <details key="end" value="2463"/>
+ <details key="start" value="2448"/>
+ <details key="end" value="2475"/>
<details key="line" value="73"/>
</eAnnotations>
<eAnnotations source="positions.153" references="/0/staticTxt/%/%">
- <details key="start" value="2451"/>
- <details key="end" value="2458"/>
+ <details key="start" value="2463"/>
+ <details key="end" value="2470"/>
<details key="line" value="73"/>
</eAnnotations>
<eAnnotations source="positions.154" references="/0/staticTxt/%/%.1">
- <details key="start" value="2440"/>
- <details key="end" value="2450"/>
+ <details key="start" value="2452"/>
+ <details key="end" value="2462"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.155" references="/0/staticTxt/%/%.1/self">
@@ -2691,18 +2691,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.156" references="/0/staticTxt/operation">
- <details key="start" value="2412"/>
- <details key="end" value="2433"/>
+ <details key="start" value="2424"/>
+ <details key="end" value="2445"/>
<details key="line" value="72"/>
</eAnnotations>
<eAnnotations source="positions.157" references="/0/CppOperationDeclaration">
- <details key="start" value="2477"/>
- <details key="end" value="2733"/>
+ <details key="start" value="2489"/>
+ <details key="end" value="2751"/>
<details key="line" value="76"/>
</eAnnotations>
<eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%">
- <details key="start" value="2543"/>
- <details key="end" value="2560"/>
+ <details key="start" value="2555"/>
+ <details key="end" value="2572"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%/self">
@@ -2711,13 +2711,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.1">
- <details key="start" value="2562"/>
- <details key="end" value="2563"/>
+ <details key="start" value="2574"/>
+ <details key="end" value="2575"/>
<details key="line" value="78"/>
</eAnnotations>
<eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.2">
- <details key="start" value="2564"/>
- <details key="end" value="2575"/>
+ <details key="start" value="2576"/>
+ <details key="end" value="2587"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.2/self">
@@ -2726,8 +2726,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.3">
- <details key="start" value="2578"/>
- <details key="end" value="2590"/>
+ <details key="start" value="2590"/>
+ <details key="end" value="2602"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.3/self">
@@ -2736,8 +2736,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.4">
- <details key="start" value="2593"/>
- <details key="end" value="2604"/>
+ <details key="start" value="2605"/>
+ <details key="end" value="2616"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.4/self">
@@ -2746,8 +2746,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.5">
- <details key="start" value="2607"/>
- <details key="end" value="2622"/>
+ <details key="start" value="2619"/>
+ <details key="end" value="2634"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.5/self">
@@ -2756,8 +2756,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.6">
- <details key="start" value="2625"/>
- <details key="end" value="2637"/>
+ <details key="start" value="2637"/>
+ <details key="end" value="2649"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.170" references="/0/CppOperationDeclaration/%.6/self">
@@ -2766,23 +2766,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.171" references="/0/CppOperationDeclaration/%.7">
- <details key="start" value="2640"/>
- <details key="end" value="2654"/>
+ <details key="start" value="2652"/>
+ <details key="end" value="2666"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.172" references="/0/CppOperationDeclaration/%.7/operation">
- <details key="start" value="2640"/>
- <details key="end" value="2649"/>
+ <details key="start" value="2652"/>
+ <details key="end" value="2661"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.173" references="/0/CppOperationDeclaration/%.8">
- <details key="start" value="2656"/>
- <details key="end" value="2657"/>
+ <details key="start" value="2668"/>
+ <details key="end" value="2669"/>
<details key="line" value="78"/>
</eAnnotations>
<eAnnotations source="positions.174" references="/0/CppOperationDeclaration/%.9">
- <details key="start" value="2658"/>
- <details key="end" value="2686"/>
+ <details key="start" value="2670"/>
+ <details key="end" value="2698"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.175" references="/0/CppOperationDeclaration/%.9/self">
@@ -2791,18 +2791,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.176" references="/0/CppOperationDeclaration/%.9/%">
- <details key="start" value="2681"/>
- <details key="end" value="2685"/>
+ <details key="start" value="2693"/>
+ <details key="end" value="2697"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.177" references="/0/CppOperationDeclaration/%.10">
- <details key="start" value="2688"/>
- <details key="end" value="2689"/>
+ <details key="start" value="2700"/>
+ <details key="end" value="2701"/>
<details key="line" value="78"/>
</eAnnotations>
<eAnnotations source="positions.178" references="/0/CppOperationDeclaration/%.11">
- <details key="start" value="2690"/>
- <details key="end" value="2700"/>
+ <details key="start" value="2702"/>
+ <details key="end" value="2718"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.179" references="/0/CppOperationDeclaration/%.11/self">
@@ -2811,8 +2811,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.180" references="/0/CppOperationDeclaration/%.12">
- <details key="start" value="2703"/>
- <details key="end" value="2718"/>
+ <details key="start" value="2721"/>
+ <details key="end" value="2736"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.181" references="/0/CppOperationDeclaration/%.12/self">
@@ -2821,23 +2821,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.182" references="/0/CppOperationDeclaration/%.13">
- <details key="start" value="2720"/>
- <details key="end" value="2721"/>
+ <details key="start" value="2738"/>
+ <details key="end" value="2739"/>
<details key="line" value="78"/>
</eAnnotations>
<eAnnotations source="positions.183" references="/0/CppOperationDeclaration/operation">
- <details key="start" value="2518"/>
- <details key="end" value="2539"/>
+ <details key="start" value="2530"/>
+ <details key="end" value="2551"/>
<details key="line" value="76"/>
</eAnnotations>
<eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration">
- <details key="start" value="2735"/>
- <details key="end" value="2923"/>
+ <details key="start" value="2753"/>
+ <details key="end" value="2947"/>
<details key="line" value="81"/>
</eAnnotations>
<eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%">
- <details key="start" value="2798"/>
- <details key="end" value="2814"/>
+ <details key="start" value="2816"/>
+ <details key="end" value="2832"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%/self">
@@ -2846,13 +2846,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.1">
- <details key="start" value="2816"/>
- <details key="end" value="2817"/>
+ <details key="start" value="2834"/>
+ <details key="end" value="2835"/>
<details key="line" value="83"/>
</eAnnotations>
<eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.2">
- <details key="start" value="2818"/>
- <details key="end" value="2829"/>
+ <details key="start" value="2836"/>
+ <details key="end" value="2847"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/%.2/self">
@@ -2861,8 +2861,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.190" references="/0/CppBehaviorDeclaration/%.3">
- <details key="start" value="2832"/>
- <details key="end" value="2847"/>
+ <details key="start" value="2850"/>
+ <details key="end" value="2865"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.191" references="/0/CppBehaviorDeclaration/%.3/self">
@@ -2871,23 +2871,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.192" references="/0/CppBehaviorDeclaration/%.4">
- <details key="start" value="2850"/>
- <details key="end" value="2863"/>
+ <details key="start" value="2868"/>
+ <details key="end" value="2881"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.193" references="/0/CppBehaviorDeclaration/%.4/behavior">
- <details key="start" value="2850"/>
- <details key="end" value="2858"/>
+ <details key="start" value="2868"/>
+ <details key="end" value="2876"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.194" references="/0/CppBehaviorDeclaration/%.5">
- <details key="start" value="2865"/>
- <details key="end" value="2866"/>
+ <details key="start" value="2883"/>
+ <details key="end" value="2884"/>
<details key="line" value="83"/>
</eAnnotations>
<eAnnotations source="positions.195" references="/0/CppBehaviorDeclaration/%.6">
- <details key="start" value="2867"/>
- <details key="end" value="2894"/>
+ <details key="start" value="2885"/>
+ <details key="end" value="2912"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.196" references="/0/CppBehaviorDeclaration/%.6/self">
@@ -2896,18 +2896,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.197" references="/0/CppBehaviorDeclaration/%.6/%">
- <details key="start" value="2889"/>
- <details key="end" value="2893"/>
+ <details key="start" value="2907"/>
+ <details key="end" value="2911"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.198" references="/0/CppBehaviorDeclaration/%.7">
- <details key="start" value="2896"/>
- <details key="end" value="2897"/>
+ <details key="start" value="2914"/>
+ <details key="end" value="2915"/>
<details key="line" value="83"/>
</eAnnotations>
<eAnnotations source="positions.199" references="/0/CppBehaviorDeclaration/%.8">
- <details key="start" value="2898"/>
- <details key="end" value="2908"/>
+ <details key="start" value="2916"/>
+ <details key="end" value="2932"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.200" references="/0/CppBehaviorDeclaration/%.8/self">
@@ -2916,43 +2916,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.201" references="/0/CppBehaviorDeclaration/%.9">
- <details key="start" value="2910"/>
- <details key="end" value="2911"/>
+ <details key="start" value="2934"/>
+ <details key="end" value="2935"/>
<details key="line" value="83"/>
</eAnnotations>
<eAnnotations source="positions.202" references="/0/CppBehaviorDeclaration/behavior">
- <details key="start" value="2775"/>
- <details key="end" value="2794"/>
+ <details key="start" value="2793"/>
+ <details key="end" value="2812"/>
<details key="line" value="81"/>
</eAnnotations>
<eAnnotations source="positions.203" references="/0/CppConstInit">
- <details key="start" value="2925"/>
- <details key="end" value="3130"/>
+ <details key="start" value="2949"/>
+ <details key="end" value="3154"/>
<details key="line" value="86"/>
</eAnnotations>
<eAnnotations source="positions.204" references="/0/CppConstInit/%">
- <details key="start" value="2979"/>
- <details key="end" value="3118"/>
+ <details key="start" value="3003"/>
+ <details key="end" value="3142"/>
<details key="line" value="87"/>
</eAnnotations>
<eAnnotations source="positions.205" references="/0/CppConstInit/%/%">
- <details key="start" value="3046"/>
- <details key="end" value="3049"/>
+ <details key="start" value="3070"/>
+ <details key="end" value="3073"/>
<details key="line" value="87"/>
</eAnnotations>
<eAnnotations source="positions.206" references="/0/CppConstInit/%/%.1">
- <details key="start" value="3050"/>
- <details key="end" value="3111"/>
+ <details key="start" value="3074"/>
+ <details key="end" value="3135"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.207" references="/0/CppConstInit/%/%.1/%">
- <details key="start" value="3050"/>
- <details key="end" value="3096"/>
+ <details key="start" value="3074"/>
+ <details key="end" value="3120"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.208" references="/0/CppConstInit/%/%.1/%/%">
- <details key="start" value="3050"/>
- <details key="end" value="3075"/>
+ <details key="start" value="3074"/>
+ <details key="end" value="3099"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.209" references="/0/CppConstInit/%/%.1/%/%/self">
@@ -2961,23 +2961,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.210" references="/0/CppConstInit/%/%.1/%/%/%">
- <details key="start" value="3065"/>
- <details key="end" value="3074"/>
+ <details key="start" value="3089"/>
+ <details key="end" value="3098"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.211" references="/0/CppConstInit/%/%.1/%/%.1">
- <details key="start" value="3086"/>
- <details key="end" value="3095"/>
+ <details key="start" value="3110"/>
+ <details key="end" value="3119"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.212" references="/0/CppConstInit/%/%.2">
- <details key="start" value="2983"/>
- <details key="end" value="3045"/>
+ <details key="start" value="3007"/>
+ <details key="end" value="3069"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.213" references="/0/CppConstInit/%/%.2/%">
- <details key="start" value="2984"/>
- <details key="end" value="3008"/>
+ <details key="start" value="3008"/>
+ <details key="end" value="3032"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.214" references="/0/CppConstInit/%/%.2/%/self">
@@ -2986,13 +2986,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.215" references="/0/CppConstInit/%/%.2/%/%">
- <details key="start" value="2998"/>
- <details key="end" value="3007"/>
+ <details key="start" value="3022"/>
+ <details key="end" value="3031"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.216" references="/0/CppConstInit/%/%.2/%.1">
- <details key="start" value="3013"/>
- <details key="end" value="3044"/>
+ <details key="start" value="3037"/>
+ <details key="end" value="3068"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.217" references="/0/CppConstInit/%/%.2/%.1/self">
@@ -3001,33 +3001,33 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.218" references="/0/CppConstInit/%/%.2/%.1/%">
- <details key="start" value="3027"/>
- <details key="end" value="3043"/>
+ <details key="start" value="3051"/>
+ <details key="end" value="3067"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.219" references="/0/CppConstInit/operation">
- <details key="start" value="2955"/>
- <details key="end" value="2976"/>
+ <details key="start" value="2979"/>
+ <details key="end" value="3000"/>
<details key="line" value="86"/>
</eAnnotations>
<eAnnotations source="positions.220" references="/0/%.1">
- <details key="start" value="3133"/>
- <details key="end" value="3213"/>
+ <details key="start" value="3157"/>
+ <details key="end" value="3237"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.221" references="/0/getBodyInTemplate">
- <details key="start" value="3214"/>
- <details key="end" value="3331"/>
+ <details key="start" value="3238"/>
+ <details key="end" value="3355"/>
<details key="line" value="92"/>
</eAnnotations>
<eAnnotations source="positions.222" references="/0/getBodyInTemplate/%">
- <details key="start" value="3293"/>
- <details key="end" value="3317"/>
+ <details key="start" value="3317"/>
+ <details key="end" value="3341"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.223" references="/0/getBodyInTemplate/%/%">
- <details key="start" value="3293"/>
- <details key="end" value="3310"/>
+ <details key="start" value="3317"/>
+ <details key="end" value="3334"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.224" references="/0/getBodyInTemplate/%/%/self">
@@ -3036,43 +3036,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.225" references="/0/getBodyInTemplate/%/%/language">
- <details key="start" value="3301"/>
- <details key="end" value="3309"/>
+ <details key="start" value="3325"/>
+ <details key="end" value="3333"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.226" references="/0/getBodyInTemplate/operation">
- <details key="start" value="3249"/>
- <details key="end" value="3270"/>
+ <details key="start" value="3273"/>
+ <details key="end" value="3294"/>
<details key="line" value="92"/>
</eAnnotations>
<eAnnotations source="positions.227" references="/0/getBodyInTemplate/language">
- <details key="start" value="3272"/>
- <details key="end" value="3289"/>
+ <details key="start" value="3296"/>
+ <details key="end" value="3313"/>
<details key="line" value="92"/>
</eAnnotations>
<eAnnotations source="positions.228" references="/0/throws">
- <details key="start" value="3334"/>
- <details key="end" value="3502"/>
+ <details key="start" value="3358"/>
+ <details key="end" value="3526"/>
<details key="line" value="97"/>
</eAnnotations>
<eAnnotations source="positions.229" references="/0/throws/%">
- <details key="start" value="3381"/>
- <details key="end" value="3490"/>
+ <details key="start" value="3405"/>
+ <details key="end" value="3514"/>
<details key="line" value="98"/>
</eAnnotations>
<eAnnotations source="positions.230" references="/0/throws/%/%">
- <details key="start" value="3426"/>
- <details key="end" value="3433"/>
+ <details key="start" value="3450"/>
+ <details key="end" value="3457"/>
<details key="line" value="99"/>
</eAnnotations>
<eAnnotations source="positions.231" references="/0/throws/%/%.1">
- <details key="start" value="3433"/>
- <details key="end" value="3484"/>
+ <details key="start" value="3457"/>
+ <details key="end" value="3508"/>
<details key="line" value="99"/>
</eAnnotations>
<eAnnotations source="positions.232" references="/0/throws/%/%.1/%">
- <details key="start" value="3472"/>
- <details key="end" value="3476"/>
+ <details key="start" value="3496"/>
+ <details key="end" value="3500"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.233" references="/0/throws/%/%.1/%/self">
@@ -3081,8 +3081,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.234" references="/0/throws/%/%.1/%.1">
- <details key="start" value="3439"/>
- <details key="end" value="3454"/>
+ <details key="start" value="3463"/>
+ <details key="end" value="3478"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.235" references="/0/throws/%/%.1/%.1/self">
@@ -3091,53 +3091,53 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.236" references="/0/throws/%/%.1/%.2">
- <details key="start" value="3466"/>
- <details key="end" value="3469"/>
+ <details key="start" value="3490"/>
+ <details key="end" value="3493"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.237" references="/0/throws/%/%.2">
- <details key="start" value="3484"/>
- <details key="end" value="3485"/>
+ <details key="start" value="3508"/>
+ <details key="end" value="3509"/>
<details key="line" value="100"/>
</eAnnotations>
<eAnnotations source="positions.238" references="/0/throws/%/%.3">
- <details key="start" value="3385"/>
- <details key="end" value="3424"/>
+ <details key="start" value="3409"/>
+ <details key="end" value="3448"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.239" references="/0/throws/%/%.3/%">
- <details key="start" value="3386"/>
- <details key="end" value="3419"/>
+ <details key="start" value="3410"/>
+ <details key="end" value="3443"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.240" references="/0/throws/%/%.3/%/%">
- <details key="start" value="3386"/>
- <details key="end" value="3411"/>
+ <details key="start" value="3410"/>
+ <details key="end" value="3435"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.241" references="/0/throws/%/%.3/%/%/operation">
- <details key="start" value="3386"/>
- <details key="end" value="3395"/>
+ <details key="start" value="3410"/>
+ <details key="end" value="3419"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.242" references="/0/throws/%/%.3/%.1">
- <details key="start" value="3422"/>
- <details key="end" value="3423"/>
+ <details key="start" value="3446"/>
+ <details key="end" value="3447"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.243" references="/0/throws/operation">
- <details key="start" value="3358"/>
- <details key="end" value="3378"/>
+ <details key="start" value="3382"/>
+ <details key="end" value="3402"/>
<details key="line" value="97"/>
</eAnnotations>
<eAnnotations source="positions.244" references="/0/CppOperationImplementation">
- <details key="start" value="3505"/>
- <details key="end" value="4007"/>
+ <details key="start" value="3529"/>
+ <details key="end" value="4037"/>
<details key="line" value="104"/>
</eAnnotations>
<eAnnotations source="positions.245" references="/0/CppOperationImplementation/%">
- <details key="start" value="3574"/>
- <details key="end" value="3591"/>
+ <details key="start" value="3598"/>
+ <details key="end" value="3615"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.246" references="/0/CppOperationImplementation/%/self">
@@ -3146,18 +3146,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.1">
- <details key="start" value="3593"/>
- <details key="end" value="3594"/>
+ <details key="start" value="3617"/>
+ <details key="end" value="3618"/>
<details key="line" value="106"/>
</eAnnotations>
<eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2">
- <details key="start" value="3594"/>
- <details key="end" value="3995"/>
+ <details key="start" value="3618"/>
+ <details key="end" value="4025"/>
<details key="line" value="106"/>
</eAnnotations>
<eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%">
- <details key="start" value="3626"/>
- <details key="end" value="3641"/>
+ <details key="start" value="3650"/>
+ <details key="end" value="3665"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%/self">
@@ -3166,23 +3166,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.1">
- <details key="start" value="3644"/>
- <details key="end" value="3658"/>
+ <details key="start" value="3668"/>
+ <details key="end" value="3682"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.1/operation">
- <details key="start" value="3644"/>
- <details key="end" value="3653"/>
+ <details key="start" value="3668"/>
+ <details key="end" value="3677"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.2">
- <details key="start" value="3660"/>
- <details key="end" value="3661"/>
+ <details key="start" value="3684"/>
+ <details key="end" value="3685"/>
<details key="line" value="107"/>
</eAnnotations>
<eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.3">
- <details key="start" value="3662"/>
- <details key="end" value="3691"/>
+ <details key="start" value="3686"/>
+ <details key="end" value="3715"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.3/self">
@@ -3191,18 +3191,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.3/%">
- <details key="start" value="3685"/>
- <details key="end" value="3690"/>
+ <details key="start" value="3709"/>
+ <details key="end" value="3714"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.4">
- <details key="start" value="3693"/>
- <details key="end" value="3698"/>
+ <details key="start" value="3717"/>
+ <details key="end" value="3722"/>
<details key="line" value="107"/>
</eAnnotations>
<eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.5">
- <details key="start" value="3699"/>
- <details key="end" value="3715"/>
+ <details key="start" value="3723"/>
+ <details key="end" value="3739"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.5/self">
@@ -3211,43 +3211,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.5/%">
- <details key="start" value="3707"/>
- <details key="end" value="3714"/>
+ <details key="start" value="3731"/>
+ <details key="end" value="3738"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.6">
- <details key="start" value="3717"/>
- <details key="end" value="3720"/>
+ <details key="start" value="3741"/>
+ <details key="end" value="3744"/>
<details key="line" value="109"/>
</eAnnotations>
<eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.7">
- <details key="start" value="3598"/>
- <details key="end" value="3623"/>
+ <details key="start" value="3622"/>
+ <details key="end" value="3647"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.7/%">
- <details key="start" value="3599"/>
- <details key="end" value="3613"/>
+ <details key="start" value="3623"/>
+ <details key="end" value="3637"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
- <details key="start" value="3599"/>
- <details key="end" value="3608"/>
+ <details key="start" value="3623"/>
+ <details key="end" value="3632"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.7/%.1">
- <details key="start" value="3616"/>
- <details key="end" value="3622"/>
+ <details key="start" value="3640"/>
+ <details key="end" value="3646"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8">
- <details key="start" value="3720"/>
- <details key="end" value="3990"/>
+ <details key="start" value="3744"/>
+ <details key="end" value="4020"/>
<details key="line" value="110"/>
</eAnnotations>
<eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%">
- <details key="start" value="3728"/>
- <details key="end" value="3747"/>
+ <details key="start" value="3752"/>
+ <details key="end" value="3771"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%/self">
@@ -3256,8 +3256,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.1">
- <details key="start" value="3750"/>
- <details key="end" value="3761"/>
+ <details key="start" value="3774"/>
+ <details key="end" value="3785"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
@@ -3266,8 +3266,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.2">
- <details key="start" value="3764"/>
- <details key="end" value="3779"/>
+ <details key="start" value="3788"/>
+ <details key="end" value="3803"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
@@ -3276,23 +3276,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/collect">
- <details key="start" value="3782"/>
- <details key="end" value="3816"/>
+ <details key="start" value="3806"/>
+ <details key="end" value="3840"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
- <details key="start" value="3782"/>
- <details key="end" value="3811"/>
+ <details key="start" value="3806"/>
+ <details key="end" value="3835"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
- <details key="start" value="3782"/>
- <details key="end" value="3791"/>
+ <details key="start" value="3806"/>
+ <details key="end" value="3815"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
- <details key="start" value="3812"/>
- <details key="end" value="3816"/>
+ <details key="start" value="3836"/>
+ <details key="end" value="3840"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
@@ -3306,8 +3306,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.3">
- <details key="start" value="3819"/>
- <details key="end" value="3843"/>
+ <details key="start" value="3843"/>
+ <details key="end" value="3867"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
@@ -3316,13 +3316,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.4">
- <details key="start" value="3845"/>
- <details key="end" value="3847"/>
+ <details key="start" value="3869"/>
+ <details key="end" value="3871"/>
<details key="line" value="111"/>
</eAnnotations>
<eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.5">
- <details key="start" value="3848"/>
- <details key="end" value="3860"/>
+ <details key="start" value="3872"/>
+ <details key="end" value="3884"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
@@ -3331,23 +3331,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.6">
- <details key="start" value="3863"/>
- <details key="end" value="3877"/>
+ <details key="start" value="3887"/>
+ <details key="end" value="3901"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
- <details key="start" value="3863"/>
- <details key="end" value="3872"/>
+ <details key="start" value="3887"/>
+ <details key="end" value="3896"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.7">
- <details key="start" value="3879"/>
- <details key="end" value="3880"/>
+ <details key="start" value="3903"/>
+ <details key="end" value="3904"/>
<details key="line" value="111"/>
</eAnnotations>
<eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.8">
- <details key="start" value="3881"/>
- <details key="end" value="3910"/>
+ <details key="start" value="3905"/>
+ <details key="end" value="3934"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
@@ -3356,18 +3356,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.289" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
- <details key="start" value="3904"/>
- <details key="end" value="3909"/>
+ <details key="start" value="3928"/>
+ <details key="end" value="3933"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.290" references="/0/CppOperationImplementation/%.2/%.8/%.9">
- <details key="start" value="3912"/>
- <details key="end" value="3913"/>
+ <details key="start" value="3936"/>
+ <details key="end" value="3937"/>
<details key="line" value="111"/>
</eAnnotations>
<eAnnotations source="positions.291" references="/0/CppOperationImplementation/%.2/%.8/%.10">
- <details key="start" value="3914"/>
- <details key="end" value="3922"/>
+ <details key="start" value="3938"/>
+ <details key="end" value="3946"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.292" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
@@ -3376,8 +3376,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.293" references="/0/CppOperationImplementation/%.2/%.8/%.11">
- <details key="start" value="3925"/>
- <details key="end" value="3935"/>
+ <details key="start" value="3949"/>
+ <details key="end" value="3965"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.294" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
@@ -3386,8 +3386,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.295" references="/0/CppOperationImplementation/%.2/%.8/%.12">
- <details key="start" value="3938"/>
- <details key="end" value="3952"/>
+ <details key="start" value="3968"/>
+ <details key="end" value="3982"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.296" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
@@ -3396,13 +3396,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.297" references="/0/CppOperationImplementation/%.2/%.8/%.13">
- <details key="start" value="3954"/>
- <details key="end" value="3958"/>
+ <details key="start" value="3984"/>
+ <details key="end" value="3988"/>
<details key="line" value="111"/>
</eAnnotations>
<eAnnotations source="positions.298" references="/0/CppOperationImplementation/%.2/%.8/%.14">
- <details key="start" value="3959"/>
- <details key="end" value="3985"/>
+ <details key="start" value="3989"/>
+ <details key="end" value="4015"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.299" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
@@ -3411,28 +3411,28 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.300" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
- <details key="start" value="3977"/>
- <details key="end" value="3984"/>
+ <details key="start" value="4007"/>
+ <details key="end" value="4014"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.301" references="/0/CppOperationImplementation/%.2/%.8/%.15">
- <details key="start" value="3987"/>
- <details key="end" value="3990"/>
+ <details key="start" value="4017"/>
+ <details key="end" value="4020"/>
<details key="line" value="113"/>
</eAnnotations>
<eAnnotations source="positions.302" references="/0/CppOperationImplementation/operation">
- <details key="start" value="3549"/>
- <details key="end" value="3570"/>
+ <details key="start" value="3573"/>
+ <details key="end" value="3594"/>
<details key="line" value="104"/>
</eAnnotations>
<eAnnotations source="positions.303" references="/0/CppBehaviorImplementation">
- <details key="start" value="4010"/>
- <details key="end" value="4251"/>
+ <details key="start" value="4040"/>
+ <details key="end" value="4287"/>
<details key="line" value="118"/>
</eAnnotations>
<eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%">
- <details key="start" value="4082"/>
- <details key="end" value="4098"/>
+ <details key="start" value="4112"/>
+ <details key="end" value="4128"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%/self">
@@ -3441,13 +3441,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.1">
- <details key="start" value="4100"/>
- <details key="end" value="4101"/>
+ <details key="start" value="4130"/>
+ <details key="end" value="4131"/>
<details key="line" value="120"/>
</eAnnotations>
<eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.2">
- <details key="start" value="4102"/>
- <details key="end" value="4117"/>
+ <details key="start" value="4132"/>
+ <details key="end" value="4147"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.2/self">
@@ -3456,43 +3456,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.3">
- <details key="start" value="4120"/>
- <details key="end" value="4142"/>
+ <details key="start" value="4150"/>
+ <details key="end" value="4172"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.3/%">
- <details key="start" value="4120"/>
- <details key="end" value="4137"/>
+ <details key="start" value="4150"/>
+ <details key="end" value="4167"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.3/%/behavior">
- <details key="start" value="4120"/>
- <details key="end" value="4128"/>
+ <details key="start" value="4150"/>
+ <details key="end" value="4158"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.4">
- <details key="start" value="4144"/>
- <details key="end" value="4146"/>
+ <details key="start" value="4174"/>
+ <details key="end" value="4176"/>
<details key="line" value="120"/>
</eAnnotations>
<eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.5">
- <details key="start" value="4147"/>
- <details key="end" value="4160"/>
+ <details key="start" value="4177"/>
+ <details key="end" value="4190"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/%.5/behavior">
- <details key="start" value="4147"/>
- <details key="end" value="4155"/>
+ <details key="start" value="4177"/>
+ <details key="end" value="4185"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.315" references="/0/CppBehaviorImplementation/%.6">
- <details key="start" value="4162"/>
- <details key="end" value="4163"/>
+ <details key="start" value="4192"/>
+ <details key="end" value="4193"/>
<details key="line" value="120"/>
</eAnnotations>
<eAnnotations source="positions.316" references="/0/CppBehaviorImplementation/%.7">
- <details key="start" value="4164"/>
- <details key="end" value="4192"/>
+ <details key="start" value="4194"/>
+ <details key="end" value="4222"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.317" references="/0/CppBehaviorImplementation/%.7/self">
@@ -3501,18 +3501,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.318" references="/0/CppBehaviorImplementation/%.7/%">
- <details key="start" value="4186"/>
- <details key="end" value="4191"/>
+ <details key="start" value="4216"/>
+ <details key="end" value="4221"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.319" references="/0/CppBehaviorImplementation/%.8">
- <details key="start" value="4194"/>
- <details key="end" value="4195"/>
+ <details key="start" value="4224"/>
+ <details key="end" value="4225"/>
<details key="line" value="120"/>
</eAnnotations>
<eAnnotations source="positions.320" references="/0/CppBehaviorImplementation/%.9">
- <details key="start" value="4196"/>
- <details key="end" value="4206"/>
+ <details key="start" value="4226"/>
+ <details key="end" value="4242"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.321" references="/0/CppBehaviorImplementation/%.9/self">
@@ -3521,13 +3521,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.322" references="/0/CppBehaviorImplementation/%.10">
- <details key="start" value="4208"/>
- <details key="end" value="4212"/>
+ <details key="start" value="4244"/>
+ <details key="end" value="4248"/>
<details key="line" value="120"/>
</eAnnotations>
<eAnnotations source="positions.323" references="/0/CppBehaviorImplementation/%.11">
- <details key="start" value="4213"/>
- <details key="end" value="4235"/>
+ <details key="start" value="4249"/>
+ <details key="end" value="4271"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.324" references="/0/CppBehaviorImplementation/%.11/self">
@@ -3536,18 +3536,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.325" references="/0/CppBehaviorImplementation/%.11/%">
- <details key="start" value="4227"/>
- <details key="end" value="4234"/>
+ <details key="start" value="4263"/>
+ <details key="end" value="4270"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.326" references="/0/CppBehaviorImplementation/%.12">
- <details key="start" value="4237"/>
- <details key="end" value="4239"/>
+ <details key="start" value="4273"/>
+ <details key="end" value="4275"/>
<details key="line" value="122"/>
</eAnnotations>
<eAnnotations source="positions.327" references="/0/CppBehaviorImplementation/behavior">
- <details key="start" value="4053"/>
- <details key="end" value="4078"/>
+ <details key="start" value="4083"/>
+ <details key="end" value="4108"/>
<details key="line" value="118"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
index 4394b93..99720c6 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
@@ -55,12 +55,12 @@ else
endif/]
[template public CppReturnSpec(operation : Operation)]
-[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
+[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modCVQualifier()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
[/template]
[template public CppReturnSpec(behavior : Behavior)]
-[if (returnResult() = null)]void [else][returnResult().modConst()/] [returnResult().type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
+[if (returnResult() = null)]void [else][returnResult().modCVQualifier()/] [returnResult().type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
[/template]
@@ -75,12 +75,12 @@ endif/]
[template public CppOperationDeclaration(operation : Operation)]
[CppOperationDoc()/]
-[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/][destructor()/][operation.name/]([CppOperationParameters(true)/])[modConst()/][virtualSuffix()/];
+[InlineTxt()/][virtualTxt()/][staticTxt()/][CppReturnSpec()/][destructor()/][operation.name/]([CppOperationParameters(true)/])[modCVQualifier()/][virtualSuffix()/];
[/template]
[template public CppBehaviorDeclaration(behavior : Behavior)]
[CppBehaviorDoc()/]
-[InlineTxt()/][CppReturnSpec()/][behavior.name/]([CppBehaviorParameters(true)/])[modConst()/];
+[InlineTxt()/][CppReturnSpec()/][behavior.name/]([CppBehaviorParameters(true)/])[modCVQualifier()/];
[/template]
[template public CppConstInit(operation : Operation)]
@@ -108,7 +108,7 @@ throws [for (raisedException) separator(',')][name/][/for]
[getBody('C/C++')/]
}
[else]
-[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.featuringClassifier.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[throws()/][modConst()/][CppConstInit()/] {
+[templateSignature()/][InlineTxt()/][CppReturnSpec()/][operation.featuringClassifier.name/][templateShortSignature()/]::[destructor()/][operation.name/]([CppOperationParameters(false)/])[throws()/][modCVQualifier()/][CppConstInit()/] {
[getBodyInTemplate('C/C++')/]
}
[/if]
@@ -117,7 +117,7 @@ throws [for (raisedException) separator(',')][name/][/for]
[template public CppBehaviorImplementation(behavior : OpaqueBehavior)]
[CppBehaviorDoc()/]
-[CppReturnSpec()/][behavior._context.name/]::[behavior.name/]([CppBehaviorParameters(false)/])[modConst()/] {
+[CppReturnSpec()/][behavior._context.name/]::[behavior.name/]([CppBehaviorParameters(false)/])[modCVQualifier()/] {
[getBodyFromOB('C/C++')/]
}
[/template] \ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
index c6fb9fe..d02d03e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
@@ -49,7 +49,7 @@
<ownedModuleElement xsi:type="mtl:Template" name="CppParameter" visibility="Public">
<body xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <definition href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Parameter"/>
</argument>
@@ -161,7 +161,7 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="1033" endPosition="1099" value=" signature for a given behavior (e.g. effect within state machine)"/>
+ <body startPosition="1039" endPosition="1105" value=" signature for a given behavior (e.g. effect within state machine)"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppBehaviorParameters" visibility="Public">
<body xsi:type="mtl:ForBlock">
@@ -329,12 +329,12 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</eParameters>
</eOperations>
- <eOperations name="modConst">
+ <eOperations name="modCVQualifier">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="../../../utils/Modifier.emtl#/0/modConst"/>
+ <references href="../../../utils/Modifier.emtl#/0/modCVQualifier"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
@@ -608,12 +608,12 @@
</eAnnotations>
<eAnnotations source="positions.12" references="/0/CppParameter">
<details key="start" value="564"/>
- <details key="end" value="795"/>
+ <details key="end" value="801"/>
<details key="line" value="15"/>
</eAnnotations>
<eAnnotations source="positions.13" references="/0/CppParameter/%">
<details key="start" value="642"/>
- <details key="end" value="652"/>
+ <details key="end" value="658"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.14" references="/0/CppParameter/%/self">
@@ -622,23 +622,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.15" references="/0/CppParameter/%.1">
- <details key="start" value="655"/>
- <details key="end" value="688"/>
+ <details key="start" value="661"/>
+ <details key="end" value="694"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.16" references="/0/CppParameter/%.1/%">
- <details key="start" value="655"/>
- <details key="end" value="669"/>
+ <details key="start" value="661"/>
+ <details key="end" value="675"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.17" references="/0/CppParameter/%.1/%/parameter">
- <details key="start" value="655"/>
- <details key="end" value="664"/>
+ <details key="start" value="661"/>
+ <details key="end" value="670"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.18" references="/0/CppParameter/%.2">
- <details key="start" value="691"/>
- <details key="end" value="699"/>
+ <details key="start" value="697"/>
+ <details key="end" value="705"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.19" references="/0/CppParameter/%.2/self">
@@ -647,8 +647,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.20" references="/0/CppParameter/%.3">
- <details key="start" value="702"/>
- <details key="end" value="710"/>
+ <details key="start" value="708"/>
+ <details key="end" value="716"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.21" references="/0/CppParameter/%.3/self">
@@ -657,23 +657,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.22" references="/0/CppParameter/%.4">
- <details key="start" value="712"/>
- <details key="end" value="713"/>
+ <details key="start" value="718"/>
+ <details key="end" value="719"/>
<details key="line" value="16"/>
</eAnnotations>
<eAnnotations source="positions.23" references="/0/CppParameter/%.5">
- <details key="start" value="714"/>
- <details key="end" value="728"/>
+ <details key="start" value="720"/>
+ <details key="end" value="734"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.24" references="/0/CppParameter/%.5/parameter">
- <details key="start" value="714"/>
- <details key="end" value="723"/>
+ <details key="start" value="720"/>
+ <details key="end" value="729"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.25" references="/0/CppParameter/%.6">
- <details key="start" value="731"/>
- <details key="end" value="741"/>
+ <details key="start" value="737"/>
+ <details key="end" value="747"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.26" references="/0/CppParameter/%.6/self">
@@ -682,13 +682,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.27" references="/0/CppParameter/%.7">
- <details key="start" value="743"/>
- <details key="end" value="783"/>
+ <details key="start" value="749"/>
+ <details key="end" value="789"/>
<details key="line" value="16"/>
</eAnnotations>
<eAnnotations source="positions.28" references="/0/CppParameter/%.7/%">
- <details key="start" value="762"/>
- <details key="end" value="776"/>
+ <details key="start" value="768"/>
+ <details key="end" value="782"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.29" references="/0/CppParameter/%.7/%/self">
@@ -697,8 +697,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.30" references="/0/CppParameter/%.7/showDefault">
- <details key="start" value="747"/>
- <details key="end" value="760"/>
+ <details key="start" value="753"/>
+ <details key="end" value="766"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.31" references="/0/CppParameter/parameter">
@@ -712,18 +712,18 @@
<details key="line" value="15"/>
</eAnnotations>
<eAnnotations source="positions.33" references="/0/CppOperationParameters">
- <details key="start" value="798"/>
- <details key="end" value="1022"/>
+ <details key="start" value="804"/>
+ <details key="end" value="1028"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.34" references="/0/CppOperationParameters/%">
- <details key="start" value="885"/>
- <details key="end" value="1010"/>
+ <details key="start" value="891"/>
+ <details key="end" value="1016"/>
<details key="line" value="21"/>
</eAnnotations>
<eAnnotations source="positions.35" references="/0/CppOperationParameters/%/%">
- <details key="start" value="977"/>
- <details key="end" value="1002"/>
+ <details key="start" value="983"/>
+ <details key="end" value="1008"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.36" references="/0/CppOperationParameters/%/%/self">
@@ -732,18 +732,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.37" references="/0/CppOperationParameters/%/%/showDefault">
- <details key="start" value="990"/>
- <details key="end" value="1001"/>
+ <details key="start" value="996"/>
+ <details key="end" value="1007"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.38" references="/0/CppOperationParameters/%/select">
- <details key="start" value="891"/>
- <details key="end" value="958"/>
+ <details key="start" value="897"/>
+ <details key="end" value="964"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.39" references="/0/CppOperationParameters/%/select/%">
- <details key="start" value="891"/>
- <details key="end" value="905"/>
+ <details key="start" value="897"/>
+ <details key="end" value="911"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.40" references="/0/CppOperationParameters/%/select/%/self">
@@ -752,13 +752,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.41" references="/0/CppOperationParameters/%/select/%.1">
- <details key="start" value="914"/>
- <details key="end" value="957"/>
+ <details key="start" value="920"/>
+ <details key="end" value="963"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.42" references="/0/CppOperationParameters/%/select/%.1/%">
- <details key="start" value="914"/>
- <details key="end" value="923"/>
+ <details key="start" value="920"/>
+ <details key="end" value="929"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.43" references="/0/CppOperationParameters/%/select/%.1/%/temp1">
@@ -767,8 +767,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.44" references="/0/CppOperationParameters/%/select/%.1/%.1">
- <details key="start" value="927"/>
- <details key="end" value="957"/>
+ <details key="start" value="933"/>
+ <details key="end" value="963"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.45" references="/0/CppOperationParameters/%/select/temp1">
@@ -777,38 +777,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.46" references="/0/CppOperationParameters/%/%.1">
- <details key="start" value="970"/>
- <details key="end" value="974"/>
+ <details key="start" value="976"/>
+ <details key="end" value="980"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.47" references="/0/CppOperationParameters/operation">
- <details key="start" value="838"/>
- <details key="end" value="859"/>
+ <details key="start" value="844"/>
+ <details key="end" value="865"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.48" references="/0/CppOperationParameters/showDefault">
- <details key="start" value="861"/>
- <details key="end" value="882"/>
+ <details key="start" value="867"/>
+ <details key="end" value="888"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.49" references="/0/%.1">
- <details key="start" value="1025"/>
- <details key="end" value="1101"/>
+ <details key="start" value="1031"/>
+ <details key="end" value="1107"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.50" references="/0/CppBehaviorParameters">
- <details key="start" value="1102"/>
- <details key="end" value="1323"/>
+ <details key="start" value="1108"/>
+ <details key="end" value="1329"/>
<details key="line" value="26"/>
</eAnnotations>
<eAnnotations source="positions.51" references="/0/CppBehaviorParameters/%">
- <details key="start" value="1186"/>
- <details key="end" value="1311"/>
+ <details key="start" value="1192"/>
+ <details key="end" value="1317"/>
<details key="line" value="27"/>
</eAnnotations>
<eAnnotations source="positions.52" references="/0/CppBehaviorParameters/%/%">
- <details key="start" value="1278"/>
- <details key="end" value="1303"/>
+ <details key="start" value="1284"/>
+ <details key="end" value="1309"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.53" references="/0/CppBehaviorParameters/%/%/self">
@@ -817,18 +817,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.54" references="/0/CppBehaviorParameters/%/%/showDefault">
- <details key="start" value="1291"/>
- <details key="end" value="1302"/>
+ <details key="start" value="1297"/>
+ <details key="end" value="1308"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.55" references="/0/CppBehaviorParameters/%/select">
- <details key="start" value="1192"/>
- <details key="end" value="1259"/>
+ <details key="start" value="1198"/>
+ <details key="end" value="1265"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.56" references="/0/CppBehaviorParameters/%/select/%">
- <details key="start" value="1192"/>
- <details key="end" value="1206"/>
+ <details key="start" value="1198"/>
+ <details key="end" value="1212"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.57" references="/0/CppBehaviorParameters/%/select/%/self">
@@ -837,13 +837,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.58" references="/0/CppBehaviorParameters/%/select/%.1">
- <details key="start" value="1215"/>
- <details key="end" value="1258"/>
+ <details key="start" value="1221"/>
+ <details key="end" value="1264"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.59" references="/0/CppBehaviorParameters/%/select/%.1/%">
- <details key="start" value="1215"/>
- <details key="end" value="1224"/>
+ <details key="start" value="1221"/>
+ <details key="end" value="1230"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.60" references="/0/CppBehaviorParameters/%/select/%.1/%/temp1">
@@ -852,8 +852,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.61" references="/0/CppBehaviorParameters/%/select/%.1/%.1">
- <details key="start" value="1228"/>
- <details key="end" value="1258"/>
+ <details key="start" value="1234"/>
+ <details key="end" value="1264"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.62" references="/0/CppBehaviorParameters/%/select/temp2">
@@ -862,18 +862,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.63" references="/0/CppBehaviorParameters/%/%.1">
- <details key="start" value="1271"/>
- <details key="end" value="1275"/>
+ <details key="start" value="1277"/>
+ <details key="end" value="1281"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.64" references="/0/CppBehaviorParameters/behavior">
- <details key="start" value="1141"/>
- <details key="end" value="1160"/>
+ <details key="start" value="1147"/>
+ <details key="end" value="1166"/>
<details key="line" value="26"/>
</eAnnotations>
<eAnnotations source="positions.65" references="/0/CppBehaviorParameters/showDefault">
- <details key="start" value="1162"/>
- <details key="end" value="1183"/>
+ <details key="start" value="1168"/>
+ <details key="end" value="1189"/>
<details key="line" value="26"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
index 9b74ce9..9f1a560 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.mtl
@@ -13,7 +13,7 @@
[comment C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
may not repeat default value)/]
[template public CppParameter(parameter : Parameter, showDefault : Boolean)]
-[modConst()/][parameter.type.cppQualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if]
+[modCVQualifier()/][parameter.type.cppQualifiedName()/][modPtr()/][modRef()/] [parameter.name/][modArray()/][if (showDefault)][defaultValue()/][/if]
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl
index d4c3543..144d242 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.emtl
@@ -82,7 +82,7 @@
</expression>
<type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</ownedModuleElement>
- <ownedModuleElement xsi:type="mtl:Query" name="modConst" visibility="Public">
+ <ownedModuleElement xsi:type="mtl:Query" name="modCVQualifier" visibility="Public">
<parameter name="propertyOrParameter">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</parameter>
@@ -94,13 +94,13 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.Modifier">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
- <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modConst(org.eclipse.uml2.uml.Element)">
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="modCVQualifier(org.eclipse.uml2.uml.Element)">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</argument>
<argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/4/Sequence(Element)" kind="Sequence">
<part xsi:type="ocl.ecore:CollectionItem">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
- <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modConst/propertyOrParameter">
+ <item xsi:type="ocl.ecore:VariableExp" name="propertyOrParameter" referredVariable="/0/modCVQualifier/propertyOrParameter">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</item>
</part>
@@ -159,11 +159,11 @@
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
</eParameters>
</eOperations>
- <eOperations name="modConst">
+ <eOperations name="modCVQualifier">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
- <eAnnotations source="MTL" references="/0/modConst"/>
+ <eAnnotations source="MTL" references="/0/modCVQualifier"/>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<eParameters name="propertyOrParameter">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
@@ -377,44 +377,44 @@
<details key="end" value="675"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.24" references="/0/modConst">
+ <eAnnotations source="positions.24" references="/0/modCVQualifier">
<details key="start" value="682"/>
- <details key="end" value="880"/>
+ <details key="end" value="892"/>
<details key="line" value="13"/>
</eAnnotations>
- <eAnnotations source="positions.25" references="/0/modConst/propertyOrParameter">
- <details key="start" value="705"/>
- <details key="end" value="734"/>
+ <eAnnotations source="positions.25" references="/0/modCVQualifier/propertyOrParameter">
+ <details key="start" value="711"/>
+ <details key="end" value="740"/>
<details key="line" value="13"/>
</eAnnotations>
- <eAnnotations source="positions.26" references="/0/modConst/%">
- <details key="start" value="748"/>
- <details key="end" value="877"/>
+ <eAnnotations source="positions.26" references="/0/modCVQualifier/%">
+ <details key="start" value="754"/>
+ <details key="end" value="889"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.27" references="/0/modConst/%/self">
+ <eAnnotations source="positions.27" references="/0/modCVQualifier/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.28" references="/0/modConst/%/%">
- <details key="start" value="755"/>
- <details key="end" value="803"/>
+ <eAnnotations source="positions.28" references="/0/modCVQualifier/%/%">
+ <details key="start" value="761"/>
+ <details key="end" value="809"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.29" references="/0/modConst/%/%.1">
- <details key="start" value="805"/>
- <details key="end" value="845"/>
+ <eAnnotations source="positions.29" references="/0/modCVQualifier/%/%.1">
+ <details key="start" value="811"/>
+ <details key="end" value="857"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.30" references="/0/modConst/%/%.2">
- <details key="start" value="847"/>
- <details key="end" value="876"/>
+ <eAnnotations source="positions.30" references="/0/modCVQualifier/%/%.2">
+ <details key="start" value="859"/>
+ <details key="end" value="888"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.31" references="/0/modConst/%/%.2/%/propertyOrParameter">
- <details key="start" value="856"/>
- <details key="end" value="875"/>
+ <eAnnotations source="positions.31" references="/0/modCVQualifier/%/%.2/%/propertyOrParameter">
+ <details key="start" value="868"/>
+ <details key="end" value="887"/>
<details key="line" value="0"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
index adc21bc..3f13e2c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.java
@@ -15,6 +15,7 @@ import org.eclipse.papyrus.C_Cpp.Array;
import org.eclipse.papyrus.C_Cpp.Const;
import org.eclipse.papyrus.C_Cpp.Ptr;
import org.eclipse.papyrus.C_Cpp.Ref;
+import org.eclipse.papyrus.C_Cpp.Volatile;
import org.eclipse.papyrus.acceleo.GenUtils;
import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;
import org.eclipse.uml2.uml.AggregationKind;
@@ -42,7 +43,7 @@ public class Modifier {
public static String array;
- public static String isConst;
+ public static String cvQualifier;
public static String modPtr(Element propertyOrParameter) {
update(propertyOrParameter);
@@ -59,9 +60,9 @@ public class Modifier {
return array;
}
- public static String modConst(Element propertyOrParameter) {
+ public static String modCVQualifier(Element propertyOrParameter) {
update(propertyOrParameter);
- return isConst;
+ return cvQualifier;
}
/**
@@ -126,14 +127,36 @@ public class Modifier {
}
}
}
+
+ // CVQualifiers cannot be used with static functions
+ if (propertyOperationOrParameter instanceof Operation
+ && ( (Operation)propertyOperationOrParameter ).isStatic() ) {
+ cvQualifier = new String();
+ }
// Const
- if (GenUtils.hasStereotype(propertyOperationOrParameter, Const.class)) {
- isConst = (propertyOperationOrParameter instanceof Operation) ?
- " const" : // added at the end of operation, prefix with " " //$NON-NLS-1$
- "const "; // before operation or parameter, postfix with " " //$NON-NLS-1$
+ else if (GenUtils.hasStereotype(propertyOperationOrParameter, Const.class)) {
+ // Volatile with const
+ if (GenUtils.hasStereotype(propertyOperationOrParameter, Volatile.class)) {
+ cvQualifier = (propertyOperationOrParameter instanceof Operation) ?
+ " const volatile" : // added at the end of operation, prefix with " " //$NON-NLS-1$
+ "const volatile "; // before operation or parameter, postfix with " " //$NON-NLS-1$
+ }
+ // Const without Volatile
+ else {
+ cvQualifier = (propertyOperationOrParameter instanceof Operation) ?
+ " const" : // added at the end of operation, prefix with " " //$NON-NLS-1$
+ "const "; // before operation or parameter, postfix with " " //$NON-NLS-1$
+ }
+ }
+ // Volatile without const
+ else if (GenUtils.hasStereotype(propertyOperationOrParameter, Volatile.class)) {
+ cvQualifier = (propertyOperationOrParameter instanceof Operation) ?
+ " volatile" : // added at the end of operation, prefix with " " //$NON-NLS-1$
+ "volatile "; // before operation or parameter, postfix with " " //$NON-NLS-1$
}
+ // No CV qualifiers
else {
- isConst = ""; //$NON-NLS-1$
+ cvQualifier = ""; //$NON-NLS-1$
}
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl
index 9dd3f65..0816622 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/Modifier.mtl
@@ -10,6 +10,6 @@
[query public modArray(propertyOrParameter : Element) : String
= invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modArray(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
-[query public modConst(propertyOrParameter : Element) : String
- = invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modConst(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
+[query public modCVQualifier(propertyOrParameter : Element) : String
+ = invoke('org.eclipse.papyrus.cpp.codegen.utils.Modifier', 'modCVQualifier(org.eclipse.uml2.uml.Element)', Sequence{propertyOrParameter}) /]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index 1177ba8..085a22e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
org.eclipse.uml2.types;visibility:=reexport,
- org.eclipse.uml2.uml;bundle-version="3.1.0"
+ org.eclipse.uml2.uml;bundle-version="3.1.0";visibility:=reexport
Export-Package: org.eclipse.papyrus.C_Cpp,
org.eclipse.papyrus.C_Cpp.impl,
org.eclipse.papyrus.C_Cpp.util,
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
index 6c66478..8cfe9b4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore
@@ -6,68 +6,70 @@
<details key="documentation" value="&quot;declaration&quot; attribute should only be used, if more than one indirections of pointers (often &quot;**&quot;)"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Parameter"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Property"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" ordered="false"
- unique="false" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Include">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="An arbitrary string that is added to header and body file. Although primarily intended for manual include directives, it can be used for arbitrary definitions.&#xA;&quot;preBody&quot; is added to a C++ body file before automatic include statements, &quot;body&quot; after"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="ecore:EDataType types.ecore#//String"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
defaultValueLiteral=""/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="preBody" ordered="false"
- eType="ecore:EDataType types.ecore#//String" defaultValueLiteral=""/>
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
+ defaultValueLiteral=""/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="header" ordered="false"
- eType="ecore:EDataType types.ecore#//String" defaultValueLiteral=""/>
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"
+ defaultValueLiteral=""/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Package"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_class" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Class"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_PackageImport" ordered="false"
- eType="ecore:EClass uml.ecore#//PackageImport"/>
+ eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//PackageImport"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ManualGeneration">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Some toolkits require a quite particular way of use. For instance, LTTng requires the use of C (not C++) for the declaration of a trace provider and the header file is read several time with redefined macros. Therefore, the code generator supports a &quot;manual&quot; generation mode, in which primarily the contents of the CppInclude directive is written."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="extensionBody" ordered="false"
- lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
- lowerBound="1" eType="ecore:EClass uml.ecore#//Class"/>
+ lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExternLibrary">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Mark a package as External Library. If this package is used, the associated CDT project will be configured accordingly."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="includePaths" ordered="false"
- unique="false" upperBound="-1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Package"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="libPaths" ordered="false"
- upperBound="-1" eType="ecore:EDataType types.ecore#//String"/>
+ upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="macros" ordered="false"
- upperBound="-1" eType="ecore:EDataType types.ecore#//String"/>
+ upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="libs" ordered="false" upperBound="-1"
- eType="ecore:EDataType types.ecore#//String"/>
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="includes" ordered="false"
- upperBound="-1" eType="ecore:EDataType types.ecore#//String"/>
+ upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NoCodeGen">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="No code generation should be done for this element. This also means that no include directive is generated, if the class is referenced."/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_element" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Element"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CppRoot">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Indicates that this package shoudl be a root package, i.e. its contents should appear on top level folder during generation. Currently not used"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Package"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Package"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
<eLiterals name="private"/>
@@ -76,93 +78,93 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Array">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Parameter"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Property"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_association" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Association"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Association"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Const">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Parameter"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Property"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Operation"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Ref">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Parameter"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Property"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="External">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
- eType="ecore:EDataType types.ecore#//String"/>
+ eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Classifier" ordered="false"
- lowerBound="1" eType="ecore:EClass uml.ecore#//Classifier"/>
+ lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Classifier"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ConstInit">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="initialisation" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Friend">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_dependency" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Dependency"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
- unique="false" eType="ecore:EClass uml.ecore#//Operation"/>
+ unique="false" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Inline">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Virtual">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Typedef">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_primitivetype" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//PrimitiveType"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Visibility">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_generalization" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Generalization"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Generalization"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CppInit">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//Integer"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_enumerationliteral"
- ordered="false" unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//EnumerationLiteral"/>
+ ordered="false" unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//EnumerationLiteral"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Template">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_class" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Class"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TemplateBinding">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="binding" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ unique="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_templatebinding" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//TemplateBinding"/>
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//TemplateBinding"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TemplateParameter">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
- lowerBound="1" eType="ecore:EDataType types.ecore#//String"/>
+ lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="base_templateparameter"
- ordered="false" unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//TemplateParameter"/>
+ ordered="false" unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//TemplateParameter"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Union">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false"
- lowerBound="1" eType="ecore:EClass uml.ecore#//DataType"/>
+ lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//DataType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="EAccessKind">
<eLiterals name="read"/>
@@ -177,9 +179,13 @@
<eClassifiers xsi:type="ecore:EClass" name="StorageClass">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="storageClass" ordered="false"
unique="false" lowerBound="1" eType="#//EStorageClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false"
- eType="ecore:EClass uml.ecore#//Parameter"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false"
- eType="ecore:EClass uml.ecore#//Property"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Volatile">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Property"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Operation"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index 3577d0d..4e4d3fd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
@@ -1,124 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST&#xA;&#xA;All rights reserved. This program and the accompanying materials are&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xA;accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; Ansgar Radermacher - Initial API and implementation&#xA;"
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile"
- modelName="C_Cpp" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
- language="" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
+ modelName="C_Cpp" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+ importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="6.0" copyrightFields="false"
+ usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
operationReflection="true" importOrganizing="true">
- <foreignModel>C_Cpp.ecore</foreignModel>
- <genPackages prefix="C_Cpp" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"
- ecorePackage="C_Cpp.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//VisibilityKind">
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/private"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/protected"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/public"/>
+ <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+ <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+ <details key="UNION_PROPERTIES" value="REPORT"/>
+ <details key="UNTYPED_PROPERTIES" value="REPORT"/>
+ <details key="DUPLICATE_FEATURES" value="DISCARD"/>
+ <details key="SUBSETTING_PROPERTIES" value="REPORT"/>
+ <details key="VALIDATION_DELEGATES" value="IGNORE"/>
+ <details key="OPPOSITE_ROLE_NAMES" value="IGNORE"/>
+ <details key="COMMENTS" value="PROCESS"/>
+ <details key="DUPLICATE_FEATURE_INHERITANCE" value="DISCARD"/>
+ <details key="DUPLICATE_OPERATIONS" value="DISCARD"/>
+ <details key="PROPERTY_DEFAULT_EXPRESSIONS" value="IGNORE"/>
+ <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+ <details key="REDEFINING_PROPERTIES" value="REPORT"/>
+ <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+ <details key="NON_API_INVARIANTS" value="IGNORE"/>
+ <details key="DUPLICATE_OPERATION_INHERITANCE" value="DISCARD"/>
+ <details key="REDEFINING_OPERATIONS" value="REPORT"/>
+ <details key="INVOCATION_DELEGATES" value="IGNORE"/>
+ <details key="DERIVED_FEATURES" value="PROCESS"/>
+ <details key="OPERATION_BODIES" value="IGNORE"/>
+ <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
+ <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+ </genAnnotations>
+ <foreignModel>C_Cpp.profile.uml</foreignModel>
+ <genPackages xsi:type="genmodel:GenPackage" prefix="C_Cpp" basePackage="org.eclipse.papyrus"
+ resource="XML" disposableProviderFactory="true" ecorePackage="C_Cpp.ecore#/">
+ <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//VisibilityKind">
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/private"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/protected"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//VisibilityKind/public"/>
</genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//EAccessKind">
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/read"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/write"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/readWrite"/>
+ <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//EAccessKind">
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/read"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/write"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EAccessKind/readWrite"/>
</genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//EStorageClass">
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/volatile"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/register"/>
- <genEnumLiterals ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/extern"/>
+ <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="C_Cpp.ecore#//EStorageClass">
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/volatile"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/register"/>
+ <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="C_Cpp.ecore#//EStorageClass/extern"/>
</genEnums>
- <genClasses ecoreClass="C_Cpp.ecore#//Ptr">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ptr/base_parameter"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ptr/base_property"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Ptr/declaration"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Include">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/body"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/preBody"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/header"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_package"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_class"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_PackageImport"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//ManualGeneration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ManualGeneration/extensionBody"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ManualGeneration/base_Class"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//ExternLibrary">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/includePaths"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ExternLibrary/base_package"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/libPaths"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/macros"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/libs"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/includes"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//NoCodeGen">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//NoCodeGen/base_element"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//CppRoot">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//CppRoot/base_package"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Array">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_parameter"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Array/definition"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_property"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_association"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Const">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_parameter"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_property"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_operation"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Ref">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_parameter"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_property"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//External">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//External/name"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//External/base_Classifier"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//ConstInit">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ConstInit/initialisation"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ConstInit/base_operation"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Friend">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Friend/base_dependency"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Friend/base_operation"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Inline">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Inline/base_operation"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Virtual">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Virtual/base_operation"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Typedef">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Typedef/definition"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Typedef/base_primitivetype"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Visibility">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Visibility/value"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Visibility/base_generalization"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//CppInit">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//CppInit/value"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//CppInit/base_enumerationliteral"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Template">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Template/declaration"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Template/base_class"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//TemplateBinding">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//TemplateBinding/binding"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//TemplateBinding/base_templatebinding"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//TemplateParameter">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//TemplateParameter/name"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//TemplateParameter/base_templateparameter"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//Union">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Union/base_DataType"/>
- </genClasses>
- <genClasses ecoreClass="C_Cpp.ecore#//StorageClass">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//StorageClass/storageClass"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//StorageClass/base_Parameter"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//StorageClass/base_Property"/>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Ptr">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ptr/base_parameter"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ptr/base_property"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Ptr/declaration"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Include">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/body"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/preBody"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Include/header"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_package"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_class"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Include/base_PackageImport"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//ManualGeneration">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ManualGeneration/extensionBody"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ManualGeneration/base_Class"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//ExternLibrary">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/includePaths"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ExternLibrary/base_package"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/libPaths"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/macros"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/libs"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ExternLibrary/includes"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//NoCodeGen">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//NoCodeGen/base_element"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//CppRoot">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//CppRoot/base_package"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Array">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_parameter"/>
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Array/definition"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_property"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Array/base_association"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Const">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_parameter"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_property"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Const/base_operation"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Ref">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_parameter"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Ref/base_property"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//External">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//External/name"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//External/base_Classifier"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//ConstInit">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//ConstInit/initialisation"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//ConstInit/base_operation"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Friend">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Friend/base_dependency"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Friend/base_operation"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Inline">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Inline/base_operation"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Virtual">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Virtual/base_operation"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Typedef">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Typedef/definition"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Typedef/base_primitivetype"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Visibility">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Visibility/value"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Visibility/base_generalization"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//CppInit">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//CppInit/value"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//CppInit/base_enumerationliteral"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Template">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//Template/declaration"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Template/base_class"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//TemplateBinding">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//TemplateBinding/binding"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//TemplateBinding/base_templatebinding"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//TemplateParameter">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//TemplateParameter/name"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//TemplateParameter/base_templateparameter"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Union">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Union/base_DataType"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//StorageClass">
+ <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute C_Cpp.ecore#//StorageClass/storageClass"/>
+ </genClasses>
+ <genClasses xsi:type="genmodel:GenClass" ecoreClass="C_Cpp.ecore#//Volatile">
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Volatile/base_parameter"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Volatile/base_property"/>
+ <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+ propertySortChoices="true" ecoreFeature="ecore:EReference C_Cpp.ecore#//Volatile/base_operation"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
index aa07098..13385d0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.notation
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
<notation:Diagram xmi:id="_cj6rMMoREeGKstsYRuxdvw" type="PapyrusUMLProfileDiagram" name="Modifiers" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_f4EjkMoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f4EjksoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -32,7 +32,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_f4FKrsoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_19ZzgByHEduN1bTiWJ0lyw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f4EjkcoREeGKstsYRuxdvw" x="81" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f4EjkcoREeGKstsYRuxdvw" x="295" y="161" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_f4faUMoREeGKstsYRuxdvw" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f4faUsoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -45,15 +45,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f4gBYsoREeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8IYVUI1SEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8IYVUY1SEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8IYVUo1SEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8IYVU41SEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8IYVVI1SEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8IYVVY1SEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nmzVYPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nmzVYfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nmzVYvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nmz8cPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nmz8cfuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_f4gBY8oREeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f4faUcoREeGKstsYRuxdvw" x="81" y="27" width="487"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f4faUcoREeGKstsYRuxdvw" x="95" y="27" width="685"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_gcSD4MoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gcSq8MoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -79,7 +79,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcTSBMoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_2VwCEByHEduN1bTiWJ0lyw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcSD4coREeGKstsYRuxdvw" x="225" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gcSD4coREeGKstsYRuxdvw" x="503" y="162" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_hA3-sMoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hA4lwMoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -105,7 +105,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_hA5M1MoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_l2faUByHEduN1bTiWJ0lyw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hA3-scoREeGKstsYRuxdvw" x="351" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hA3-scoREeGKstsYRuxdvw" x="627" y="161" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_hBS1cMoREeGKstsYRuxdvw" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hBS1csoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -118,15 +118,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hBTcg8oREeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-KsyYI1SEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KsyYY1SEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KsyYo1SEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KsyY41SEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KsyZI1SEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-KsyZY1SEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_npA74PuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_npA74fuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_npBi8PuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_npBi8fuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_npBi8vuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_hBTchMoREeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBS1ccoREeGKstsYRuxdvw" x="81" y="333" width="460"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hBS1ccoREeGKstsYRuxdvw" x="203" y="333" width="634"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_1D62QMoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1D7dUMoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -152,7 +152,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_1D8rdMoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_e6bN0ByMEdu0tMSz-ceC5A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1D62QcoREeGKstsYRuxdvw" x="720" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1D62QcoREeGKstsYRuxdvw" x="876" y="161" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_1ujusMoREeGKstsYRuxdvw" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1ujussoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -165,15 +165,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1ukVwMoREeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-YRe4I1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-YSF8I1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-YSF8Y1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-YSF8o1TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-YSF841TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-YSF9I1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq7AYPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq7AYfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq7ncPuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq7ncfuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq7ncvuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_1ukVwcoREeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ujuscoREeGKstsYRuxdvw" x="720" y="333"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ujuscoREeGKstsYRuxdvw" x="876" y="332"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_2QldsMoREeGKstsYRuxdvw" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2QldssoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -186,15 +186,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2QmEwMoREeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9FonwI1SEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9FpO0I1SEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9FpO0Y1SEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9FpO0o1SEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9FpO041SEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9FpO1I1SEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nr7tAPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nr7tAfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nr7tAvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nr8UEPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nr8UEfuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_2QmEwcoREeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2QldscoREeGKstsYRuxdvw" x="711" y="27" width="370"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2QldscoREeGKstsYRuxdvw" x="788" y="26" width="449"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_4yVowMoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4yWP0MoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -220,7 +220,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_4yW27MoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_lfbL4ByMEdu0tMSz-ceC5A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4yVowcoREeGKstsYRuxdvw" x="855" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4yVowcoREeGKstsYRuxdvw" x="1011" y="161" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_51_eIMoREeGKstsYRuxdvw" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_52AFMMoREeGKstsYRuxdvw" source="ShadowFigure">
@@ -246,7 +246,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_52BTVMoREeGKstsYRuxdvw"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_FA2LQByNEdu0tMSz-ceC5A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_51_eIcoREeGKstsYRuxdvw" x="981" y="162" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_51_eIcoREeGKstsYRuxdvw" x="1137" y="161" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_AFKQUMp5EeGa7fAyIn2eXA" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AFN6sMp5EeGa7fAyIn2eXA" source="ShadowFigure">
@@ -279,7 +279,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_AFPI1Mp5EeGa7fAyIn2eXA"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_WgwmcByHEduN1bTiWJ0lyw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AFKQUcp5EeGa7fAyIn2eXA" x="477" y="162" width="181" height="82"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AFKQUcp5EeGa7fAyIn2eXA" x="95" y="160" width="181" height="82"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_AGCaEMp5EeGa7fAyIn2eXA" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AGDBIMp5EeGa7fAyIn2eXA" source="ShadowFigure">
@@ -292,15 +292,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AGDoNMp5EeGa7fAyIn2eXA" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8UY7kI1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8UY7kY1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8UY7ko1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8UY7k41TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8UY7lI1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8UY7lY1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ntl54PuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ntmg8PuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ntmg8fuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ntmg8vuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ntnIAPuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_AGDoNcp5EeGa7fAyIn2eXA" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGCaEcp5EeGa7fAyIn2eXA" x="558" y="333" width="100"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AGCaEcp5EeGa7fAyIn2eXA" x="93" y="333" width="100"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Kbn_MNY9EeGH9LIP6-_nLw" type="1002" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KbpNUNY9EeGH9LIP6-_nLw" source="ShadowFigure">
@@ -314,7 +314,7 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_Kbp0YtY9EeGH9LIP6-_nLw" type="3"/>
<element xmi:type="uml:Comment" href="C_Cpp.profile.uml#_KaTwkNY9EeGH9LIP6-_nLw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kbn_MdY9EeGH9LIP6-_nLw" x="99" y="405" width="154" height="55"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kbn_MdY9EeGH9LIP6-_nLw" x="264" y="258" width="154" height="55"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_Oin68F5fEeKpvPHLdOdp2Q" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OitagF5fEeKpvPHLdOdp2Q" source="ShadowFigure">
@@ -327,15 +327,15 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OiuooV5fEeKpvPHLdOdp2Q" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Oiv2wF5fEeKpvPHLdOdp2Q" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oiwd0F5fEeKpvPHLdOdp2Q" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oiwd0V5fEeKpvPHLdOdp2Q" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oiwd0l5fEeKpvPHLdOdp2Q" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oiwd015fEeKpvPHLdOdp2Q" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Oiwd1F5fEeKpvPHLdOdp2Q" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuhuAPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuiVEPuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuiVEfuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuiVEvuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nuiVE_uNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_Oiuool5fEeKpvPHLdOdp2Q" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OivPsF5fEeKpvPHLdOdp2Q" x="873" y="333"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OivPsF5fEeKpvPHLdOdp2Q" x="1029" y="332"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_QCi1kF5fEeKpvPHLdOdp2Q" type="1026" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QCjcoF5fEeKpvPHLdOdp2Q" source="ShadowFigure">
@@ -361,7 +361,7 @@
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_QCjcsF5fEeKpvPHLdOdp2Q"/>
</children>
<element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_QCUzIF5fEeKpvPHLdOdp2Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QCi1kV5fEeKpvPHLdOdp2Q" x="873" y="423" height="55"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QCi1kV5fEeKpvPHLdOdp2Q" x="1029" y="422" height="55"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_41tDoI1SEeKTUILNxKtfZw" type="1031" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41uRwI1SEeKTUILNxKtfZw" source="ShadowFigure">
@@ -374,15 +374,41 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41u40Y1SEeKTUILNxKtfZw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41wG8I1SEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41wG8Y1SEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41wG8o1SEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41wG841SEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41wG9I1SEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41wG9Y1SEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nwVE0PuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nwVE0fuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nwVE0vuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nwVr4PuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nwVr4fuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_41u40o1SEeKTUILNxKtfZw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41u4041SEeKTUILNxKtfZw" x="363" y="407" width="133"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_41u4041SEeKTUILNxKtfZw" x="588" y="407" width="133"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_yA2SYPuNEeOuv40UUNEbNQ" type="1026" fontName="Sans Serif" lineColor="0">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yA2SYfuNEeOuv40UUNEbNQ" source="ShadowFigure">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yA2SYvuNEeOuv40UUNEbNQ" key="ShadowFigure_Value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yA2SY_uNEeOuv40UUNEbNQ" source="displayNameLabelIcon">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yA2SZPuNEeOuv40UUNEbNQ" key="displayNameLabelIcon_value" value="false"/>
+ </eAnnotations>
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yA2SZfuNEeOuv40UUNEbNQ" source="QualifiedName">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yA2SZvuNEeOuv40UUNEbNQ" key="QualifiedNameDepth" value="1000"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_yA2SZ_uNEeOuv40UUNEbNQ" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yA2SaPuNEeOuv40UUNEbNQ" type="1071">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yA2SafuNEeOuv40UUNEbNQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yA2SavuNEeOuv40UUNEbNQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yA2Sa_uNEeOuv40UUNEbNQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yA2SbPuNEeOuv40UUNEbNQ"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_yA2SbfuNEeOuv40UUNEbNQ" visible="false" type="1019">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_yA2SbvuNEeOuv40UUNEbNQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_yA2Sb_uNEeOuv40UUNEbNQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_yA2ScPuNEeOuv40UUNEbNQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yA2ScfuNEeOuv40UUNEbNQ"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="C_Cpp.profile.uml#_yA1EQPuNEeOuv40UUNEbNQ"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yA2SdfuNEeOuv40UUNEbNQ" x="731" y="161" height="82"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_cj6rMcoREeGKstsYRuxdvw"/>
<element xmi:type="uml:Profile" href="C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
@@ -390,101 +416,128 @@
<styles xmi:type="notation:FontStyle" xmi:id="_f5Mk8coREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_Vb-6QByIEduN1bTiWJ0lyw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f5Mk8soREeGKstsYRuxdvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_saKyMMoREeGKstsYRuxdvw" id="(0.13212435233160622,0.7)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TUdoIPuOEeOuv40UUNEbNQ" id="(0.44525547445255476,0.78)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_gcvW4MoREeGKstsYRuxdvw" type="1013" source="_gcSD4MoREeGKstsYRuxdvw" target="_f4faUMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_gcvW4coREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_V-ysYByIEduN1bTiWJ0lyw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gcvW4soREeGKstsYRuxdvw" points="[0, 0, -133, -30]$[83, 18, -50, -12]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__VvW0Mp-EeGa7fAyIn2eXA" id="(0.39630390143737165,0.98)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rkf6APuNEeOuv40UUNEbNQ" id="(0.56,0.17073170731707318)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__VvW0Mp-EeGa7fAyIn2eXA" id="(0.6773722627737226,0.88)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_hBtsMMoREeGKstsYRuxdvw" type="1013" source="_hA3-sMoREeGKstsYRuxdvw" target="_hBS1cMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_hBtsMcoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_kJ5gMByIEduN1bTiWJ0lyw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hBtsMsoREeGKstsYRuxdvw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t6c5MMoREeGKstsYRuxdvw" id="(0.673773987206823,0.08)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hBtsMsoREeGKstsYRuxdvw" points="[-5, 9, 47, -90]$[-5, 99, 47, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rk5ioPuNEeOuv40UUNEbNQ" id="(0.62,0.8902439024390244)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t6c5MMoREeGKstsYRuxdvw" id="(0.6852248394004282,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_hh-goMoREeGKstsYRuxdvw" type="1013" source="_f4EjkMoREeGKstsYRuxdvw" target="_hBS1cMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_hh_HsMoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_lzRRwByIEduN1bTiWJ0lyw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hh_HscoREeGKstsYRuxdvw" points="[50, -16, -351, 105]$[351, -106, -50, 15]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tS-pgMoREeGKstsYRuxdvw" id="(0.14285714285714285,0.1)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hh_HscoREeGKstsYRuxdvw" points="[67, 0, -7, -99]$[67, 90, -7, -9]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rkQpcPuNEeOuv40UUNEbNQ" id="(0.350253807106599,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tS-pgMoREeGKstsYRuxdvw" id="(0.37066246056782337,0.18)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_k7v40MoREeGKstsYRuxdvw" type="1013" source="_gcSD4MoREeGKstsYRuxdvw" target="_hBS1cMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_k7v40coREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_mb27wByIEduN1bTiWJ0lyw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k7v40soREeGKstsYRuxdvw" points="[50, -45, -159, 140]$[180, -160, -29, 25]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CTKKMMp_EeGa7fAyIn2eXA" id="(0.417910447761194,0.12)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k7v40soREeGKstsYRuxdvw" points="[49, 0, 33, -114]$[49, 89, 33, -25]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rkrgMPuNEeOuv40UUNEbNQ" id="(0.01,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_wqyS0MoREeGKstsYRuxdvw" type="1013" source="_hA3-sMoREeGKstsYRuxdvw" target="_f4faUMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_wqyS0coREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_q3wUwByHEduN1bTiWJ0lyw"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wqyS0soREeGKstsYRuxdvw" points="[-42, -50, 92, 110]$[-114, -135, 20, 25]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xdVxIMoREeGKstsYRuxdvw" id="(0.6447638603696099,0.94)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rkghEPuNEeOuv40UUNEbNQ" id="(0.46,0.06097560975609756)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xdVxIMoREeGKstsYRuxdvw" id="(0.8452554744525548,0.74)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_1u7iIMoREeGKstsYRuxdvw" type="1013" source="_1D62QMoREeGKstsYRuxdvw" target="_1ujusMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_1u7iIcoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_gvyM8ByMEdu0tMSz-ceC5A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1u7iIsoREeGKstsYRuxdvw" points="[-50, -16, 675, 205]$[-725, -221, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rlSkMPuNEeOuv40UUNEbNQ" id="(0.48,0.7926829268292683)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_2Q9RIMoREeGKstsYRuxdvw" type="1013" source="_1D62QMoREeGKstsYRuxdvw" target="_2QldsMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_2Q9RIcoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_hPPwIByMEdu0tMSz-ceC5A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2Q9RIsoREeGKstsYRuxdvw" points="[-50, -16, 675, 205]$[-725, -221, 0, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HVmd4MoSEeGKstsYRuxdvw" id="(0.13513513513513514,0.94)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rlTLQfuNEeOuv40UUNEbNQ" id="(0.51,0.23170731707317074)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HVmd4MoSEeGKstsYRuxdvw" id="(0.2984409799554566,0.82)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_4ywfgMoREeGKstsYRuxdvw" type="1013" source="_4yVowMoREeGKstsYRuxdvw" target="_2QldsMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_4ywfgcoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_n1PMsByMEdu0tMSz-ceC5A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4ywfgsoREeGKstsYRuxdvw" points="[0, 0, -707, -61]$[657, 56, -50, -5]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I59zoMoSEeGKstsYRuxdvw" id="(0.5162162162162162,0.84)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I59zoMoSEeGKstsYRuxdvw" id="(0.6057906458797327,0.88)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_7BzxAMoREeGKstsYRuxdvw" type="1013" source="_51_eIMoREeGKstsYRuxdvw" target="_2QldsMoREeGKstsYRuxdvw" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_7BzxAcoREeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_K5gnwByNEdu0tMSz-ceC5A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7BzxAsoREeGKstsYRuxdvw" points="[-50, -30, 217, 130]$[-226, -135, 41, 25]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_If9_QMoSEeGKstsYRuxdvw" id="(0.8871287128712871,0.46)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_If9_QMoSEeGKstsYRuxdvw" id="(0.8752783964365256,0.8)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_fjeXIMoSEeGKstsYRuxdvw" type="1013" source="_hA3-sMoREeGKstsYRuxdvw" target="_2QldsMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_fjeXIcoSEeGKstsYRuxdvw" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_ThSyYByMEdu0tMSz-ceC5A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fjeXIsoSEeGKstsYRuxdvw" points="[-4, -5, -145, 95]$[-4, -41, -145, 59]$[140, -41, -1, 59]$[140, -90, -1, 10]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EELT8MoTEeGKstsYRuxdvw" id="(0.85,0.05)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hkYe8MoSEeGKstsYRuxdvw" id="(0.038306451612903226,0.8)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fjeXIsoSEeGKstsYRuxdvw" points="[-20, 0, -114, 89]$[-20, -41, -114, 48]$[95, -41, 1, 48]$[95, -85, 1, 4]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EELT8MoTEeGKstsYRuxdvw" id="(0.78,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hkYe8MoSEeGKstsYRuxdvw" id="(0.024498886414253896,0.92)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_AHl5QMp5EeGa7fAyIn2eXA" type="1013" source="_AFKQUMp5EeGa7fAyIn2eXA" target="_AGCaEMp5EeGa7fAyIn2eXA" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_AHl5Qcp5EeGa7fAyIn2eXA" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_gufsIByPEduuTv8efIb91A"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AHl5Qsp5EeGa7fAyIn2eXA" points="[67, 41, -5, -114]$[67, 130, -5, -25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7PAn4I1TEeKTUILNxKtfZw" id="(0.7458563535911602,0.9634146341463414)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7PAn4I1TEeKTUILNxKtfZw" id="(0.23756906077348067,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rmBkAPuNEeOuv40UUNEbNQ" id="(0.45,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_0NWGEMp-EeGa7fAyIn2eXA" type="1013" source="_AFKQUMp5EeGa7fAyIn2eXA" target="_hBS1cMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_0NWGEcp-EeGa7fAyIn2eXA" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_jeImYByIEduN1bTiWJ0lyw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0NWGEsp-EeGa7fAyIn2eXA" points="[-50, -1, 219, 0]$[-79, 0, 190, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zb4p0I1TEeKTUILNxKtfZw" id="(0.22631578947368422,0.7926829268292683)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bkd4MMp_EeGa7fAyIn2eXA" id="(0.9347826086956522,0.02)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0NWGEsp-EeGa7fAyIn2eXA" points="[-32, 0, -4, -97]$[-32, 91, -4, -6]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zb4p0I1TEeKTUILNxKtfZw" id="(0.9116022099447514,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bkd4MMp_EeGa7fAyIn2eXA" id="(0.04574132492113565,0.12)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_1jG_IMp-EeGa7fAyIn2eXA" type="1013" source="_AFKQUMp5EeGa7fAyIn2eXA" target="_f4faUMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_1jG_Icp-EeGa7fAyIn2eXA" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_Z4QGsByHEduN1bTiWJ0lyw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1jG_Isp-EeGa7fAyIn2eXA" points="[-38, -50, 227, 302]$[-247, -327, 18, 25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_BiQI1TEeKTUILNxKtfZw" id="(0.33157894736842103,0.024390243902439025)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__wWPMMp-EeGa7fAyIn2eXA" id="(0.9383983572895277,0.98)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1jG_Isp-EeGa7fAyIn2eXA" points="[-4, 0, 6, 83]$[-4, -83, 6, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4_BiQI1TEeKTUILNxKtfZw" id="(0.5303867403314917,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__wWPMMp-EeGa7fAyIn2eXA" id="(0.12554744525547445,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_M8Z54NY9EeGH9LIP6-_nLw" type="1022" source="_Kbn_MNY9EeGH9LIP6-_nLw" target="_f4EjkMoREeGKstsYRuxdvw" routing="Rectilinear" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_M8Z54dY9EeGH9LIP6-_nLw" fontName="Sans Serif"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M8Z54tY9EeGH9LIP6-_nLw" points="[-43, 21, -7, 216]$[-79, 21, -43, 216]$[-79, -245, -43, -50]$[-61, -245, -25, -50]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M8gnkNY9EeGH9LIP6-_nLw" id="(0.2804878048780488,0.171875)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M8gnkdY9EeGH9LIP6-_nLw" id="(0.2403846153846154,0.95)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_M8Z54tY9EeGH9LIP6-_nLw" points="[63, -11, -42, 165]$[63, -178, -42, -2]$[74, -178, -31, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M8gnkNY9EeGH9LIP6-_nLw" id="(0.35714285714285715,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_M8gnkdY9EeGH9LIP6-_nLw" id="(0.1218274111675127,1.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_R-KNsF5fEeKpvPHLdOdp2Q" type="1013" source="_QCi1kF5fEeKpvPHLdOdp2Q" target="_Oin68F5fEeKpvPHLdOdp2Q" lineColor="0">
<styles xmi:type="notation:FontStyle" xmi:id="_R-KNsV5fEeKpvPHLdOdp2Q" fontName="Sans Serif"/>
<element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_R-F8QV5fEeKpvPHLdOdp2Q"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_R-KNsl5fEeKpvPHLdOdp2Q" points="[8, -3, 0, 49]$[8, -43, 0, 9]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-PtQF5fEeKpvPHLdOdp2Q" id="(0.47,0.05)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-QUUF5fEeKpvPHLdOdp2Q" id="(0.51,0.96)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_R-PtQF5fEeKpvPHLdOdp2Q" id="(0.52,0.0)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_oBcioPuQEeOuv40UUNEbNQ" type="1013" source="_yA2SYPuNEeOuv40UUNEbNQ" target="_f4faUMoREeGKstsYRuxdvw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_oBciofuQEeOuv40UUNEbNQ"/>
+ <element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_oBZfUfuQEeOuv40UUNEbNQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oBciovuQEeOuv40UUNEbNQ" points="[3, -9, 0, 97]$[26, -106, 23, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oBgNAPuQEeOuv40UUNEbNQ" id="(0.23,0.10975609756097561)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oBgNAfuQEeOuv40UUNEbNQ" id="(0.9664233576642336,0.74)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_7PnnsPuQEeOuv40UUNEbNQ" type="1013" source="_yA2SYPuNEeOuv40UUNEbNQ" target="_hBS1cMoREeGKstsYRuxdvw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_7PnnsfuQEeOuv40UUNEbNQ"/>
+ <element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_7Pg6APuQEeOuv40UUNEbNQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7PnnsvuQEeOuv40UUNEbNQ" points="[1, 15, 0, -98]$[58, 109, 57, -4]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7PqrAPuQEeOuv40UUNEbNQ" id="(0.48,0.8170731707317073)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7PqrAfuQEeOuv40UUNEbNQ" id="(0.9100946372239748,0.16)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_-qfMEPuQEeOuv40UUNEbNQ" type="1013" source="_yA2SYPuNEeOuv40UUNEbNQ" target="_2QldsMoREeGKstsYRuxdvw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_-qfMEfuQEeOuv40UUNEbNQ"/>
+ <element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_-qZFcPuQEeOuv40UUNEbNQ"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-qfMEvuQEeOuv40UUNEbNQ" points="[4, -16, 0, 103]$[-24, -119, -28, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-qi2cPuQEeOuv40UUNEbNQ" id="(0.81,0.1951219512195122)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-qi2cfuQEeOuv40UUNEbNQ" id="(0.062360801781737196,0.64)"/>
</edges>
</notation:Diagram>
<notation:Diagram xmi:id="_UNXagMoSEeGKstsYRuxdvw" type="PapyrusUMLProfileDiagram" name="Tweaks" measurementUnit="Pixel">
@@ -546,11 +599,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XztPFMoSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="___hmAI1SEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="___iNEI1SEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="___iNEY1SEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="___iNEo1SEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="___iNE41SEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="___iNFI1SEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nyDjIPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nyDjIfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nyDjIvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nyEKMPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nyEKMfuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_XztPFcoSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
@@ -567,11 +620,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YR5m9MoSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CJgxUI1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CJhYYI1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CJhYYY1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CJhYYo1TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CJhYY41TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CJhYZI1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nzGsAPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nzGsAfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nzHTEPuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nzHTEfuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nzHTEvuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_YR5m9coSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
@@ -640,11 +693,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a2r34soSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BNxh0I1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BNxh0Y1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BNxh0o1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BNxh041TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BNxh1I1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BNyI4I1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n0NfQPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n0NfQfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n0OGUPuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n0OGUfuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n0OGUvuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_a2r348oSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
@@ -755,11 +808,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1pP7dcoSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AtDaYI1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AtDaYY1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AtDaYo1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AtDaY41TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AtDaZI1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AtDaZY1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n1yzoPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n1zasPuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n1zasfuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n1zasvuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n10BwPuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_1pP7dsoSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PackageImport"/>
@@ -879,11 +932,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBq-E-PxEeKKu7vQg_d5Xw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CBsMMOPxEeKKu7vQg_d5Xw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBsMMePxEeKKu7vQg_d5Xw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBsMMuPxEeKKu7vQg_d5Xw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBsMM-PxEeKKu7vQg_d5Xw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBsMNOPxEeKKu7vQg_d5Xw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CBsMNePxEeKKu7vQg_d5Xw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3v7cPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3v7cfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3v7cvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n3wigPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n31bAPuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_CBq-FOPxEeKKu7vQg_d5Xw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
@@ -1092,11 +1145,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yfmp8MoSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EvAz8I1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EvAz8Y1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EvAz8o1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EvAz841TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EvAz9I1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EvAz9Y1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n5dysPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n5dysfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n5eZwPuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n5eZwfuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n5eZwvuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_yfmp8coSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateParameter"/>
@@ -1113,11 +1166,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_y9Da9soSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EOVv0I1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EOVv0Y1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EOVv0o1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EOVv041TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EOVv1I1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EOVv1Y1TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6NZkPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6OAoPuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6OAofuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6OAovuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6OAo_uNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_y9ECAMoSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
@@ -1134,11 +1187,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zlFrVMoSEeGKstsYRuxdvw" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FRzX8I1TEeKTUILNxKtfZw" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FRzX8Y1TEeKTUILNxKtfZw" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FRz_AI1TEeKTUILNxKtfZw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FRz_AY1TEeKTUILNxKtfZw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FRz_Ao1TEeKTUILNxKtfZw" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FRz_A41TEeKTUILNxKtfZw" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n61rsPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n61rsfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n61rsvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n62SwPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n62SwfuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_zlFrVcoSEeGKstsYRuxdvw" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/>
@@ -1308,11 +1361,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsYGJeL9EeKxe91u-BdTVQ" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TsZUQOL9EeKxe91u-BdTVQ" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsZUQeL9EeKxe91u-BdTVQ" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsZUQuL9EeKxe91u-BdTVQ" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsZUQ-L9EeKxe91u-BdTVQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsZUROL9EeKxe91u-BdTVQ" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TsZUReL9EeKxe91u-BdTVQ" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8AwYPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8AwYfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8BXcPuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8BXcfuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8BXcvuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_TsYGJuL9EeKxe91u-BdTVQ" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
@@ -1329,11 +1382,11 @@
<details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdDheL9EeKxe91u-BdTVQ" key="QualifiedNameDepth" value="1000"/>
</eAnnotations>
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZMdqkOL9EeKxe91u-BdTVQ" source="Stereotype_Annotation">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdqkeL9EeKxe91u-BdTVQ" key="StereotypeWithQualifiedNameList" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdqkuL9EeKxe91u-BdTVQ" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdqk-L9EeKxe91u-BdTVQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdqlOL9EeKxe91u-BdTVQ" key="PropStereoDisplay" value=""/>
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZMdqleL9EeKxe91u-BdTVQ" key="StereotypePropertyLocation" value="Compartment"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8mmQPuNEeOuv40UUNEbNQ" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8mmQfuNEeOuv40UUNEbNQ" key="StereotypeList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8mmQvuNEeOuv40UUNEbNQ" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8nNUPuNEeOuv40UUNEbNQ" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n8nNUfuNEeOuv40UUNEbNQ" key="StereotypePropertyLocation" value="Compartment"/>
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_ZMdDhuL9EeKxe91u-BdTVQ" type="1084"/>
<element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
@@ -1341,17 +1394,5 @@
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_br8hIZVTEeKBzP_954cAAA"/>
<element xmi:type="uml:Profile" href="C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
- <edges xmi:type="notation:Connector" xmi:id="_bvVP8OL9EeKxe91u-BdTVQ" type="1013" source="_c-ZAcJVTEeKBzP_954cAAA" target="_TsW4AOL9EeKxe91u-BdTVQ" lineColor="0">
- <styles xmi:type="notation:FontStyle" xmi:id="_bvVP8eL9EeKxe91u-BdTVQ" fontName="Sans Serif"/>
- <element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_bvC8EOL9EeKxe91u-BdTVQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bvVP8uL9EeKxe91u-BdTVQ" points="[-8, -5, 0, 91]$[-8, -121, 0, -25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bvaIcOL9EeKxe91u-BdTVQ" id="(0.23236514522821577,0.047619047619047616)"/>
- </edges>
- <edges xmi:type="notation:Connector" xmi:id="_cKor4OL9EeKxe91u-BdTVQ" type="1013" source="_c-ZAcJVTEeKBzP_954cAAA" target="_ZMcccOL9EeKxe91u-BdTVQ" lineColor="0">
- <styles xmi:type="notation:FontStyle" xmi:id="_cKor4eL9EeKxe91u-BdTVQ" fontName="Sans Serif"/>
- <element xmi:type="uml:Extension" href="C_Cpp.profile.uml#_cKgwEOL9EeKxe91u-BdTVQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_cKor4uL9EeKxe91u-BdTVQ" points="[-2, -3, -1, 89]$[-2, -67, -1, 25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_cKrvMOL9EeKxe91u-BdTVQ" id="(0.8049792531120332,0.02857142857142857)"/>
- </edges>
</notation:Diagram>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
index 4034bde..5af3db1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml
@@ -1,99 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
<uml:Profile xmi:id="_j9REUByGEduN1bTiWJ0lyw" name="C_Cpp" metaclassReference="_TRvswByHEduN1bTiWJ0lyw _gphJsByIEduN1bTiWJ0lyw _Gt0nQByJEduN1bTiWJ0lyw _GuFF8ByJEduN1bTiWJ0lyw _G0LmkByMEdu0tMSz-ceC5A _G0XMwByMEdu0tMSz-ceC5A _G0a3IByMEdu0tMSz-ceC5A _jBetUByNEdu0tMSz-ceC5A _jB15sByNEdu0tMSz-ceC5A _jB_qsByNEdu0tMSz-ceC5A _jCCuAByNEdu0tMSz-ceC5A _jCGYYByNEdu0tMSz-ceC5A _jCJbsByNEdu0tMSz-ceC5A _X7dJsDlPEd2mO4M0idYmag _OiGWgF5fEeKpvPHLdOdp2Q _41Sz8I1SEeKTUILNxKtfZw _CBeJwOPxEeKKu7vQg_d5Xw">
- <ownedComment xmi:id="_KaTwkNY9EeGH9LIP6-_nLw" annotatedElement="_19ZzgByHEduN1bTiWJ0lyw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_KaTwkNY9EeGH9LIP6-_nLw" annotatedElement="_19ZzgByHEduN1bTiWJ0lyw">
<body>&quot;declaration&quot; attribute should only be used, if more than one indirections of pointers (often &quot;**&quot;)</body>
</ownedComment>
- <ownedComment xmi:id="_Ew5PMP2IEeGbWP4cpLE0gg" annotatedElement="_RwTdQByJEduN1bTiWJ0lyw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_Ew5PMP2IEeGbWP4cpLE0gg" annotatedElement="_RwTdQByJEduN1bTiWJ0lyw">
<body>An arbitrary string that is added to header and body file. Although primarily intended for manual include directives, it can be used for arbitrary definitions.
&quot;preBody&quot; is added to a C++ body file before automatic include statements, &quot;body&quot; after</body>
</ownedComment>
- <ownedComment xmi:id="_GS8LQCYNEeKe9vxHwEdBmA" annotatedElement="_A3_lgCYNEeKe9vxHwEdBmA">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_GS8LQCYNEeKe9vxHwEdBmA" annotatedElement="_A3_lgCYNEeKe9vxHwEdBmA">
<body>Some toolkits require a quite particular way of use. For instance, LTTng requires the use of C (not C++) for the declaration of a trace provider and the header file is read several time with redefined macros. Therefore, the code generator supports a &quot;manual&quot; generation mode, in which primarily the contents of the CppInclude directive is written.</body>
</ownedComment>
- <ownedComment xmi:id="_w-x6sNTPEeKiLbHSN_MIRQ" annotatedElement="_PmXVQByJEduN1bTiWJ0lyw">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_w-x6sNTPEeKiLbHSN_MIRQ" annotatedElement="_PmXVQByJEduN1bTiWJ0lyw">
<body>Mark a package as External Library. If this package is used, the associated CDT project will be configured accordingly.</body>
</ownedComment>
- <ownedComment xmi:id="_LBAtgNTQEeKiLbHSN_MIRQ" annotatedElement="_IHjS8ByMEdu0tMSz-ceC5A">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_LBAtgNTQEeKiLbHSN_MIRQ" annotatedElement="_IHjS8ByMEdu0tMSz-ceC5A">
<body>No code generation should be done for this element. This also means that no include directive is generated, if the class is referenced.</body>
</ownedComment>
- <ownedComment xmi:id="_PJcigNTQEeKiLbHSN_MIRQ" annotatedElement="_u3zF8ByLEdu0tMSz-ceC5A">
+ <ownedComment xmi:type="uml:Comment" xmi:id="_PJcigNTQEeKiLbHSN_MIRQ" annotatedElement="_u3zF8ByLEdu0tMSz-ceC5A">
<body>Indicates that this package shoudl be a root package, i.e. its contents should appear on top level folder during generation. Currently not used</body>
</ownedComment>
- <elementImport xmi:id="_TRvswByHEduN1bTiWJ0lyw">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_TRvswByHEduN1bTiWJ0lyw">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
</elementImport>
- <elementImport xmi:id="_gphJsByIEduN1bTiWJ0lyw">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_gphJsByIEduN1bTiWJ0lyw">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
</elementImport>
- <elementImport xmi:id="_Gt0nQByJEduN1bTiWJ0lyw">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_Gt0nQByJEduN1bTiWJ0lyw">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</elementImport>
- <elementImport xmi:id="_GuFF8ByJEduN1bTiWJ0lyw">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_GuFF8ByJEduN1bTiWJ0lyw">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
</elementImport>
- <elementImport xmi:id="_G0LmkByMEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_G0LmkByMEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
</elementImport>
- <elementImport xmi:id="_G0XMwByMEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_G0XMwByMEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</elementImport>
- <elementImport xmi:id="_G0a3IByMEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_G0a3IByMEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
</elementImport>
- <elementImport xmi:id="_jBetUByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jBetUByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/>
</elementImport>
- <elementImport xmi:id="_jB15sByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jB15sByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
</elementImport>
- <elementImport xmi:id="_jB_qsByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jB_qsByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/>
</elementImport>
- <elementImport xmi:id="_jCCuAByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jCCuAByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateParameter"/>
</elementImport>
- <elementImport xmi:id="_jCGYYByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jCGYYByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/>
</elementImport>
- <elementImport xmi:id="_jCJbsByNEdu0tMSz-ceC5A">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_jCJbsByNEdu0tMSz-ceC5A">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>
</elementImport>
- <elementImport xmi:id="_X7dJsDlPEd2mO4M0idYmag" alias="PackageImport">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_X7dJsDlPEd2mO4M0idYmag" alias="PackageImport">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PackageImport"/>
</elementImport>
- <elementImport xmi:id="_OiGWgF5fEeKpvPHLdOdp2Q" alias="DataType">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_OiGWgF5fEeKpvPHLdOdp2Q" alias="DataType">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
</elementImport>
- <elementImport xmi:id="_41Sz8I1SEeKTUILNxKtfZw" alias="Feature">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_41Sz8I1SEeKTUILNxKtfZw" alias="Feature">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/>
</elementImport>
- <elementImport xmi:id="_CBeJwOPxEeKKu7vQg_d5Xw" alias="Classifier">
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_CBeJwOPxEeKKu7vQg_d5Xw" alias="Classifier">
<importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
</elementImport>
- <packageImport xmi:id="_6G_4UP2HEeGbWP4cpLE0gg">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_6G_4UP2HEeGbWP4cpLE0gg">
<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
</packageImport>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_rIXZEByGEduN1bTiWJ0lyw" name="VisibilityKind">
- <ownedLiteral xmi:id="_v6MwYByGEduN1bTiWJ0lyw" name="private"/>
- <ownedLiteral xmi:id="_wz28QByGEduN1bTiWJ0lyw" name="protected"/>
- <ownedLiteral xmi:id="_xKmBQByGEduN1bTiWJ0lyw" name="public"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_v6MwYByGEduN1bTiWJ0lyw" name="private"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wz28QByGEduN1bTiWJ0lyw" name="protected"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_xKmBQByGEduN1bTiWJ0lyw" name="public"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_WgwmcByHEduN1bTiWJ0lyw" name="Array">
- <ownedAttribute xmi:id="_Z3w-gByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Z4QGsByHEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Z3w-gByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Z4QGsByHEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ibI3cCBEEeOBrb_t_69W4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ibQMMCBEEeOBrb_t_69W4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_a8S9oByHEduN1bTiWJ0lyw" name="definition" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_a8S9oByHEduN1bTiWJ0lyw" name="definition" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_jd4uwByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_jeImYByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_jd4uwByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_jeImYByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jdmaACBEEeOBrb_t_69W4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jdsgoCBEEeOBrb_t_69W4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_guP0gByPEduuTv8efIb91A" name="base_association" isUnique="false" association="_gufsIByPEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_guP0gByPEduuTv8efIb91A" name="base_association" isUnique="false" association="_gufsIByPEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kZzjkCBEEeOBrb_t_69W4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kZ8tgCBEEeOBrb_t_69W4Q" value="1"/>
@@ -103,17 +103,17 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Z4QGsRyHEduN1bTiWJ0lyw" name="extension_Array" type="_WgwmcByHEduN1bTiWJ0lyw" association="_Z4QGsByHEduN1bTiWJ0lyw"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_l2faUByHEduN1bTiWJ0lyw" name="Const">
- <ownedAttribute xmi:id="_q3qOIByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_q3wUwByHEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_q3qOIByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_q3wUwByHEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_D7WaMOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D7dH4OL5EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_kJX7wByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_kJ5gMByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_kJX7wByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_kJ5gMByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I03G0OL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I0-bkOL5EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_ThDh0ByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_ThSyYByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ThDh0ByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_ThSyYByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-zTQOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-6oAOL5EeK7avO_9XJm4Q" value="1"/>
@@ -123,29 +123,29 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_q3wUwRyHEduN1bTiWJ0lyw" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_q3wUwByHEduN1bTiWJ0lyw"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_19ZzgByHEduN1bTiWJ0lyw" name="Ptr">
- <ownedAttribute xmi:id="_VbvCoByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Vb-6QByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VbvCoByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Vb-6QByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5qhDkOL4EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5qrboOL4EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_lylVQByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_lzRRwByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_lylVQByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_lzRRwByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9dMD8OL4EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9dbUgOL4EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_5xNQUNY8EeGH9LIP6-_nLw" name="declaration" visibility="public" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5xNQUNY8EeGH9LIP6-_nLw" name="declaration" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9QCHoNY8EeGH9LIP6-_nLw"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9QFK8NY8EeGH9LIP6-_nLw" value="1"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_2VwCEByHEduN1bTiWJ0lyw" name="Ref">
- <ownedAttribute xmi:id="_V-XOkByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_V-ysYByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_V-XOkByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_V-ysYByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="__nXcgOL4EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__nfYUOL4EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_mbfIUByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_mb27wByIEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_mbfIUByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_mb27wByIEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BOSXAOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BOaS0OL5EeK7avO_9XJm4Q" value="1"/>
@@ -170,17 +170,17 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_mb27wRyIEduN1bTiWJ0lyw" name="extension_Ref" type="_2VwCEByHEduN1bTiWJ0lyw" association="_mb27wByIEduN1bTiWJ0lyw"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_MyI6IByJEduN1bTiWJ0lyw" name="External">
- <ownedAttribute xmi:id="_UiU48ByJEduN1bTiWJ0lyw" name="name" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_UiU48ByJEduN1bTiWJ0lyw" name="name" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ho9-oOL9EeKxe91u-BdTVQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HpF6cOL9EeKxe91u-BdTVQ" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_Ibp-8OPxEeKKu7vQg_d5Xw" name="base_Classifier" association="_Ibyh0OPxEeKKu7vQg_d5Xw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Ibp-8OPxEeKKu7vQg_d5Xw" name="base_Classifier" association="_Ibyh0OPxEeKKu7vQg_d5Xw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_PmXVQByJEduN1bTiWJ0lyw" name="ExternLibrary">
- <ownedAttribute xmi:id="_WFVj0ByJEduN1bTiWJ0lyw" name="includePaths" visibility="public" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_WFVj0ByJEduN1bTiWJ0lyw" name="includePaths" visibility="public" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x4IIgOL8EeKxe91u-BdTVQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x4hxIOL8EeKxe91u-BdTVQ" value="*"/>
@@ -188,10 +188,10 @@
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_zqayUByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_zqqC4ByJEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_zqayUByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_zqqC4ByJEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_qvPI4NTHEeKiLbHSN_MIRQ" name="libPaths" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_qvPI4NTHEeKiLbHSN_MIRQ" name="libPaths" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E5XWoNTMEeKiLbHSN_MIRQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E5ggkNTMEeKiLbHSN_MIRQ" value="*"/>
@@ -199,7 +199,7 @@
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_FRPjwNTPEeKiLbHSN_MIRQ" name="macros" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_FRPjwNTPEeKiLbHSN_MIRQ" name="macros" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FftdkNTPEeKiLbHSN_MIRQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ff648NTPEeKiLbHSN_MIRQ" value="*"/>
@@ -207,7 +207,7 @@
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_FzcR4NTPEeKiLbHSN_MIRQ" name="libs" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_FzcR4NTPEeKiLbHSN_MIRQ" name="libs" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F6mCwNTPEeKiLbHSN_MIRQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F6wa0NTPEeKiLbHSN_MIRQ" value="*"/>
@@ -215,7 +215,7 @@
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_NkWpcNTPEeKiLbHSN_MIRQ" name="includes" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_NkWpcNTPEeKiLbHSN_MIRQ" name="includes" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pkq7YNTPEeKiLbHSN_MIRQ"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PkyQINTPEeKiLbHSN_MIRQ" value="*"/>
@@ -225,35 +225,35 @@
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_RwTdQByJEduN1bTiWJ0lyw" name="Include">
- <ownedAttribute xmi:id="_XU2q8ByJEduN1bTiWJ0lyw" name="body" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_XU2q8ByJEduN1bTiWJ0lyw" name="body" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XhvLMBybEdudA-H9lQdiWg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XiD7UBybEdudA-H9lQdiWg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RyRCMBBXEdyoOLr5UzE5gA" value=""/>
</ownedAttribute>
- <ownedAttribute xmi:id="_r9C7EP2HEeGbWP4cpLE0gg" name="preBody" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_r9C7EP2HEeGbWP4cpLE0gg" name="preBody" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_siaR8P2HEeGbWP4cpLE0gg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sia5AP2HEeGbWP4cpLE0gg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_5Ewt4JVWEeKvxuXeCtLm5w" name="" value=""/>
</ownedAttribute>
- <ownedAttribute xmi:id="_YtvwgByJEduN1bTiWJ0lyw" name="header" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_YtvwgByJEduN1bTiWJ0lyw" name="header" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dbl6gBybEdudA-H9lQdiWg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dbnIoBybEdudA-H9lQdiWg" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_RT5rMBBXEdyoOLr5UzE5gA" value=""/>
</ownedAttribute>
- <ownedAttribute xmi:id="_0IP90ByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_0It34ByJEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0IP90ByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_0It34ByJEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eMPUEOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eMekoOL5EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_0ja24ByJEduN1bTiWJ0lyw" name="base_class" isUnique="false" association="_0jpgYByJEduN1bTiWJ0lyw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_0ja24ByJEduN1bTiWJ0lyw" name="base_class" isUnique="false" association="_0jpgYByJEduN1bTiWJ0lyw">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fSqJkOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fSw3QOL5EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_kKB_YTlPEd2mO4M0idYmag" name="base_PackageImport" association="_kJ7RsDlPEd2mO4M0idYmag">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_kKB_YTlPEd2mO4M0idYmag" name="base_PackageImport" association="_kJ7RsDlPEd2mO4M0idYmag">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PackageImport"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gANMEOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gAb1kOL5EeK7avO_9XJm4Q" value="1"/>
@@ -269,7 +269,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_0jpgYRyJEduN1bTiWJ0lyw" name="extension_Include" type="_RwTdQByJEduN1bTiWJ0lyw" association="_0jpgYByJEduN1bTiWJ0lyw"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_u3zF8ByLEdu0tMSz-ceC5A" name="CppRoot">
- <ownedAttribute xmi:id="_xOLHcByLEdu0tMSz-ceC5A" name="base_package" isUnique="false" association="_xObmIByLEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_xOLHcByLEdu0tMSz-ceC5A" name="base_package" isUnique="false" association="_xObmIByLEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
</ownedAttribute>
</packagedElement>
@@ -277,7 +277,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_xOcNMByLEdu0tMSz-ceC5A" name="Extension_CppRoot" type="_u3zF8ByLEdu0tMSz-ceC5A" association="_xObmIByLEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_IHjS8ByMEdu0tMSz-ceC5A" name="NoCodeGen">
- <ownedAttribute xmi:id="_KiFbsByMEdu0tMSz-ceC5A" name="base_element" isUnique="false" association="_KiZkwByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KiFbsByMEdu0tMSz-ceC5A" name="base_element" isUnique="false" association="_KiZkwByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
</ownedAttribute>
</packagedElement>
@@ -288,10 +288,10 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ThSyYRyMEdu0tMSz-ceC5A" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_ThSyYByMEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_Vk8FIByMEdu0tMSz-ceC5A" name="ConstInit">
- <ownedAttribute xmi:id="_XYIhEByMEdu0tMSz-ceC5A" name="initialisation" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_XYIhEByMEdu0tMSz-ceC5A" name="initialisation" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_dtKJcByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_dtaoIByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_dtKJcByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_dtaoIByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</ownedAttribute>
</packagedElement>
@@ -299,12 +299,12 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_dtaoIRyMEdu0tMSz-ceC5A" name="Extension_CppConstInit" type="_Vk8FIByMEdu0tMSz-ceC5A" association="_dtaoIByMEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_e6bN0ByMEdu0tMSz-ceC5A" name="Friend">
- <ownedAttribute xmi:id="_gvjjcByMEdu0tMSz-ceC5A" name="base_dependency" isUnique="false" association="_gvyM8ByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_gvjjcByMEdu0tMSz-ceC5A" name="base_dependency" isUnique="false" association="_gvyM8ByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WZnFQOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WZ1uwOL5EeK7avO_9XJm4Q" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_hPAfkByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_hPPwIByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_hPAfkByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_hPPwIByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XZ6EoOL5EeK7avO_9XJm4Q"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XaHgAOL5EeK7avO_9XJm4Q" value="1"/>
@@ -317,7 +317,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hPPwIRyMEdu0tMSz-ceC5A" name="extension_Friend" type="_e6bN0ByMEdu0tMSz-ceC5A" association="_hPPwIByMEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_lfbL4ByMEdu0tMSz-ceC5A" name="Inline">
- <ownedAttribute xmi:id="_n0_8IByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_n1PMsByMEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_n0_8IByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_n1PMsByMEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</ownedAttribute>
</packagedElement>
@@ -325,7 +325,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_n1PMsRyMEdu0tMSz-ceC5A" name="extension_Inline" type="_lfbL4ByMEdu0tMSz-ceC5A" association="_n1PMsByMEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_FA2LQByNEdu0tMSz-ceC5A" name="Virtual">
- <ownedAttribute xmi:id="_K5A4gByNEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_K5gnwByNEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_K5A4gByNEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_K5gnwByNEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</ownedAttribute>
</packagedElement>
@@ -333,10 +333,10 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_K5gnwRyNEdu0tMSz-ceC5A" name="extension_Virtual" type="_FA2LQByNEdu0tMSz-ceC5A" association="_K5gnwByNEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_5yQWcByNEdu0tMSz-ceC5A" name="Typedef">
- <ownedAttribute xmi:id="_7C5e8ByNEdu0tMSz-ceC5A" name="definition" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_7C5e8ByNEdu0tMSz-ceC5A" name="definition" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_DgXagByOEdu0tMSz-ceC5A" name="base_primitivetype" isUnique="false" association="_DqJooByOEdu0tMSz-ceC5A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_DgXagByOEdu0tMSz-ceC5A" name="base_primitivetype" isUnique="false" association="_DqJooByOEdu0tMSz-ceC5A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/>
</ownedAttribute>
</packagedElement>
@@ -344,10 +344,10 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DqJooRyOEdu0tMSz-ceC5A" name="Extension_CppType" type="_5yQWcByNEdu0tMSz-ceC5A" association="_DqJooByOEdu0tMSz-ceC5A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_ALgiEByPEduuTv8efIb91A" name="Visibility">
- <ownedAttribute xmi:id="_HbLNwByPEduuTv8efIb91A" name="value" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_HbLNwByPEduuTv8efIb91A" name="value" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_NQc_EByPEduuTv8efIb91A" name="base_generalization" isUnique="false" association="_NQs2sByPEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_NQc_EByPEduuTv8efIb91A" name="base_generalization" isUnique="false" association="_NQs2sByPEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/>
</ownedAttribute>
</packagedElement>
@@ -355,10 +355,10 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NQs2sRyPEduuTv8efIb91A" name="Extension_CppVisibility" type="_ALgiEByPEduuTv8efIb91A" association="_NQs2sByPEduuTv8efIb91A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_S_sZ0ByPEduuTv8efIb91A" name="CppInit">
- <ownedAttribute xmi:id="_VcWCcByPEduuTv8efIb91A" name="value" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_VcWCcByPEduuTv8efIb91A" name="value" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_aoPfkByPEduuTv8efIb91A" name="base_enumerationliteral" isUnique="false" association="_aoVmMByPEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_aoPfkByPEduuTv8efIb91A" name="base_enumerationliteral" isUnique="false" association="_aoVmMByPEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/>
</ownedAttribute>
</packagedElement>
@@ -369,26 +369,26 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_gufsIRyPEduuTv8efIb91A" name="extension_Array" type="_WgwmcByHEduN1bTiWJ0lyw" association="_gufsIByPEduuTv8efIb91A"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_5W6MUByPEduuTv8efIb91A" name="Template">
- <ownedAttribute xmi:id="_7e8P0ByPEduuTv8efIb91A" name="declaration" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_7e8P0ByPEduuTv8efIb91A" name="declaration" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_Op3MkByQEduuTv8efIb91A" name="base_class" isUnique="false" association="_OqF2EByQEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_Op3MkByQEduuTv8efIb91A" name="base_class" isUnique="false" association="_OqF2EByQEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_9oCDQByPEduuTv8efIb91A" name="TemplateBinding">
- <ownedAttribute xmi:id="_AOo5IByQEduuTv8efIb91A" name="binding" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_AOo5IByQEduuTv8efIb91A" name="binding" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_O8vFQByQEduuTv8efIb91A" name="base_templatebinding" isUnique="false" association="_O9D1YByQEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_O8vFQByQEduuTv8efIb91A" name="base_templatebinding" isUnique="false" association="_O9D1YByQEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/>
</ownedAttribute>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_CYoEcByQEduuTv8efIb91A" name="TemplateParameter">
- <ownedAttribute xmi:id="_EV0J4ByQEduuTv8efIb91A" name="name" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_EV0J4ByQEduuTv8efIb91A" name="name" isUnique="false">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_OXfqMByQEduuTv8efIb91A" name="base_templateparameter" isUnique="false" association="_OYBOoByQEduuTv8efIb91A">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_OXfqMByQEduuTv8efIb91A" name="base_templateparameter" isUnique="false" association="_OYBOoByQEduuTv8efIb91A">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateParameter"/>
</ownedAttribute>
</packagedElement>
@@ -405,7 +405,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kKB_YDlPEd2mO4M0idYmag" name="extension_Include" type="_RwTdQByJEduN1bTiWJ0lyw" aggregation="composite" association="_kJ7RsDlPEd2mO4M0idYmag"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_A3_lgCYNEeKe9vxHwEdBmA" name="ManualGeneration">
- <ownedAttribute xmi:id="_vOBBoCYNEeKe9vxHwEdBmA" name="extensionBody" visibility="public">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_vOBBoCYNEeKe9vxHwEdBmA" name="extensionBody" visibility="public">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5zd9YCYNEeKe9vxHwEdBmA" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5zgZoCYNEeKe9vxHwEdBmA" value="1"/>
@@ -413,7 +413,7 @@
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_KEpF0CYOEeKe9vxHwEdBmA" name="base_Class" association="_KEps4CYOEeKe9vxHwEdBmA">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_KEpF0CYOEeKe9vxHwEdBmA" name="base_Class" association="_KEps4CYOEeKe9vxHwEdBmA">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
</ownedAttribute>
</packagedElement>
@@ -421,7 +421,7 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_KEps4SYOEeKe9vxHwEdBmA" name="extension_ManualGeneration" type="_A3_lgCYNEeKe9vxHwEdBmA" aggregation="composite" association="_KEps4CYOEeKe9vxHwEdBmA"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_QCUzIF5fEeKpvPHLdOdp2Q" name="Union">
- <ownedAttribute xmi:id="_R-F8QF5fEeKpvPHLdOdp2Q" name="base_DataType" association="_R-F8QV5fEeKpvPHLdOdp2Q">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_R-F8QF5fEeKpvPHLdOdp2Q" name="base_DataType" association="_R-F8QV5fEeKpvPHLdOdp2Q">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>
</ownedAttribute>
</packagedElement>
@@ -429,48 +429,52 @@
<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_R-F8Ql5fEeKpvPHLdOdp2Q" name="extension_Union" type="_QCUzIF5fEeKpvPHLdOdp2Q" aggregation="composite" association="_R-F8QV5fEeKpvPHLdOdp2Q"/>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_yOu8UJMIEeKrb5fnA81_2Q" name="EAccessKind">
- <ownedLiteral xmi:id="_zX48wJMIEeKrb5fnA81_2Q" name="read"/>
- <ownedLiteral xmi:id="_0bzQ0JMIEeKrb5fnA81_2Q" name="write"/>
- <ownedLiteral xmi:id="_1C3Q0JMIEeKrb5fnA81_2Q" name="readWrite"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zX48wJMIEeKrb5fnA81_2Q" name="read"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0bzQ0JMIEeKrb5fnA81_2Q" name="write"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1C3Q0JMIEeKrb5fnA81_2Q" name="readWrite"/>
</packagedElement>
<packagedElement xmi:type="uml:Enumeration" xmi:id="_YVBzYJMIEeKrb5fnA81_2Q" name="EStorageClass">
- <ownedLiteral xmi:id="_g3RhQJMIEeKrb5fnA81_2Q" name="volatile"/>
- <ownedLiteral xmi:id="_iJ4_sJMIEeKrb5fnA81_2Q" name="register"/>
- <ownedLiteral xmi:id="_irt6YJMIEeKrb5fnA81_2Q" name="extern"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_g3RhQJMIEeKrb5fnA81_2Q" name="volatile"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iJ4_sJMIEeKrb5fnA81_2Q" name="register"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_irt6YJMIEeKrb5fnA81_2Q" name="extern"/>
</packagedElement>
<packagedElement xmi:type="uml:Stereotype" xmi:id="_U3BNgJVPEeKCE6_KfOehJw" name="StorageClass">
- <ownedAttribute xmi:id="_X910gJVPEeKCE6_KfOehJw" name="storageClass" visibility="public" type="_YVBzYJMIEeKrb5fnA81_2Q" isUnique="false">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_X910gJVPEeKCE6_KfOehJw" name="storageClass" visibility="public" type="_YVBzYJMIEeKrb5fnA81_2Q" isUnique="false">
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yd3YYJVPEeKCE6_KfOehJw" value="1"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yd4mgJVPEeKCE6_KfOehJw" value="1"/>
<defaultValue xmi:type="uml:LiteralString" xmi:id="_Yd7CwJVPEeKCE6_KfOehJw">
<value xsi:nil="true"/>
</defaultValue>
</ownedAttribute>
- <ownedAttribute xmi:id="_bu81cOL9EeKxe91u-BdTVQ" name="base_Parameter" association="_bvC8EOL9EeKxe91u-BdTVQ">
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_Ibyh0OPxEeKKu7vQg_d5Xw" name="E_External_Classifier1" memberEnd="_Ibyh0ePxEeKKu7vQg_d5Xw _Ibp-8OPxEeKKu7vQg_d5Xw">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Ibyh0ePxEeKKu7vQg_d5Xw" name="extension_External" type="_MyI6IByJEduN1bTiWJ0lyw" aggregation="composite" association="_Ibyh0OPxEeKKu7vQg_d5Xw"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_yA1EQPuNEeOuv40UUNEbNQ" name="Volatile">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_oBZfUPuQEeOuv40UUNEbNQ" name="base_parameter" isUnique="false" association="_oBZfUfuQEeOuv40UUNEbNQ">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d4yPwOL9EeKxe91u-BdTVQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d4918OL9EeKxe91u-BdTVQ" value="1"/>
</ownedAttribute>
- <ownedAttribute xmi:id="_cKdswOL9EeKxe91u-BdTVQ" name="base_Property" association="_cKgwEOL9EeKxe91u-BdTVQ">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_7Pfr4PuQEeOuv40UUNEbNQ" name="base_property" isUnique="false" association="_7Pg6APuQEeOuv40UUNEbNQ">
<type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_esvcQOL9EeKxe91u-BdTVQ"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_es2J8OL9EeKxe91u-BdTVQ" value="1"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_-qYeYPuQEeOuv40UUNEbNQ" name="base_operation" isUnique="false" association="_-qZFcPuQEeOuv40UUNEbNQ">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
</ownedAttribute>
</packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_bvC8EOL9EeKxe91u-BdTVQ" name="E_StorageClass_Parameter1" memberEnd="_bvC8EeL9EeKxe91u-BdTVQ _bu81cOL9EeKxe91u-BdTVQ">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_bvC8EeL9EeKxe91u-BdTVQ" name="extension_StorageClass" type="_U3BNgJVPEeKCE6_KfOehJw" aggregation="composite" association="_bvC8EOL9EeKxe91u-BdTVQ"/>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_oBZfUfuQEeOuv40UUNEbNQ" name="E_Volatile_Parameter1" memberEnd="_oBZfUvuQEeOuv40UUNEbNQ _oBZfUPuQEeOuv40UUNEbNQ">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_oBZfUvuQEeOuv40UUNEbNQ" name="extension_Volatile" type="_yA1EQPuNEeOuv40UUNEbNQ" aggregation="composite" association="_oBZfUfuQEeOuv40UUNEbNQ"/>
</packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_cKgwEOL9EeKxe91u-BdTVQ" name="E_StorageClass_Property1" memberEnd="_cKgwEeL9EeKxe91u-BdTVQ _cKdswOL9EeKxe91u-BdTVQ">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_cKgwEeL9EeKxe91u-BdTVQ" name="extension_StorageClass" type="_U3BNgJVPEeKCE6_KfOehJw" aggregation="composite" association="_cKgwEOL9EeKxe91u-BdTVQ"/>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_7Pg6APuQEeOuv40UUNEbNQ" name="E_Volatile_Property1" memberEnd="_7Pg6AfuQEeOuv40UUNEbNQ _7Pfr4PuQEeOuv40UUNEbNQ">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_7Pg6AfuQEeOuv40UUNEbNQ" name="extension_Volatile" type="_yA1EQPuNEeOuv40UUNEbNQ" aggregation="composite" association="_7Pg6APuQEeOuv40UUNEbNQ"/>
</packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_Ibyh0OPxEeKKu7vQg_d5Xw" name="E_External_Classifier1" memberEnd="_Ibyh0ePxEeKKu7vQg_d5Xw _Ibp-8OPxEeKKu7vQg_d5Xw">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Ibyh0ePxEeKKu7vQg_d5Xw" name="extension_External" type="_MyI6IByJEduN1bTiWJ0lyw" aggregation="composite" association="_Ibyh0OPxEeKKu7vQg_d5Xw"/>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_-qZFcPuQEeOuv40UUNEbNQ" name="E_Volatile_Operation1" memberEnd="_-qZFcfuQEeOuv40UUNEbNQ _-qYeYPuQEeOuv40UUNEbNQ">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_-qZFcfuQEeOuv40UUNEbNQ" name="extension_Volatile" type="_yA1EQPuNEeOuv40UUNEbNQ" aggregation="composite" association="_-qZFcPuQEeOuv40UUNEbNQ"/>
</packagedElement>
- <profileApplication xmi:id="_QS19UMogEeGKstsYRuxdvw">
- <eAnnotations xmi:id="_QUmQ0MogEeGKstsYRuxdvw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QS19UMogEeGKstsYRuxdvw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QUmQ0MogEeGKstsYRuxdvw" source="http://www.eclipse.org/uml2/2.0.0/UML">
<references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
</eAnnotations>
- <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
</profileApplication>
</uml:Profile>
<Ecore:EPackage xmi:id="_RRUXwMogEeGKstsYRuxdvw" base_Package="_j9REUByGEduN1bTiWJ0lyw" packageName="C_Cpp" nsPrefix="C_Cpp" nsURI="http://www.eclipse.org/papyrus/C_Cpp/1" prefix="C_Cpp"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index c391b9c..4b69fca 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
@@ -230,6 +230,15 @@ public interface C_CppFactory extends EFactory {
StorageClass createStorageClass();
/**
+ * Returns a new object of class '<em>Volatile</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Volatile</em>'.
+ * @generated
+ */
+ Volatile createVolatile();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
index bbb88a1..c6b7a8e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
@@ -1115,40 +1115,77 @@ public interface C_CppPackage extends EPackage {
int STORAGE_CLASS__STORAGE_CLASS = 0;
/**
- * The feature id for the '<em><b>Base Parameter</b></em>' reference.
+ * The number of structural features of the '<em>Storage Class</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STORAGE_CLASS__BASE_PARAMETER = 1;
+ int STORAGE_CLASS_FEATURE_COUNT = 1;
/**
- * The feature id for the '<em><b>Base Property</b></em>' reference.
+ * The number of operations of the '<em>Storage Class</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STORAGE_CLASS__BASE_PROPERTY = 2;
+ int STORAGE_CLASS_OPERATION_COUNT = 0;
/**
- * The number of structural features of the '<em>Storage Class</em>' class.
+ * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.VolatileImpl <em>Volatile</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.C_Cpp.impl.VolatileImpl
+ * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVolatile()
+ * @generated
+ */
+ int VOLATILE = 22;
+
+ /**
+ * The feature id for the '<em><b>Base parameter</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STORAGE_CLASS_FEATURE_COUNT = 3;
+ int VOLATILE__BASE_PARAMETER = 0;
/**
- * The number of operations of the '<em>Storage Class</em>' class.
+ * The feature id for the '<em><b>Base property</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int STORAGE_CLASS_OPERATION_COUNT = 0;
+ int VOLATILE__BASE_PROPERTY = 1;
+
+ /**
+ * The feature id for the '<em><b>Base operation</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int VOLATILE__BASE_OPERATION = 2;
+
+ /**
+ * The number of structural features of the '<em>Volatile</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int VOLATILE_FEATURE_COUNT = 3;
+
+ /**
+ * The number of operations of the '<em>Volatile</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int VOLATILE_OPERATION_COUNT = 0;
/**
* The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
@@ -1158,7 +1195,7 @@ public interface C_CppPackage extends EPackage {
* @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVisibilityKind()
* @generated
*/
- int VISIBILITY_KIND = 22;
+ int VISIBILITY_KIND = 23;
/**
* The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EAccessKind <em>EAccess Kind</em>}' enum.
@@ -1168,7 +1205,7 @@ public interface C_CppPackage extends EPackage {
* @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEAccessKind()
* @generated
*/
- int EACCESS_KIND = 23;
+ int EACCESS_KIND = 24;
/**
* The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.EStorageClass <em>EStorage Class</em>}' enum.
@@ -1178,7 +1215,7 @@ public interface C_CppPackage extends EPackage {
* @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getEStorageClass()
* @generated
*/
- int ESTORAGE_CLASS = 24;
+ int ESTORAGE_CLASS = 25;
/**
@@ -1952,26 +1989,47 @@ public interface C_CppPackage extends EPackage {
EAttribute getStorageClass_StorageClass();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Parameter <em>Base Parameter</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Volatile <em>Volatile</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Base Parameter</em>'.
- * @see org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Parameter()
- * @see #getStorageClass()
+ * @return the meta object for class '<em>Volatile</em>'.
+ * @see org.eclipse.papyrus.C_Cpp.Volatile
* @generated
*/
- EReference getStorageClass_Base_Parameter();
+ EClass getVolatile();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Property <em>Base Property</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_parameter <em>Base parameter</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Base Property</em>'.
- * @see org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Property()
- * @see #getStorageClass()
+ * @return the meta object for the reference '<em>Base parameter</em>'.
+ * @see org.eclipse.papyrus.C_Cpp.Volatile#getBase_parameter()
+ * @see #getVolatile()
+ * @generated
+ */
+ EReference getVolatile_Base_parameter();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_property <em>Base property</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Base property</em>'.
+ * @see org.eclipse.papyrus.C_Cpp.Volatile#getBase_property()
+ * @see #getVolatile()
+ * @generated
+ */
+ EReference getVolatile_Base_property();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_operation <em>Base operation</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Base operation</em>'.
+ * @see org.eclipse.papyrus.C_Cpp.Volatile#getBase_operation()
+ * @see #getVolatile()
* @generated
*/
- EReference getStorageClass_Base_Property();
+ EReference getVolatile_Base_operation();
/**
* Returns the meta object for enum '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}'.
@@ -2646,20 +2704,38 @@ public interface C_CppPackage extends EPackage {
EAttribute STORAGE_CLASS__STORAGE_CLASS = eINSTANCE.getStorageClass_StorageClass();
/**
- * The meta object literal for the '<em><b>Base Parameter</b></em>' reference feature.
+ * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.VolatileImpl <em>Volatile</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.C_Cpp.impl.VolatileImpl
+ * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getVolatile()
+ * @generated
+ */
+ EClass VOLATILE = eINSTANCE.getVolatile();
+
+ /**
+ * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference STORAGE_CLASS__BASE_PARAMETER = eINSTANCE.getStorageClass_Base_Parameter();
+ EReference VOLATILE__BASE_PARAMETER = eINSTANCE.getVolatile_Base_parameter();
/**
- * The meta object literal for the '<em><b>Base Property</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference VOLATILE__BASE_PROPERTY = eINSTANCE.getVolatile_Base_property();
+
+ /**
+ * The meta object literal for the '<em><b>Base operation</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference STORAGE_CLASS__BASE_PROPERTY = eINSTANCE.getStorageClass_Base_Property();
+ EReference VOLATILE__BASE_OPERATION = eINSTANCE.getVolatile_Base_operation();
/**
* The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
index 0c71ff0..de6eb0f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
@@ -14,9 +14,6 @@ package org.eclipse.papyrus.C_Cpp;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Property;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Storage Class</b></em>'.
@@ -26,8 +23,6 @@ import org.eclipse.uml2.uml.Property;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.papyrus.C_Cpp.StorageClass#getStorageClass <em>Storage Class</em>}</li>
- * <li>{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Parameter <em>Base Parameter</em>}</li>
- * <li>{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Property <em>Base Property</em>}</li>
* </ul>
* </p>
*
@@ -65,56 +60,4 @@ public interface StorageClass extends EObject {
*/
void setStorageClass(EStorageClass value);
- /**
- * Returns the value of the '<em><b>Base Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Base Parameter</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Base Parameter</em>' reference.
- * @see #setBase_Parameter(Parameter)
- * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getStorageClass_Base_Parameter()
- * @model ordered="false"
- * @generated
- */
- Parameter getBase_Parameter();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Parameter <em>Base Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Base Parameter</em>' reference.
- * @see #getBase_Parameter()
- * @generated
- */
- void setBase_Parameter(Parameter value);
-
- /**
- * Returns the value of the '<em><b>Base Property</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Base Property</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Base Property</em>' reference.
- * @see #setBase_Property(Property)
- * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getStorageClass_Base_Property()
- * @model ordered="false"
- * @generated
- */
- Property getBase_Property();
-
- /**
- * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.StorageClass#getBase_Property <em>Base Property</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Base Property</em>' reference.
- * @see #getBase_Property()
- * @generated
- */
- void setBase_Property(Property value);
-
} // StorageClass
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java
new file mode 100644
index 0000000..b026bc4
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Volatile.java
@@ -0,0 +1,108 @@
+/**
+ */
+package org.eclipse.papyrus.C_Cpp;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Volatile</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_parameter <em>Base parameter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_property <em>Base property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_operation <em>Base operation</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVolatile()
+ * @model
+ * @generated
+ */
+public interface Volatile extends EObject {
+ /**
+ * Returns the value of the '<em><b>Base parameter</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Base parameter</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Base parameter</em>' reference.
+ * @see #setBase_parameter(Parameter)
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVolatile_Base_parameter()
+ * @model required="true" ordered="false"
+ * @generated
+ */
+ Parameter getBase_parameter();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_parameter <em>Base parameter</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Base parameter</em>' reference.
+ * @see #getBase_parameter()
+ * @generated
+ */
+ void setBase_parameter(Parameter value);
+
+ /**
+ * Returns the value of the '<em><b>Base property</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Base property</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Base property</em>' reference.
+ * @see #setBase_property(Property)
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVolatile_Base_property()
+ * @model required="true" ordered="false"
+ * @generated
+ */
+ Property getBase_property();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_property <em>Base property</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Base property</em>' reference.
+ * @see #getBase_property()
+ * @generated
+ */
+ void setBase_property(Property value);
+
+ /**
+ * Returns the value of the '<em><b>Base operation</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Base operation</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Base operation</em>' reference.
+ * @see #setBase_operation(Operation)
+ * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getVolatile_Base_operation()
+ * @model required="true" ordered="false"
+ * @generated
+ */
+ Operation getBase_operation();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Volatile#getBase_operation <em>Base operation</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Base operation</em>' reference.
+ * @see #getBase_operation()
+ * @generated
+ */
+ void setBase_operation(Operation value);
+
+} // Volatile
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
index 0124c6a..b5617fc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
@@ -89,6 +89,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
case C_CppPackage.TEMPLATE_PARAMETER: return createTemplateParameter();
case C_CppPackage.UNION: return createUnion();
case C_CppPackage.STORAGE_CLASS: return createStorageClass();
+ case C_CppPackage.VOLATILE: return createVolatile();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -357,6 +358,16 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
* <!-- end-user-doc -->
* @generated
*/
+ public Volatile createVolatile() {
+ VolatileImpl volatile_ = new VolatileImpl();
+ return volatile_;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue) {
VisibilityKind result = VisibilityKind.get(initialValue);
if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
index fb8889f..d60e7d2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.C_Cpp.Virtual;
import org.eclipse.papyrus.C_Cpp.Visibility;
import org.eclipse.papyrus.C_Cpp.VisibilityKind;
+import org.eclipse.papyrus.C_Cpp.Volatile;
import org.eclipse.uml2.types.TypesPackage;
import org.eclipse.uml2.uml.UMLPackage;
@@ -218,6 +219,13 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
* <!-- end-user-doc -->
* @generated
*/
+ private EClass volatileEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EEnum visibilityKindEEnum = null;
/**
@@ -951,8 +959,17 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EReference getStorageClass_Base_Parameter() {
- return (EReference)storageClassEClass.getEStructuralFeatures().get(1);
+ public EClass getVolatile() {
+ return volatileEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getVolatile_Base_parameter() {
+ return (EReference)volatileEClass.getEStructuralFeatures().get(0);
}
/**
@@ -960,8 +977,17 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EReference getStorageClass_Base_Property() {
- return (EReference)storageClassEClass.getEStructuralFeatures().get(2);
+ public EReference getVolatile_Base_property() {
+ return (EReference)volatileEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getVolatile_Base_operation() {
+ return (EReference)volatileEClass.getEStructuralFeatures().get(2);
}
/**
@@ -1112,8 +1138,11 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
storageClassEClass = createEClass(STORAGE_CLASS);
createEAttribute(storageClassEClass, STORAGE_CLASS__STORAGE_CLASS);
- createEReference(storageClassEClass, STORAGE_CLASS__BASE_PARAMETER);
- createEReference(storageClassEClass, STORAGE_CLASS__BASE_PROPERTY);
+
+ volatileEClass = createEClass(VOLATILE);
+ createEReference(volatileEClass, VOLATILE__BASE_PARAMETER);
+ createEReference(volatileEClass, VOLATILE__BASE_PROPERTY);
+ createEReference(volatileEClass, VOLATILE__BASE_OPERATION);
// Create enums
visibilityKindEEnum = createEEnum(VISIBILITY_KIND);
@@ -1248,8 +1277,11 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
initEClass(storageClassEClass, StorageClass.class, "StorageClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getStorageClass_StorageClass(), this.getEStorageClass(), "storageClass", null, 1, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
- initEReference(getStorageClass_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
- initEReference(getStorageClass_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(volatileEClass, Volatile.class, "Volatile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEReference(getVolatile_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 1, 1, Volatile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+ initEReference(getVolatile_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 1, 1, Volatile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+ initEReference(getVolatile_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, Volatile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
// Initialize enums and add enum literals
initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind"); //$NON-NLS-1$
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
index 91d7941..9203ad2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
@@ -14,14 +14,11 @@ package org.eclipse.papyrus.C_Cpp.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.papyrus.C_Cpp.C_CppPackage;
import org.eclipse.papyrus.C_Cpp.EStorageClass;
import org.eclipse.papyrus.C_Cpp.StorageClass;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Property;
/**
* <!-- begin-user-doc -->
@@ -31,8 +28,6 @@ import org.eclipse.uml2.uml.Property;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl#getStorageClass <em>Storage Class</em>}</li>
- * <li>{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl#getBase_Parameter <em>Base Parameter</em>}</li>
- * <li>{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl#getBase_Property <em>Base Property</em>}</li>
* </ul>
* </p>
*
@@ -60,26 +55,6 @@ public class StorageClassImpl extends MinimalEObjectImpl.Container implements St
protected EStorageClass storageClass = STORAGE_CLASS_EDEFAULT;
/**
- * The cached value of the '{@link #getBase_Parameter() <em>Base Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBase_Parameter()
- * @generated
- * @ordered
- */
- protected Parameter base_Parameter;
-
- /**
- * The cached value of the '{@link #getBase_Property() <em>Base Property</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBase_Property()
- * @generated
- * @ordered
- */
- protected Property base_Property;
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -124,93 +99,11 @@ public class StorageClassImpl extends MinimalEObjectImpl.Container implements St
* <!-- end-user-doc -->
* @generated
*/
- public Parameter getBase_Parameter() {
- if (base_Parameter != null && base_Parameter.eIsProxy()) {
- InternalEObject oldBase_Parameter = (InternalEObject)base_Parameter;
- base_Parameter = (Parameter)eResolveProxy(oldBase_Parameter);
- if (base_Parameter != oldBase_Parameter) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.STORAGE_CLASS__BASE_PARAMETER, oldBase_Parameter, base_Parameter));
- }
- }
- return base_Parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Parameter basicGetBase_Parameter() {
- return base_Parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBase_Parameter(Parameter newBase_Parameter) {
- Parameter oldBase_Parameter = base_Parameter;
- base_Parameter = newBase_Parameter;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.STORAGE_CLASS__BASE_PARAMETER, oldBase_Parameter, base_Parameter));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Property getBase_Property() {
- if (base_Property != null && base_Property.eIsProxy()) {
- InternalEObject oldBase_Property = (InternalEObject)base_Property;
- base_Property = (Property)eResolveProxy(oldBase_Property);
- if (base_Property != oldBase_Property) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.STORAGE_CLASS__BASE_PROPERTY, oldBase_Property, base_Property));
- }
- }
- return base_Property;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Property basicGetBase_Property() {
- return base_Property;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBase_Property(Property newBase_Property) {
- Property oldBase_Property = base_Property;
- base_Property = newBase_Property;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.STORAGE_CLASS__BASE_PROPERTY, oldBase_Property, base_Property));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case C_CppPackage.STORAGE_CLASS__STORAGE_CLASS:
return getStorageClass();
- case C_CppPackage.STORAGE_CLASS__BASE_PARAMETER:
- if (resolve) return getBase_Parameter();
- return basicGetBase_Parameter();
- case C_CppPackage.STORAGE_CLASS__BASE_PROPERTY:
- if (resolve) return getBase_Property();
- return basicGetBase_Property();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -226,12 +119,6 @@ public class StorageClassImpl extends MinimalEObjectImpl.Container implements St
case C_CppPackage.STORAGE_CLASS__STORAGE_CLASS:
setStorageClass((EStorageClass)newValue);
return;
- case C_CppPackage.STORAGE_CLASS__BASE_PARAMETER:
- setBase_Parameter((Parameter)newValue);
- return;
- case C_CppPackage.STORAGE_CLASS__BASE_PROPERTY:
- setBase_Property((Property)newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -247,12 +134,6 @@ public class StorageClassImpl extends MinimalEObjectImpl.Container implements St
case C_CppPackage.STORAGE_CLASS__STORAGE_CLASS:
setStorageClass(STORAGE_CLASS_EDEFAULT);
return;
- case C_CppPackage.STORAGE_CLASS__BASE_PARAMETER:
- setBase_Parameter((Parameter)null);
- return;
- case C_CppPackage.STORAGE_CLASS__BASE_PROPERTY:
- setBase_Property((Property)null);
- return;
}
super.eUnset(featureID);
}
@@ -267,10 +148,6 @@ public class StorageClassImpl extends MinimalEObjectImpl.Container implements St
switch (featureID) {
case C_CppPackage.STORAGE_CLASS__STORAGE_CLASS:
return storageClass != STORAGE_CLASS_EDEFAULT;
- case C_CppPackage.STORAGE_CLASS__BASE_PARAMETER:
- return base_Parameter != null;
- case C_CppPackage.STORAGE_CLASS__BASE_PROPERTY:
- return base_Property != null;
}
return super.eIsSet(featureID);
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java
new file mode 100644
index 0000000..a878b2a
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VolatileImpl.java
@@ -0,0 +1,289 @@
+/**
+ * Copyright (c) 2013 CEA LIST
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.C_Cpp.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+import org.eclipse.papyrus.C_Cpp.Volatile;
+
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Volatile</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.impl.VolatileImpl#getBase_parameter <em>Base parameter</em>}</li>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.impl.VolatileImpl#getBase_property <em>Base property</em>}</li>
+ * <li>{@link org.eclipse.papyrus.C_Cpp.impl.VolatileImpl#getBase_operation <em>Base operation</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class VolatileImpl extends MinimalEObjectImpl.Container implements Volatile {
+ /**
+ * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBase_parameter()
+ * @generated
+ * @ordered
+ */
+ protected Parameter base_parameter;
+
+ /**
+ * The cached value of the '{@link #getBase_property() <em>Base property</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBase_property()
+ * @generated
+ * @ordered
+ */
+ protected Property base_property;
+
+ /**
+ * The cached value of the '{@link #getBase_operation() <em>Base operation</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getBase_operation()
+ * @generated
+ * @ordered
+ */
+ protected Operation base_operation;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected VolatileImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return C_CppPackage.Literals.VOLATILE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Parameter getBase_parameter() {
+ if (base_parameter != null && base_parameter.eIsProxy()) {
+ InternalEObject oldBase_parameter = (InternalEObject)base_parameter;
+ base_parameter = (Parameter)eResolveProxy(oldBase_parameter);
+ if (base_parameter != oldBase_parameter) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.VOLATILE__BASE_PARAMETER, oldBase_parameter, base_parameter));
+ }
+ }
+ return base_parameter;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Parameter basicGetBase_parameter() {
+ return base_parameter;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setBase_parameter(Parameter newBase_parameter) {
+ Parameter oldBase_parameter = base_parameter;
+ base_parameter = newBase_parameter;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.VOLATILE__BASE_PARAMETER, oldBase_parameter, base_parameter));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Property getBase_property() {
+ if (base_property != null && base_property.eIsProxy()) {
+ InternalEObject oldBase_property = (InternalEObject)base_property;
+ base_property = (Property)eResolveProxy(oldBase_property);
+ if (base_property != oldBase_property) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.VOLATILE__BASE_PROPERTY, oldBase_property, base_property));
+ }
+ }
+ return base_property;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Property basicGetBase_property() {
+ return base_property;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setBase_property(Property newBase_property) {
+ Property oldBase_property = base_property;
+ base_property = newBase_property;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.VOLATILE__BASE_PROPERTY, oldBase_property, base_property));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Operation getBase_operation() {
+ if (base_operation != null && base_operation.eIsProxy()) {
+ InternalEObject oldBase_operation = (InternalEObject)base_operation;
+ base_operation = (Operation)eResolveProxy(oldBase_operation);
+ if (base_operation != oldBase_operation) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, C_CppPackage.VOLATILE__BASE_OPERATION, oldBase_operation, base_operation));
+ }
+ }
+ return base_operation;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Operation basicGetBase_operation() {
+ return base_operation;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setBase_operation(Operation newBase_operation) {
+ Operation oldBase_operation = base_operation;
+ base_operation = newBase_operation;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.VOLATILE__BASE_OPERATION, oldBase_operation, base_operation));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case C_CppPackage.VOLATILE__BASE_PARAMETER:
+ if (resolve) return getBase_parameter();
+ return basicGetBase_parameter();
+ case C_CppPackage.VOLATILE__BASE_PROPERTY:
+ if (resolve) return getBase_property();
+ return basicGetBase_property();
+ case C_CppPackage.VOLATILE__BASE_OPERATION:
+ if (resolve) return getBase_operation();
+ return basicGetBase_operation();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case C_CppPackage.VOLATILE__BASE_PARAMETER:
+ setBase_parameter((Parameter)newValue);
+ return;
+ case C_CppPackage.VOLATILE__BASE_PROPERTY:
+ setBase_property((Property)newValue);
+ return;
+ case C_CppPackage.VOLATILE__BASE_OPERATION:
+ setBase_operation((Operation)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case C_CppPackage.VOLATILE__BASE_PARAMETER:
+ setBase_parameter((Parameter)null);
+ return;
+ case C_CppPackage.VOLATILE__BASE_PROPERTY:
+ setBase_property((Property)null);
+ return;
+ case C_CppPackage.VOLATILE__BASE_OPERATION:
+ setBase_operation((Operation)null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case C_CppPackage.VOLATILE__BASE_PARAMETER:
+ return base_parameter != null;
+ case C_CppPackage.VOLATILE__BASE_PROPERTY:
+ return base_property != null;
+ case C_CppPackage.VOLATILE__BASE_OPERATION:
+ return base_operation != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //VolatileImpl
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
index f93fcf9..533861c 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
@@ -166,6 +166,10 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
return createStorageClassAdapter();
}
@Override
+ public Adapter caseVolatile(Volatile object) {
+ return createVolatileAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -494,6 +498,20 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Volatile <em>Volatile</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.papyrus.C_Cpp.Volatile
+ * @generated
+ */
+ public Adapter createVolatileAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
index 505dbc0..57b256b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
@@ -208,6 +208,12 @@ public class C_CppSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case C_CppPackage.VOLATILE: {
+ Volatile volatile_ = (Volatile)theEObject;
+ T result = caseVolatile(volatile_);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -543,6 +549,21 @@ public class C_CppSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Volatile</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Volatile</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseVolatile(Volatile object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
index e11d475..3acfa52 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.di
@@ -8,13 +8,13 @@
<emfPageIdentifier href="TestCDTintegration.notation"/>
</availablePage>
<availablePage>
- <emfPageIdentifier href="TestCDTintegration.notation#_EItkYEG6EeOMv8cdTsw5Zg"/>
+ <emfPageIdentifier href="TestCDTintegration.notation"/>
</availablePage>
<availablePage>
<emfPageIdentifier href="TestCDTintegration.notation#_6nABcFG7EeOLNIKOajeerQ"/>
</availablePage>
<availablePage>
- <emfPageIdentifier href="TestCDTintegration.notation#_rGh10FG-EeOLNIKOajeerQ"/>
+ <emfPageIdentifier href="TestCDTintegration.notation"/>
</availablePage>
</pageList>
<sashModel currentSelection="//@sashModel/@windows.0/@children.0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
index 14cc0e4..6c917c2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.notation
@@ -170,8 +170,7 @@
</notation:Diagram>
<texteditormodel:TextEditorModel xmi:id="_EItkYEG6EeOMv8cdTsw5Zg" type="CDTEditorInPapyrus" name="CDT Class3">
<editedObject xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/>
- <selectedObject xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/>
- </texteditormodel:TextEditorModel>
+ <selectedObject xmi:type="uml:Class" href="TestCDTintegration.uml#_K8FLcB0LEeKlYLZOWTi6uw"/></texteditormodel:TextEditorModel>
<notation:Diagram xmi:id="_6nABcFG7EeOLNIKOajeerQ" type="PapyrusUMLStateMachineDiagram" name="SmDiagram" measurementUnit="Pixel">
<children xmi:type="notation:Shape" xmi:id="_6nABcVG7EeOLNIKOajeerQ" type="2000" fontName="Sans Serif" lineColor="0">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6nABclG7EeOLNIKOajeerQ" source="ShadowFigure">
@@ -280,6 +279,5 @@
</notation:Diagram>
<texteditormodel:TextEditorModel xmi:id="_rGh10FG-EeOLNIKOajeerQ" type="CDTEditorInPapyrus" name="CDT Class2">
<editedObject xmi:type="uml:Class" href="TestCDTintegration.uml#_419y0A7hEeKpbseGaEy1LA"/>
- <selectedObject xmi:type="uml:Transition" href="TestCDTintegration.uml#_Z2_5oFG8EeOLNIKOajeerQ"/>
- </texteditormodel:TextEditorModel>
+ <selectedObject xmi:type="uml:Transition" href="TestCDTintegration.uml#_Z2_5oFG8EeOLNIKOajeerQ"/></texteditormodel:TextEditorModel>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
index e7c80e2..968950f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/model/TestCDTintegration.uml
@@ -62,12 +62,12 @@
<subvertex xmi:type="uml:Pseudostate" xmi:id="_UcSkcFG8EeOLNIKOajeerQ" name="Initial0"/>
</region>
</ownedBehavior>
- <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_xe7iUFG-EeOLNIKOajeerQ" name="triggerOp" isReentrant="false" specification="_gixOEFG8EeOLNIKOajeerQ">
+ <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_xe7iUFG-EeOLNIKOajeerQ" name="triggerOp" specification="_gixOEFG8EeOLNIKOajeerQ" isReentrant="false">
<language>C/C++</language>
<body>// Aber hier geht's, oder?
</body>
</ownedBehavior>
- <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_xe8JYVG-EeOLNIKOajeerQ" name="effectBehavior" isReentrant="false" specification="_xe8JYFG-EeOLNIKOajeerQ">
+ <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_xe8JYVG-EeOLNIKOajeerQ" name="effectBehavior" specification="_xe8JYFG-EeOLNIKOajeerQ" isReentrant="false">
<language>C/C++</language>
<body>// this effect is a C++ np
// opaque behavior with several lines</body>
@@ -76,7 +76,23 @@
<ownedOperation xmi:type="uml:Operation" xmi:id="_xe8JYFG-EeOLNIKOajeerQ" name="effectBehavior" method="_xe8JYVG-EeOLNIKOajeerQ"/>
</packagedElement>
<packagedElement xmi:type="uml:Class" xmi:id="_K8FLcB0LEeKlYLZOWTi6uw" name="Class1">
- <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_kTVuwP6QEeKlg5tzGV3QVQ" name="Operation1" isReentrant="false" specification="_TY18YB0LEeKlYLZOWTi6uw">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_x0eUMPuWEeObXf7LzGwVbQ" name="constAttr">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
+ <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_KyTqwPuXEeObXf7LzGwVbQ" name="FIVE" value="5"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5WkzsPuWEeObXf7LzGwVbQ" name="volatileAttr">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
+ <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_JkS_gPuXEeObXf7LzGwVbQ" name="FIVE" value="5"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5chDoPuWEeObXf7LzGwVbQ" name="constVolatileAttr">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
+ <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_IEKCcPuXEeObXf7LzGwVbQ" name="FIVE" value="5"/>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_5hUEEPuWEeObXf7LzGwVbQ" name="staticConstVolatileAttr" isStatic="true">
+ <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
+ <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_Gph3gPuXEeObXf7LzGwVbQ" name="FIVE" value="5"/>
+ </ownedAttribute>
+ <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_kTVuwP6QEeKlg5tzGV3QVQ" name="Operation1" specification="_TY18YB0LEeKlYLZOWTi6uw" isReentrant="false">
<ownedParameter xmi:type="uml:Parameter" xmi:id="_8cPkcVG-EeOLNIKOajeerQ" name="arg">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
</ownedParameter>
@@ -84,7 +100,7 @@
<body>// Now let's add some code
cout &lt;&lt; &quot;value: &quot; &lt;&lt; arg;</body>
</ownedBehavior>
- <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_pX7DgDcmEeO6UdbIk03c9Q" name="Operation2" isReentrant="false" specification="_jnWMADcmEeO6UdbIk03c9Q">
+ <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_pX7DgDcmEeO6UdbIk03c9Q" name="Operation2" specification="_jnWMADcmEeO6UdbIk03c9Q" isReentrant="false">
<ownedParameter xmi:type="uml:Parameter" xmi:id="_8cRZoVG-EeOLNIKOajeerQ" name="args">
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
</ownedParameter>
@@ -108,6 +124,10 @@ args[0] = 2;</body>
<type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
</ownedParameter>
</ownedOperation>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_NJkdEPuXEeObXf7LzGwVbQ" name="constOperation"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_P49bgPuXEeObXf7LzGwVbQ" name="volatileOperation"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_QCDGEPuXEeObXf7LzGwVbQ" name="constVolatileOperation"/>
+ <ownedOperation xmi:type="uml:Operation" xmi:id="_QGndAPuXEeObXf7LzGwVbQ" name="staticConstVolatileOperation" isStatic="true"/>
</packagedElement>
<packagedElement xmi:type="uml:Package" xmi:id="_-2_pQC-IEeObJ6ARx67E0g" name="Package1">
<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_DHJ24C-JEeObJ6ARx67E0g" name="Test"/>
@@ -147,4 +167,16 @@ args[0] = 2;</body>
<C_Cpp:Const xmi:id="_8cVEAFG-EeOLNIKOajeerQ" base_parameter="_8cRZoFG-EeOLNIKOajeerQ"/>
<C_Cpp:Ptr xmi:id="_8cYuYFG-EeOLNIKOajeerQ" base_parameter="_8cRZoFG-EeOLNIKOajeerQ"/>
<C_Cpp:Array xmi:id="_8cbxsFG-EeOLNIKOajeerQ" base_parameter="_8cRZoFG-EeOLNIKOajeerQ" definition="[5]"/>
+ <C_Cpp:Const xmi:id="_AwqmsPuXEeObXf7LzGwVbQ" base_property="_5chDoPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_AxE2YPuXEeObXf7LzGwVbQ" base_property="_5chDoPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_BnQ3gPuXEeObXf7LzGwVbQ" base_property="_5WkzsPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Const xmi:id="_CrTHYPuXEeObXf7LzGwVbQ" base_property="_x0eUMPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Const xmi:id="_ECotwPuXEeObXf7LzGwVbQ" base_property="_5hUEEPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_EC3-UPuXEeObXf7LzGwVbQ" base_property="_5hUEEPuWEeObXf7LzGwVbQ"/>
+ <C_Cpp:Const xmi:id="_WK3ecPuXEeObXf7LzGwVbQ" base_operation="_QGndAPuXEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_WLBPcPuXEeObXf7LzGwVbQ" base_operation="_QGndAPuXEeObXf7LzGwVbQ"/>
+ <C_Cpp:Const xmi:id="_XOookPuXEeObXf7LzGwVbQ" base_operation="_QCDGEPuXEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_XO1c4PuXEeObXf7LzGwVbQ" base_operation="_QCDGEPuXEeObXf7LzGwVbQ"/>
+ <C_Cpp:Volatile xmi:id="_YBPxQPuXEeObXf7LzGwVbQ" base_operation="_P49bgPuXEeObXf7LzGwVbQ"/>
+ <C_Cpp:Const xmi:id="_YyNUIPuXEeObXf7LzGwVbQ" base_operation="_NJkdEPuXEeObXf7LzGwVbQ"/>
</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
index 41e62bb..0cf8070 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/src/org/eclipse/papyrus/texteditor/cdt/sync/SyncCDTtoModel.java
@@ -47,6 +47,7 @@ import org.eclipse.papyrus.C_Cpp.Const;
import org.eclipse.papyrus.C_Cpp.Include;
import org.eclipse.papyrus.C_Cpp.Ptr;
import org.eclipse.papyrus.C_Cpp.Ref;
+import org.eclipse.papyrus.C_Cpp.Volatile;
import org.eclipse.papyrus.cpp.codegen.Constants;
import org.eclipse.papyrus.infra.core.Activator;
import org.eclipse.papyrus.texteditor.cdt.CommandSupport;
@@ -357,6 +358,9 @@ public class SyncCDTtoModel implements Runnable {
if(parameterType.isConst()) {
StereotypeUtil.apply(umlParameter, Const.class);
}
+ if(parameterType.isVolatile()) {
+ StereotypeUtil.apply(umlParameter, Volatile.class);
+ }
if(isPointer) {
StereotypeUtil.apply(umlParameter, Ptr.class);
}