Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-10-08 07:27:33 -0400
committerAnsgar Radermacher2013-10-08 08:37:29 -0400
commit9d331ca18537386d16f81c5968e8d3137c7a6af7 (patch)
tree83497c912a16a4eb364b01322500043cd003b5c8 /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src
parent852259053630bbdb41094b5a91c8bbc6d9820611 (diff)
downloadorg.eclipse.papyrus-9d331ca18537386d16f81c5968e8d3137c7a6af7.tar.gz
org.eclipse.papyrus-9d331ca18537386d16f81c5968e8d3137c7a6af7.tar.xz
org.eclipse.papyrus-9d331ca18537386d16f81c5968e8d3137c7a6af7.zip
Regeneration of EMTL files
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl4
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl364
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl222
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl6
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl2
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl339
-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/preferences/CppCodeGenUtils.emtl488
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java37
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl128
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java10
20 files changed, 878 insertions, 742 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index 6af80b75a42..d17225bd714 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -539,7 +539,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl
index 138ba52e554..77a5b6f05d5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl
@@ -362,7 +362,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
@@ -389,7 +389,7 @@
<references href="../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/cleanCR"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <eParameters name="arg0">
+ <eParameters name="str">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
</eParameters>
</eOperations>
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 3da6bf34607..a044350fe1d 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
@@ -440,7 +440,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl
index 939f5b8dc40..cd53c6f6f98 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl
@@ -132,7 +132,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
index 47df8103f0d..86dfe4059f4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl
@@ -184,7 +184,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
index ffca31cec93..961c67738df 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
@@ -138,7 +138,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
index 24dc2910a08..7204f23320b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
@@ -27,12 +27,12 @@
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="template "/>
<ifExpr xsi:type="mtl:QueryInvocation">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype"/>
+ <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
<argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassIncludeClassDeclarationTemplate/class">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</argument>
- <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="CppTemplate.class">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Template">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
</argument>
</ifExpr>
</body>
@@ -48,7 +48,7 @@
<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/CppGenUtils.emtl#/0/closeNS"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</argument>
</body>
@@ -95,7 +95,7 @@
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/CppRoot">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/CppRoot">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/>
</argument>
</source>
@@ -158,7 +158,7 @@
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/Package">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</argument>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
@@ -174,7 +174,7 @@
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/Package">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</argument>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
@@ -187,7 +187,7 @@
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/Enumeration">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Enumeration">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
</argument>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
@@ -197,7 +197,7 @@
<source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/PrimitiveType">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/PrimitiveType">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/>
</argument>
<referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
@@ -237,7 +237,7 @@
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/NoCodeGen">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/NoCodeGen">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
</argument>
</source>
@@ -251,7 +251,7 @@
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
</argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/15/External">
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/8/External">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
</argument>
</argument>
@@ -369,28 +369,13 @@
<contents xsi:type="ocl.ecore:Constraint"/>
</eAnnotations>
<eAnnotations source="MTL">
- <references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype"/>
- </eAnnotations>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="arg0">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
- </eParameters>
- <eParameters name="arg1">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- </eOperations>
- <eOperations name="hasStereotype">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL">
<references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
</eAnnotations>
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
@@ -524,6 +509,29 @@
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</ocl.ecore:Variable>
+ <ecore:EPackage name="types">
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Template">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="CppRoot">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="External">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Enumeration">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="PrimitiveType">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Package">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+ </eClassifiers>
+ </ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</ocl.ecore:Variable>
@@ -545,26 +553,6 @@
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</ocl.ecore:Variable>
- <ecore:EPackage name="types">
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="CppRoot">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="External">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="Enumeration">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="PrimitiveType">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="Package">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
- </eClassifiers>
- </ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</ocl.ecore:Variable>
@@ -654,7 +642,7 @@
</eAnnotations>
<eAnnotations source="positions.1" references="/0/CppClassIncludeClassDeclarationTemplate">
<details key="start" value="424"/>
- <details key="end" value="614"/>
+ <details key="end" value="605"/>
<details key="line" value="8"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/CppClassIncludeClassDeclarationTemplate/%">
@@ -674,52 +662,52 @@
</eAnnotations>
<eAnnotations source="positions.5" references="/0/CppClassIncludeClassDeclarationTemplate/%.2">
<details key="start" value="509"/>
- <details key="end" value="569"/>
+ <details key="end" value="560"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.6" references="/0/CppClassIncludeClassDeclarationTemplate/%.2/%">
- <details key="start" value="555"/>
- <details key="end" value="564"/>
+ <details key="start" value="546"/>
+ <details key="end" value="555"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.7" references="/0/CppClassIncludeClassDeclarationTemplate/%.2/%.1">
<details key="start" value="513"/>
- <details key="end" value="554"/>
+ <details key="end" value="545"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.8" references="/0/CppClassIncludeClassDeclarationTemplate/%.2/%.1/class">
- <details key="start" value="527"/>
- <details key="end" value="532"/>
+ <details key="start" value="528"/>
+ <details key="end" value="533"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.9" references="/0/CppClassIncludeClassDeclarationTemplate/%.2/%.1/%">
- <details key="start" value="534"/>
- <details key="end" value="553"/>
+ <details key="start" value="535"/>
+ <details key="end" value="543"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.10" references="/0/CppClassIncludeClassDeclarationTemplate/%.3">
- <details key="start" value="569"/>
- <details key="end" value="575"/>
+ <details key="start" value="560"/>
+ <details key="end" value="566"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.11" references="/0/CppClassIncludeClassDeclarationTemplate/%.4">
- <details key="start" value="576"/>
- <details key="end" value="586"/>
+ <details key="start" value="567"/>
+ <details key="end" value="577"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.12" references="/0/CppClassIncludeClassDeclarationTemplate/%.4/class">
- <details key="start" value="576"/>
- <details key="end" value="581"/>
+ <details key="start" value="567"/>
+ <details key="end" value="572"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.13" references="/0/CppClassIncludeClassDeclarationTemplate/%.5">
- <details key="start" value="588"/>
- <details key="end" value="590"/>
+ <details key="start" value="579"/>
+ <details key="end" value="581"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.14" references="/0/CppClassIncludeClassDeclarationTemplate/%.6">
- <details key="start" value="591"/>
- <details key="end" value="600"/>
+ <details key="start" value="582"/>
+ <details key="end" value="591"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.15" references="/0/CppClassIncludeClassDeclarationTemplate/%.6/self">
@@ -733,23 +721,23 @@
<details key="line" value="8"/>
</eAnnotations>
<eAnnotations source="positions.17" references="/0/CppOwnerPackageIncludeDeclaration">
- <details key="start" value="617"/>
- <details key="end" value="924"/>
+ <details key="start" value="608"/>
+ <details key="end" value="915"/>
<details key="line" value="15"/>
</eAnnotations>
<eAnnotations source="positions.18" references="/0/CppOwnerPackageIncludeDeclaration/%">
- <details key="start" value="743"/>
- <details key="end" value="911"/>
+ <details key="start" value="734"/>
+ <details key="end" value="902"/>
<details key="line" value="17"/>
</eAnnotations>
<eAnnotations source="positions.19" references="/0/CppOwnerPackageIncludeDeclaration/%/%">
- <details key="start" value="797"/>
- <details key="end" value="870"/>
+ <details key="start" value="788"/>
+ <details key="end" value="861"/>
<details key="line" value="18"/>
</eAnnotations>
<eAnnotations source="positions.20" references="/0/CppOwnerPackageIncludeDeclaration/%/%.1">
- <details key="start" value="871"/>
- <details key="end" value="884"/>
+ <details key="start" value="862"/>
+ <details key="end" value="875"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.21" references="/0/CppOwnerPackageIncludeDeclaration/%/%.1/self">
@@ -758,53 +746,53 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.22" references="/0/CppOwnerPackageIncludeDeclaration/%/%.2">
- <details key="start" value="886"/>
- <details key="end" value="891"/>
+ <details key="start" value="877"/>
+ <details key="end" value="882"/>
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.23" references="/0/CppOwnerPackageIncludeDeclaration/%/%.3">
- <details key="start" value="892"/>
- <details key="end" value="900"/>
+ <details key="start" value="883"/>
+ <details key="end" value="891"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.24" references="/0/CppOwnerPackageIncludeDeclaration/%/%.3/pkg">
- <details key="start" value="892"/>
- <details key="end" value="895"/>
+ <details key="start" value="883"/>
+ <details key="end" value="886"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.25" references="/0/CppOwnerPackageIncludeDeclaration/%/%.4">
- <details key="start" value="902"/>
- <details key="end" value="906"/>
+ <details key="start" value="893"/>
+ <details key="end" value="897"/>
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.26" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5">
- <details key="start" value="747"/>
- <details key="end" value="795"/>
+ <details key="start" value="738"/>
+ <details key="end" value="786"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.27" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%">
- <details key="start" value="748"/>
- <details key="end" value="761"/>
+ <details key="start" value="739"/>
+ <details key="end" value="752"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.28" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%/pkg">
- <details key="start" value="749"/>
- <details key="end" value="752"/>
+ <details key="start" value="740"/>
+ <details key="end" value="743"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.29" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%/%">
- <details key="start" value="756"/>
- <details key="end" value="760"/>
+ <details key="start" value="747"/>
+ <details key="end" value="751"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.30" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%.1">
- <details key="start" value="766"/>
- <details key="end" value="794"/>
+ <details key="start" value="757"/>
+ <details key="end" value="785"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.31" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%.1/%">
- <details key="start" value="771"/>
- <details key="end" value="793"/>
+ <details key="start" value="762"/>
+ <details key="end" value="784"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.32" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%.1/%/self">
@@ -813,23 +801,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.33" references="/0/CppOwnerPackageIncludeDeclaration/%/%.5/%.1/%/%">
- <details key="start" value="785"/>
- <details key="end" value="792"/>
+ <details key="start" value="776"/>
+ <details key="end" value="783"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.34" references="/0/CppOwnerPackageIncludeDeclaration/pkg">
- <details key="start" value="668"/>
- <details key="end" value="681"/>
+ <details key="start" value="659"/>
+ <details key="end" value="672"/>
<details key="line" value="15"/>
</eAnnotations>
<eAnnotations source="positions.35" references="/0/CppClassAllIncludesDeclaration">
- <details key="start" value="927"/>
- <details key="end" value="1064"/>
+ <details key="start" value="918"/>
+ <details key="end" value="1055"/>
<details key="line" value="24"/>
</eAnnotations>
<eAnnotations source="positions.36" references="/0/CppClassAllIncludesDeclaration/%">
- <details key="start" value="997"/>
- <details key="end" value="1050"/>
+ <details key="start" value="988"/>
+ <details key="end" value="1041"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.37" references="/0/CppClassAllIncludesDeclaration/%/self">
@@ -838,8 +826,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.38" references="/0/CppClassAllIncludesDeclaration/%/%">
- <details key="start" value="1028"/>
- <details key="end" value="1049"/>
+ <details key="start" value="1019"/>
+ <details key="end" value="1040"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.39" references="/0/CppClassAllIncludesDeclaration/%/%/self">
@@ -848,18 +836,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.40" references="/0/CppClassAllIncludesDeclaration/class">
- <details key="start" value="975"/>
- <details key="end" value="993"/>
+ <details key="start" value="966"/>
+ <details key="end" value="984"/>
<details key="line" value="24"/>
</eAnnotations>
<eAnnotations source="positions.41" references="/0/CppClassAllIncludesDeclarationBody">
- <details key="start" value="1066"/>
- <details key="end" value="1211"/>
+ <details key="start" value="1057"/>
+ <details key="end" value="1202"/>
<details key="line" value="28"/>
</eAnnotations>
<eAnnotations source="positions.42" references="/0/CppClassAllIncludesDeclarationBody/%">
- <details key="start" value="1140"/>
- <details key="end" value="1197"/>
+ <details key="start" value="1131"/>
+ <details key="end" value="1188"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.43" references="/0/CppClassAllIncludesDeclarationBody/%/self">
@@ -868,8 +856,8 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.44" references="/0/CppClassAllIncludesDeclarationBody/%/%">
- <details key="start" value="1171"/>
- <details key="end" value="1196"/>
+ <details key="start" value="1162"/>
+ <details key="end" value="1187"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.45" references="/0/CppClassAllIncludesDeclarationBody/%/%/self">
@@ -878,93 +866,93 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.46" references="/0/CppClassAllIncludesDeclarationBody/class">
- <details key="start" value="1118"/>
- <details key="end" value="1136"/>
+ <details key="start" value="1109"/>
+ <details key="end" value="1127"/>
<details key="line" value="28"/>
</eAnnotations>
<eAnnotations source="positions.47" references="/0/CppClassAllIncludesDeclaration.1">
- <details key="start" value="1213"/>
- <details key="end" value="2110"/>
+ <details key="start" value="1204"/>
+ <details key="end" value="2101"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.48" references="/0/CppClassAllIncludesDeclaration.1/%">
- <details key="start" value="1312"/>
- <details key="end" value="2098"/>
+ <details key="start" value="1303"/>
+ <details key="end" value="2089"/>
<details key="line" value="33"/>
</eAnnotations>
<eAnnotations source="positions.49" references="/0/CppClassAllIncludesDeclaration.1/%/%">
- <details key="start" value="1507"/>
- <details key="end" value="2091"/>
+ <details key="start" value="1498"/>
+ <details key="end" value="2082"/>
<details key="line" value="36"/>
</eAnnotations>
<eAnnotations source="positions.50" references="/0/CppClassAllIncludesDeclaration.1/%/%/%">
- <details key="start" value="1591"/>
- <details key="end" value="2084"/>
+ <details key="start" value="1582"/>
+ <details key="end" value="2075"/>
<details key="line" value="37"/>
</eAnnotations>
<eAnnotations source="positions.51" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%">
- <details key="start" value="1864"/>
- <details key="end" value="1976"/>
+ <details key="start" value="1855"/>
+ <details key="end" value="1967"/>
<details key="line" value="40"/>
</eAnnotations>
<eAnnotations source="positions.52" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%">
- <details key="start" value="1902"/>
- <details key="end" value="1965"/>
+ <details key="start" value="1893"/>
+ <details key="end" value="1956"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.53" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%">
- <details key="start" value="1902"/>
- <details key="end" value="1929"/>
+ <details key="start" value="1893"/>
+ <details key="end" value="1920"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.54" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%">
- <details key="start" value="1902"/>
- <details key="end" value="1910"/>
+ <details key="start" value="1893"/>
+ <details key="end" value="1901"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.55" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%/cl">
- <details key="start" value="1902"/>
- <details key="end" value="1904"/>
+ <details key="start" value="1893"/>
+ <details key="end" value="1895"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.56" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%.1">
- <details key="start" value="1921"/>
- <details key="end" value="1928"/>
+ <details key="start" value="1912"/>
+ <details key="end" value="1919"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.57" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.1">
- <details key="start" value="1967"/>
- <details key="end" value="1968"/>
+ <details key="start" value="1958"/>
+ <details key="end" value="1959"/>
<details key="line" value="42"/>
</eAnnotations>
<eAnnotations source="positions.58" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2">
- <details key="start" value="1868"/>
- <details key="end" value="1899"/>
+ <details key="start" value="1859"/>
+ <details key="end" value="1890"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.59" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%">
- <details key="start" value="1869"/>
- <details key="end" value="1877"/>
+ <details key="start" value="1860"/>
+ <details key="end" value="1868"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.60" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/cl">
- <details key="start" value="1869"/>
- <details key="end" value="1871"/>
+ <details key="start" value="1860"/>
+ <details key="end" value="1862"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.61" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1">
- <details key="start" value="1890"/>
- <details key="end" value="1897"/>
+ <details key="start" value="1881"/>
+ <details key="end" value="1888"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.62" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1">
- <details key="start" value="1594"/>
- <details key="end" value="1650"/>
+ <details key="start" value="1585"/>
+ <details key="end" value="1641"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.63" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%">
- <details key="start" value="1595"/>
- <details key="end" value="1619"/>
+ <details key="start" value="1586"/>
+ <details key="end" value="1610"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.64" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/self">
@@ -973,13 +961,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.65" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/%">
- <details key="start" value="1607"/>
- <details key="end" value="1618"/>
+ <details key="start" value="1598"/>
+ <details key="end" value="1609"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.66" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1">
- <details key="start" value="1623"/>
- <details key="end" value="1649"/>
+ <details key="start" value="1614"/>
+ <details key="end" value="1640"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.67" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/self">
@@ -988,18 +976,18 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.68" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/%">
- <details key="start" value="1635"/>
- <details key="end" value="1648"/>
+ <details key="start" value="1626"/>
+ <details key="end" value="1639"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.69" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2">
- <details key="start" value="1979"/>
- <details key="end" value="2079"/>
+ <details key="start" value="1970"/>
+ <details key="end" value="2070"/>
<details key="line" value="43"/>
</eAnnotations>
<eAnnotations source="positions.70" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%">
- <details key="start" value="2046"/>
- <details key="end" value="2074"/>
+ <details key="start" value="2037"/>
+ <details key="end" value="2065"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.71" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%/self">
@@ -1008,43 +996,43 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.72" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%.1">
- <details key="start" value="2076"/>
- <details key="end" value="2077"/>
+ <details key="start" value="2067"/>
+ <details key="end" value="2068"/>
<details key="line" value="46"/>
</eAnnotations>
<eAnnotations source="positions.73" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1">
- <details key="start" value="1510"/>
- <details key="end" value="1587"/>
+ <details key="start" value="1501"/>
+ <details key="end" value="1578"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.74" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%">
- <details key="start" value="1511"/>
- <details key="end" value="1559"/>
+ <details key="start" value="1502"/>
+ <details key="end" value="1550"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.75" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%">
- <details key="start" value="1511"/>
- <details key="end" value="1524"/>
+ <details key="start" value="1502"/>
+ <details key="end" value="1515"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.76" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/cl">
- <details key="start" value="1512"/>
- <details key="end" value="1514"/>
+ <details key="start" value="1503"/>
+ <details key="end" value="1505"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.77" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/class">
- <details key="start" value="1518"/>
- <details key="end" value="1523"/>
+ <details key="start" value="1509"/>
+ <details key="end" value="1514"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.78" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1">
- <details key="start" value="1529"/>
- <details key="end" value="1559"/>
+ <details key="start" value="1520"/>
+ <details key="end" value="1550"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.79" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%">
- <details key="start" value="1534"/>
- <details key="end" value="1558"/>
+ <details key="start" value="1525"/>
+ <details key="end" value="1549"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.80" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/self">
@@ -1053,13 +1041,13 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.81" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/%">
- <details key="start" value="1548"/>
- <details key="end" value="1557"/>
+ <details key="start" value="1539"/>
+ <details key="end" value="1548"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.82" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1">
- <details key="start" value="1563"/>
- <details key="end" value="1586"/>
+ <details key="start" value="1554"/>
+ <details key="end" value="1577"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.83" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/self">
@@ -1068,28 +1056,28 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.84" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/%">
- <details key="start" value="1577"/>
- <details key="end" value="1585"/>
+ <details key="start" value="1568"/>
+ <details key="end" value="1576"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.85" references="/0/CppClassAllIncludesDeclaration.1/%/cl">
- <details key="start" value="1318"/>
- <details key="end" value="1333"/>
+ <details key="start" value="1309"/>
+ <details key="end" value="1324"/>
<details key="line" value="33"/>
</eAnnotations>
<eAnnotations source="positions.86" references="/0/CppClassAllIncludesDeclaration.1/%/list">
- <details key="start" value="1336"/>
- <details key="end" value="1340"/>
+ <details key="start" value="1327"/>
+ <details key="end" value="1331"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.87" references="/0/CppClassAllIncludesDeclaration.1/class">
- <details key="start" value="1261"/>
- <details key="end" value="1279"/>
+ <details key="start" value="1252"/>
+ <details key="end" value="1270"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.88" references="/0/CppClassAllIncludesDeclaration.1/list">
- <details key="start" value="1281"/>
- <details key="end" value="1308"/>
+ <details key="start" value="1272"/>
+ <details key="end" value="1299"/>
<details key="line" value="32"/>
</eAnnotations>
</ecore:EAnnotation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
index f066e657317..29b005e41a8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
@@ -7,7 +7,7 @@
[comment USED??? /]
[template public CppClassIncludeClassDeclarationTemplate(class : Class)]
[openNS()/]
-[if hasStereotype(class, 'CppTemplate.class')]template [/if]class [class.name/];
+[if (hasStereotype(class, Template))]template [/if]class [class.name/];
[closeNS()/]
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
index 9512edf6c79..da1933dbf18 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
@@ -130,14 +130,58 @@
<body startPosition="644" endPosition="727" value=" TODO: original code did not use nearest package, if stereotype CppRoot was applied"/>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeDeclaration" visibility="Public">
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#include &lt;"/>
- <body xsi:type="mtl:QueryInvocation" definition="/0/includeName">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/CppClassIncludeDeclaration/ne">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
- </argument>
+ <body xsi:type="mtl:IfBlock">
+ <body xsi:type="mtl:ForBlock">
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#include &lt;"/>
+ <body xsi:type="ocl.ecore:VariableExp" name="include" referredVariable="/0/CppClassIncludeDeclaration/%/%/include.1">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">&#xA;"/>
+ <loopVariable name="include">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </loopVariable>
+ <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/11/Set(String)">
+ <source xsi:type="ocl.ecore:OperationCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
+ <source xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplicationTree"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/4/ExternLibrary">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
+ </argument>
+ </source>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/4/ExternLibrary">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
+ </argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
+ </source>
+ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary/includes"/>
+ </iterSet>
+ </body>
+ <ifExpr xsi:type="mtl:QueryInvocation">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotypeTree"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </argument>
+ <argument xsi:type="ocl.ecore:TypeExp" eType="/4/ExternLibrary">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
+ </argument>
+ </ifExpr>
+ <else>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="#include &lt;"/>
+ <body xsi:type="mtl:QueryInvocation" definition="/0/includeName">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ <argument xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/CppClassIncludeDeclaration/ne">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </argument>
+ </body>
+ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">&#xA;"/>
+ </else>
</body>
- <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">"/>
<parameter name="ne">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</parameter>
@@ -213,7 +257,22 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ </eParameters>
+ </eOperations>
+ <eOperations name="hasStereotypeTree">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL">
+ <references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotypeTree"/>
+ </eAnnotations>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+ <eParameters name="arg0">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eParameters>
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
@@ -232,6 +291,21 @@
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
+ <eOperations name="getApplicationTree">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL">
+ <references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplicationTree"/>
+ </eAnnotations>
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <eParameters name="arg0">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eParameters>
+ <eParameters name="arg1">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ </eParameters>
+ </eOperations>
<eOperations name="getHeaderSuffix">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
@@ -311,6 +385,9 @@
<eClassifiers xsi:type="ocl.ecore:TypeType" name="External">
<referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/>
</eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:TypeType" name="ExternLibrary">
+ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/>
+ </eClassifiers>
</ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
@@ -330,6 +407,29 @@
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</ocl.ecore:Variable>
+ <ecore:EPackage name="collections">
+ <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(String)" instanceClassName="java.util.Set">
+ <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eClassifiers>
+ </ecore:EPackage>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="i">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ </ocl.ecore:Variable>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</ocl.ecore:Variable>
@@ -516,30 +616,110 @@
</eAnnotations>
<eAnnotations source="positions.36" references="/0/CppClassIncludeDeclaration">
<details key="start" value="730"/>
- <details key="end" value="836"/>
+ <details key="end" value="1016"/>
<details key="line" value="19"/>
</eAnnotations>
<eAnnotations source="positions.37" references="/0/CppClassIncludeDeclaration/%">
<details key="start" value="794"/>
- <details key="end" value="804"/>
+ <details key="end" value="1004"/>
<details key="line" value="20"/>
</eAnnotations>
- <eAnnotations source="positions.38" references="/0/CppClassIncludeDeclaration/%.1">
- <details key="start" value="805"/>
- <details key="end" value="821"/>
+ <eAnnotations source="positions.38" references="/0/CppClassIncludeDeclaration/%/%">
+ <details key="start" value="835"/>
+ <details key="end" value="960"/>
+ <details key="line" value="21"/>
+ </eAnnotations>
+ <eAnnotations source="positions.39" references="/0/CppClassIncludeDeclaration/%/%/%">
+ <details key="start" value="931"/>
+ <details key="end" value="941"/>
+ <details key="line" value="21"/>
+ </eAnnotations>
+ <eAnnotations source="positions.40" references="/0/CppClassIncludeDeclaration/%/%/include">
+ <details key="start" value="942"/>
+ <details key="end" value="949"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.41" references="/0/CppClassIncludeDeclaration/%/%/%.1">
+ <details key="start" value="951"/>
+ <details key="end" value="953"/>
+ <details key="line" value="22"/>
+ </eAnnotations>
+ <eAnnotations source="positions.42" references="/0/CppClassIncludeDeclaration/%/%/include.1">
+ <details key="start" value="841"/>
+ <details key="end" value="857"/>
+ <details key="line" value="21"/>
+ </eAnnotations>
+ <eAnnotations source="positions.43" references="/0/CppClassIncludeDeclaration/%/%/%.2">
+ <details key="start" value="860"/>
+ <details key="end" value="927"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.39" references="/0/CppClassIncludeDeclaration/%.1/ne">
- <details key="start" value="805"/>
- <details key="end" value="807"/>
+ <eAnnotations source="positions.44" references="/0/CppClassIncludeDeclaration/%/%/%.2/%">
+ <details key="start" value="860"/>
+ <details key="end" value="918"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.40" references="/0/CppClassIncludeDeclaration/%.2">
- <details key="start" value="823"/>
- <details key="end" value="824"/>
- <details key="line" value="20"/>
+ <eAnnotations source="positions.45" references="/0/CppClassIncludeDeclaration/%/%/%.2/%/%">
+ <details key="start" value="860"/>
+ <details key="end" value="893"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.46" references="/0/CppClassIncludeDeclaration/%/%/%.2/%/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.47" references="/0/CppClassIncludeDeclaration/%/%/%.2/%/%/%">
+ <details key="start" value="879"/>
+ <details key="end" value="892"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.48" references="/0/CppClassIncludeDeclaration/%/%/%.2/%/%.1">
+ <details key="start" value="904"/>
+ <details key="end" value="917"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.49" references="/0/CppClassIncludeDeclaration/%/%.1">
+ <details key="start" value="798"/>
+ <details key="end" value="832"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.50" references="/0/CppClassIncludeDeclaration/%/%.1/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.51" references="/0/CppClassIncludeDeclaration/%/%.1/%">
+ <details key="start" value="817"/>
+ <details key="end" value="830"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.52" references="/0/CppClassIncludeDeclaration/%/%.2">
+ <details key="start" value="961"/>
+ <details key="end" value="999"/>
+ <details key="line" value="24"/>
+ </eAnnotations>
+ <eAnnotations source="positions.53" references="/0/CppClassIncludeDeclaration/%/%.2/%">
+ <details key="start" value="968"/>
+ <details key="end" value="978"/>
+ <details key="line" value="25"/>
+ </eAnnotations>
+ <eAnnotations source="positions.54" references="/0/CppClassIncludeDeclaration/%/%.2/%.1">
+ <details key="start" value="979"/>
+ <details key="end" value="995"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.55" references="/0/CppClassIncludeDeclaration/%/%.2/%.1/ne">
+ <details key="start" value="979"/>
+ <details key="end" value="981"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.56" references="/0/CppClassIncludeDeclaration/%/%.2/%.2">
+ <details key="start" value="997"/>
+ <details key="end" value="999"/>
+ <details key="line" value="25"/>
</eAnnotations>
- <eAnnotations source="positions.41" references="/0/CppClassIncludeDeclaration/ne">
+ <eAnnotations source="positions.57" references="/0/CppClassIncludeDeclaration/ne">
<details key="start" value="774"/>
<details key="end" value="791"/>
<details key="line" value="19"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
index f615a1214c6..7937e1a6bf5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.mtl
@@ -17,5 +17,11 @@ endif
[comment TODO: original code did not use nearest package, if stereotype CppRoot was applied/]
[template public CppClassIncludeDeclaration(ne : NamedElement)]
+[if (hasStereotypeTree(ExternLibrary))]
+ [for (include : String | getApplicationTree(ExternLibrary).oclAsType(ExternLibrary).includes)]
+#include <[include/]>
+ [/for]
+[else]
#include <[ne.includeName()/]>
+[/if]
[/template]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
index fd599c4a091..50b3840736a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
@@ -251,7 +251,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl
index 5b94db52449..4c3df926d85 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.emtl
@@ -133,7 +133,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
index 435aa172998..bf52a8a2d72 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
@@ -294,7 +294,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
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 624f4d3bc70..26fe3d961e6 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
@@ -806,7 +806,7 @@
<eParameters name="arg0">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</eParameters>
- <eParameters name="arg1">
+ <eParameters name="definition">
<eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
</eParameters>
</eOperations>
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 f351d6f1af4..2ea93401e0e 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
@@ -13,36 +13,30 @@
<ownedModuleElement xsi:type="mtl:Template" name="defaultValue" visibility="Public">
<body xsi:type="mtl:IfBlock">
<body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
- <body xsi:type="ocl.ecore:PropertyCallExp">
+ <body xsi:type="ocl.ecore:OperationCallExp">
<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#//Default"/>
- <source xsi:type="mtl:QueryInvocation">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
- </argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Default">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Default"/>
- </argument>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</source>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Default">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Default"/>
- </argument>
- <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter/defaultValue"/>
</source>
- <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Default/value"/>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
</body>
- <ifExpr xsi:type="mtl:QueryInvocation">
+ <ifExpr xsi:type="ocl.ecore:OperationCallExp">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <definition href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
- </argument>
- <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Default">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Default"/>
+ <source xsi:type="ocl.ecore:PropertyCallExp">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
+ </source>
+ <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter/defaultValue"/>
+ </source>
+ <argument xsi:type="ocl.ecore:NullLiteralExp">
+ <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
</argument>
+ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
</ifExpr>
</body>
<parameter name="parameter">
@@ -50,13 +44,13 @@
</parameter>
</ownedModuleElement>
<ownedModuleElement xsi:type="mtl:Comment">
- <body startPosition="475" endPosition="606" value=" C++ parameter. Default values are added, if parameter showDefault is true (implementation signature&#xA;&#x9;may not repeat default value)"/>
+ <body startPosition="430" endPosition="561" value=" C++ parameter. Default values are added, if parameter showDefault is true (implementation signature&#xA;&#x9;may not repeat default value)"/>
</ownedModuleElement>
<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"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
@@ -74,14 +68,14 @@
<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/modPtr"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</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/modRef"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/16">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
@@ -96,14 +90,14 @@
<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/modArray"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
<body xsi:type="mtl:IfBlock">
<body xsi:type="mtl:TemplateInvocation" definition="/0/defaultValue">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/20">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</body>
@@ -122,16 +116,16 @@
<body xsi:type="mtl:ForBlock">
<body xsi:type="mtl:TemplateInvocation" definition="/0/CppParameter">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
<argument xsi:type="ocl.ecore:VariableExp" name="showDefault" referredVariable="/0/CppOperationParameters/showDefault">
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
</argument>
</body>
- <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/25/OrderedSet(Parameter)">
- <source xsi:type="ocl.ecore:PropertyCallExp" eType="/25/OrderedSet(Parameter)">
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/26">
+ <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/24/OrderedSet(Parameter)">
+ <source xsi:type="ocl.ecore:PropertyCallExp" eType="/24/OrderedSet(Parameter)">
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
</source>
<referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature/ownedParameter"/>
@@ -223,36 +217,6 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
</eParameters>
</eOperations>
- <eOperations name="hasStereotype">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL">
- <references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
- </eAnnotations>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
- <eParameters name="arg0">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
- </eParameters>
- <eParameters name="arg1">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- </eParameters>
- </eOperations>
- <eOperations name="getApplication">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL">
- <references href="../../../../../../../../../../org.eclipse.papyrus.acceleo/bin/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
- </eAnnotations>
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <eParameters name="arg0">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
- </eParameters>
- <eParameters name="arg1">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- </eParameters>
- </eOperations>
<eOperations name="cppQualifiedName">
<eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
<contents xsi:type="ocl.ecore:Constraint"/>
@@ -392,11 +356,6 @@
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</ocl.ecore:Variable>
- <ecore:EPackage name="types">
- <eClassifiers xsi:type="ocl.ecore:TypeType" name="Default">
- <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Default"/>
- </eClassifiers>
- </ecore:EPackage>
<ocl.ecore:Variable name="self">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</ocl.ecore:Variable>
@@ -480,257 +439,247 @@
<ecore:EAnnotation source="positions">
<eAnnotations source="positions.0" references="/0/defaultValue">
<details key="start" value="290"/>
- <details key="end" value="465"/>
+ <details key="end" value="420"/>
<details key="line" value="9"/>
</eAnnotations>
<eAnnotations source="positions.1" references="/0/defaultValue/%">
<details key="start" value="344"/>
- <details key="end" value="453"/>
+ <details key="end" value="408"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.2" references="/0/defaultValue/%/%">
- <details key="start" value="380"/>
- <details key="end" value="383"/>
+ <details key="start" value="371"/>
+ <details key="end" value="374"/>
<details key="line" value="10"/>
</eAnnotations>
<eAnnotations source="positions.3" references="/0/defaultValue/%/%.1">
- <details key="start" value="384"/>
- <details key="end" value="446"/>
+ <details key="start" value="375"/>
+ <details key="end" value="401"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.4" references="/0/defaultValue/%/%.1/%">
- <details key="start" value="384"/>
- <details key="end" value="440"/>
+ <details key="start" value="375"/>
+ <details key="end" value="387"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.5" references="/0/defaultValue/%/%.1/%/%">
- <details key="start" value="384"/>
- <details key="end" value="414"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.6" references="/0/defaultValue/%/%.1/%/%/self">
+ <eAnnotations source="positions.5" references="/0/defaultValue/%/%.1/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.7" references="/0/defaultValue/%/%.1/%/%/%">
- <details key="start" value="399"/>
- <details key="end" value="413"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.8" references="/0/defaultValue/%/%.1/%/%.1">
- <details key="start" value="425"/>
- <details key="end" value="439"/>
+ <eAnnotations source="positions.6" references="/0/defaultValue/%/%.2">
+ <details key="start" value="348"/>
+ <details key="end" value="370"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.9" references="/0/defaultValue/%/%.2">
- <details key="start" value="348"/>
- <details key="end" value="379"/>
+ <eAnnotations source="positions.7" references="/0/defaultValue/%/%.2/%">
+ <details key="start" value="349"/>
+ <details key="end" value="361"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.10" references="/0/defaultValue/%/%.2/self">
+ <eAnnotations source="positions.8" references="/0/defaultValue/%/%.2/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.11" references="/0/defaultValue/%/%.2/%">
- <details key="start" value="363"/>
- <details key="end" value="377"/>
+ <eAnnotations source="positions.9" references="/0/defaultValue/%/%.2/%.1">
+ <details key="start" value="365"/>
+ <details key="end" value="369"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.12" references="/0/defaultValue/parameter">
+ <eAnnotations source="positions.10" references="/0/defaultValue/parameter">
<details key="start" value="320"/>
<details key="end" value="341"/>
<details key="line" value="9"/>
</eAnnotations>
- <eAnnotations source="positions.13" references="/0/%">
- <details key="start" value="467"/>
- <details key="end" value="608"/>
+ <eAnnotations source="positions.11" references="/0/%">
+ <details key="start" value="422"/>
+ <details key="end" value="563"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.14" references="/0/CppParameter">
- <details key="start" value="609"/>
- <details key="end" value="840"/>
+ <eAnnotations source="positions.12" references="/0/CppParameter">
+ <details key="start" value="564"/>
+ <details key="end" value="795"/>
<details key="line" value="15"/>
</eAnnotations>
- <eAnnotations source="positions.15" references="/0/CppParameter/%">
- <details key="start" value="687"/>
- <details key="end" value="697"/>
+ <eAnnotations source="positions.13" references="/0/CppParameter/%">
+ <details key="start" value="642"/>
+ <details key="end" value="652"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.16" references="/0/CppParameter/%/self">
+ <eAnnotations source="positions.14" references="/0/CppParameter/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.17" references="/0/CppParameter/%.1">
- <details key="start" value="700"/>
- <details key="end" value="733"/>
+ <eAnnotations source="positions.15" references="/0/CppParameter/%.1">
+ <details key="start" value="655"/>
+ <details key="end" value="688"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.18" references="/0/CppParameter/%.1/%">
- <details key="start" value="700"/>
- <details key="end" value="714"/>
+ <eAnnotations source="positions.16" references="/0/CppParameter/%.1/%">
+ <details key="start" value="655"/>
+ <details key="end" value="669"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.19" references="/0/CppParameter/%.1/%/parameter">
- <details key="start" value="700"/>
- <details key="end" value="709"/>
+ <eAnnotations source="positions.17" references="/0/CppParameter/%.1/%/parameter">
+ <details key="start" value="655"/>
+ <details key="end" value="664"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.20" references="/0/CppParameter/%.2">
- <details key="start" value="736"/>
- <details key="end" value="744"/>
+ <eAnnotations source="positions.18" references="/0/CppParameter/%.2">
+ <details key="start" value="691"/>
+ <details key="end" value="699"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.21" references="/0/CppParameter/%.2/self">
+ <eAnnotations source="positions.19" references="/0/CppParameter/%.2/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.22" references="/0/CppParameter/%.3">
- <details key="start" value="747"/>
- <details key="end" value="755"/>
+ <eAnnotations source="positions.20" references="/0/CppParameter/%.3">
+ <details key="start" value="702"/>
+ <details key="end" value="710"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.23" references="/0/CppParameter/%.3/self">
+ <eAnnotations source="positions.21" references="/0/CppParameter/%.3/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.24" references="/0/CppParameter/%.4">
- <details key="start" value="757"/>
- <details key="end" value="758"/>
+ <eAnnotations source="positions.22" references="/0/CppParameter/%.4">
+ <details key="start" value="712"/>
+ <details key="end" value="713"/>
<details key="line" value="16"/>
</eAnnotations>
- <eAnnotations source="positions.25" references="/0/CppParameter/%.5">
- <details key="start" value="759"/>
- <details key="end" value="773"/>
+ <eAnnotations source="positions.23" references="/0/CppParameter/%.5">
+ <details key="start" value="714"/>
+ <details key="end" value="728"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.26" references="/0/CppParameter/%.5/parameter">
- <details key="start" value="759"/>
- <details key="end" value="768"/>
+ <eAnnotations source="positions.24" references="/0/CppParameter/%.5/parameter">
+ <details key="start" value="714"/>
+ <details key="end" value="723"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.27" references="/0/CppParameter/%.6">
- <details key="start" value="776"/>
- <details key="end" value="786"/>
+ <eAnnotations source="positions.25" references="/0/CppParameter/%.6">
+ <details key="start" value="731"/>
+ <details key="end" value="741"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.28" references="/0/CppParameter/%.6/self">
+ <eAnnotations source="positions.26" references="/0/CppParameter/%.6/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.29" references="/0/CppParameter/%.7">
- <details key="start" value="788"/>
- <details key="end" value="828"/>
+ <eAnnotations source="positions.27" references="/0/CppParameter/%.7">
+ <details key="start" value="743"/>
+ <details key="end" value="783"/>
<details key="line" value="16"/>
</eAnnotations>
- <eAnnotations source="positions.30" references="/0/CppParameter/%.7/%">
- <details key="start" value="807"/>
- <details key="end" value="821"/>
+ <eAnnotations source="positions.28" references="/0/CppParameter/%.7/%">
+ <details key="start" value="762"/>
+ <details key="end" value="776"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.31" references="/0/CppParameter/%.7/%/self">
+ <eAnnotations source="positions.29" references="/0/CppParameter/%.7/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.32" references="/0/CppParameter/%.7/showDefault">
- <details key="start" value="792"/>
- <details key="end" value="805"/>
+ <eAnnotations source="positions.30" references="/0/CppParameter/%.7/showDefault">
+ <details key="start" value="747"/>
+ <details key="end" value="760"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.33" references="/0/CppParameter/parameter">
- <details key="start" value="639"/>
- <details key="end" value="660"/>
+ <eAnnotations source="positions.31" references="/0/CppParameter/parameter">
+ <details key="start" value="594"/>
+ <details key="end" value="615"/>
<details key="line" value="15"/>
</eAnnotations>
- <eAnnotations source="positions.34" references="/0/CppParameter/showDefault">
- <details key="start" value="662"/>
- <details key="end" value="683"/>
+ <eAnnotations source="positions.32" references="/0/CppParameter/showDefault">
+ <details key="start" value="617"/>
+ <details key="end" value="638"/>
<details key="line" value="15"/>
</eAnnotations>
- <eAnnotations source="positions.35" references="/0/CppOperationParameters">
- <details key="start" value="843"/>
- <details key="end" value="1067"/>
+ <eAnnotations source="positions.33" references="/0/CppOperationParameters">
+ <details key="start" value="798"/>
+ <details key="end" value="1022"/>
<details key="line" value="20"/>
</eAnnotations>
- <eAnnotations source="positions.36" references="/0/CppOperationParameters/%">
- <details key="start" value="930"/>
- <details key="end" value="1055"/>
+ <eAnnotations source="positions.34" references="/0/CppOperationParameters/%">
+ <details key="start" value="885"/>
+ <details key="end" value="1010"/>
<details key="line" value="21"/>
</eAnnotations>
- <eAnnotations source="positions.37" references="/0/CppOperationParameters/%/%">
- <details key="start" value="1022"/>
- <details key="end" value="1047"/>
+ <eAnnotations source="positions.35" references="/0/CppOperationParameters/%/%">
+ <details key="start" value="977"/>
+ <details key="end" value="1002"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.38" references="/0/CppOperationParameters/%/%/self">
+ <eAnnotations source="positions.36" references="/0/CppOperationParameters/%/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.39" references="/0/CppOperationParameters/%/%/showDefault">
- <details key="start" value="1035"/>
- <details key="end" value="1046"/>
+ <eAnnotations source="positions.37" references="/0/CppOperationParameters/%/%/showDefault">
+ <details key="start" value="990"/>
+ <details key="end" value="1001"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.40" references="/0/CppOperationParameters/%/select">
- <details key="start" value="936"/>
- <details key="end" value="1003"/>
+ <eAnnotations source="positions.38" references="/0/CppOperationParameters/%/select">
+ <details key="start" value="891"/>
+ <details key="end" value="958"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.41" references="/0/CppOperationParameters/%/select/%">
- <details key="start" value="936"/>
- <details key="end" value="950"/>
+ <eAnnotations source="positions.39" references="/0/CppOperationParameters/%/select/%">
+ <details key="start" value="891"/>
+ <details key="end" value="905"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.42" references="/0/CppOperationParameters/%/select/%/self">
+ <eAnnotations source="positions.40" references="/0/CppOperationParameters/%/select/%/self">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.43" references="/0/CppOperationParameters/%/select/%.1">
- <details key="start" value="959"/>
- <details key="end" value="1002"/>
+ <eAnnotations source="positions.41" references="/0/CppOperationParameters/%/select/%.1">
+ <details key="start" value="914"/>
+ <details key="end" value="957"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.44" references="/0/CppOperationParameters/%/select/%.1/%">
- <details key="start" value="959"/>
- <details key="end" value="968"/>
+ <eAnnotations source="positions.42" references="/0/CppOperationParameters/%/select/%.1/%">
+ <details key="start" value="914"/>
+ <details key="end" value="923"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.45" references="/0/CppOperationParameters/%/select/%.1/%/temp1">
+ <eAnnotations source="positions.43" references="/0/CppOperationParameters/%/select/%.1/%/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.46" references="/0/CppOperationParameters/%/select/%.1/%.1">
- <details key="start" value="972"/>
- <details key="end" value="1002"/>
+ <eAnnotations source="positions.44" references="/0/CppOperationParameters/%/select/%.1/%.1">
+ <details key="start" value="927"/>
+ <details key="end" value="957"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.47" references="/0/CppOperationParameters/%/select/temp1">
+ <eAnnotations source="positions.45" references="/0/CppOperationParameters/%/select/temp1">
<details key="start" value="-1"/>
<details key="end" value="-1"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.48" references="/0/CppOperationParameters/%/%.1">
- <details key="start" value="1015"/>
- <details key="end" value="1019"/>
+ <eAnnotations source="positions.46" references="/0/CppOperationParameters/%/%.1">
+ <details key="start" value="970"/>
+ <details key="end" value="974"/>
<details key="line" value="0"/>
</eAnnotations>
- <eAnnotations source="positions.49" references="/0/CppOperationParameters/operation">
- <details key="start" value="883"/>
- <details key="end" value="904"/>
+ <eAnnotations source="positions.47" references="/0/CppOperationParameters/operation">
+ <details key="start" value="838"/>
+ <details key="end" value="859"/>
<details key="line" value="20"/>
</eAnnotations>
- <eAnnotations source="positions.50" references="/0/CppOperationParameters/showDefault">
- <details key="start" value="906"/>
- <details key="end" value="927"/>
+ <eAnnotations source="positions.48" references="/0/CppOperationParameters/showDefault">
+ <details key="start" value="861"/>
+ <details key="end" value="882"/>
<details key="line" value="20"/>
</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 e59a3e26b42..65ecd6707e4 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
@@ -7,7 +7,7 @@
[template public defaultValue(parameter : Parameter)]
-[if (hasStereotype(C_Cpp::Default))] = [getApplication(C_Cpp::Default).oclAsType(C_Cpp::Default).value/][/if]
+[if (defaultValue <> null)] = [defaultValue.stringValue()/][/if]
[/template]
[comment C++ parameter. Default values are added, if parameter showDefault is true (implementation signature
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl
index 7cd2a5c8f90..9e8fb375556 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenUtils.emtl
@@ -1,244 +1,244 @@
-<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
- <mtl:Module name="CppCodeGenUtils" nsURI="org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils" startHeaderPosition="29" endHeaderPosition="93">
- <input>
- <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
- </input>
- <ownedModuleElement xsi:type="mtl:Query" name="getHeaderSuffix" visibility="Public">
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/4">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </source>
- <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
- <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="getHeaderSuffix()">
- <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="/3/Sequence(OclVoid)" kind="Sequence"/>
- </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="getBodySuffix" visibility="Public">
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </source>
- <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
- <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="getBodySuffix()">
- <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="/3/Sequence(OclVoid)" kind="Sequence"/>
- </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="getCommentHeader" visibility="Public">
- <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </source>
- <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
- <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="getCommentHeader()">
- <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="/3/Sequence(OclVoid)" kind="Sequence"/>
- </expression>
- <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </ownedModuleElement>
- </mtl:Module>
- <ecore:EPackage name="additions">
- <eClassifiers xsi:type="ecore:EClass" name="String_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </eAnnotations>
- <eOperations name="getHeaderSuffix">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getHeaderSuffix"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="getBodySuffix">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getBodySuffix"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- <eOperations name="getCommentHeader">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <contents xsi:type="ocl.ecore:Constraint"/>
- </eAnnotations>
- <eAnnotations source="MTL" references="/0/getCommentHeader"/>
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- </eAnnotations>
- <eOperations name="invoke">
- <eAnnotations source="MTL non-standard"/>
- <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- <eParameters name="class">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="method">
- <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
- </eParameters>
- <eParameters name="arguments">
- <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
- </eParameters>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
- <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
- <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
- </eAnnotations>
- </eClassifiers>
- </ecore:EPackage>
- <ocl.ecore:Variable name="self">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </ocl.ecore:Variable>
- <ecore:EPackage name="collections">
- <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclVoid)" instanceClassName="java.util.List">
- <elementType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
- </eClassifiers>
- <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
- <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
- </eClassifiers>
- </ecore:EPackage>
- <ocl.ecore:Variable name="self">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </ocl.ecore:Variable>
- <ocl.ecore:Variable name="self">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </ocl.ecore:Variable>
- <ocl.ecore:Variable name="self">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </ocl.ecore:Variable>
- <ecore:EAnnotation source="positions">
- <eAnnotations source="positions.0" references="/0/getHeaderSuffix">
- <details key="start" value="97"/>
- <details key="end" value="246"/>
- <details key="line" value="4"/>
- </eAnnotations>
- <eAnnotations source="positions.1" references="/0/getHeaderSuffix/%">
- <details key="start" value="141"/>
- <details key="end" value="243"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.2" references="/0/getHeaderSuffix/%/self">
- <details key="start" value="-1"/>
- <details key="end" value="-1"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.3" references="/0/getHeaderSuffix/%/%">
- <details key="start" value="148"/>
- <details key="end" value="209"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.4" references="/0/getHeaderSuffix/%/%.1">
- <details key="start" value="211"/>
- <details key="end" value="230"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.5" references="/0/getHeaderSuffix/%/%.2">
- <details key="start" value="232"/>
- <details key="end" value="242"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.6" references="/0/getBodySuffix">
- <details key="start" value="249"/>
- <details key="end" value="394"/>
- <details key="line" value="8"/>
- </eAnnotations>
- <eAnnotations source="positions.7" references="/0/getBodySuffix/%">
- <details key="start" value="291"/>
- <details key="end" value="391"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.8" references="/0/getBodySuffix/%/self">
- <details key="start" value="-1"/>
- <details key="end" value="-1"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.9" references="/0/getBodySuffix/%/%">
- <details key="start" value="298"/>
- <details key="end" value="359"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.10" references="/0/getBodySuffix/%/%.1">
- <details key="start" value="361"/>
- <details key="end" value="378"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.11" references="/0/getBodySuffix/%/%.2">
- <details key="start" value="380"/>
- <details key="end" value="390"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.12" references="/0/getCommentHeader">
- <details key="start" value="396"/>
- <details key="end" value="547"/>
- <details key="line" value="11"/>
- </eAnnotations>
- <eAnnotations source="positions.13" references="/0/getCommentHeader/%">
- <details key="start" value="441"/>
- <details key="end" value="544"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.14" references="/0/getCommentHeader/%/self">
- <details key="start" value="-1"/>
- <details key="end" value="-1"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.15" references="/0/getCommentHeader/%/%">
- <details key="start" value="448"/>
- <details key="end" value="509"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.16" references="/0/getCommentHeader/%/%.1">
- <details key="start" value="511"/>
- <details key="end" value="531"/>
- <details key="line" value="0"/>
- </eAnnotations>
- <eAnnotations source="positions.17" references="/0/getCommentHeader/%/%.2">
- <details key="start" value="533"/>
- <details key="end" value="543"/>
- <details key="line" value="0"/>
- </eAnnotations>
- </ecore:EAnnotation>
-</xmi:XMI>
+<?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:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">
+ <mtl:Module name="CppCodeGenUtils" nsURI="org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils" startHeaderPosition="29" endHeaderPosition="93">
+ <input>
+ <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
+ </input>
+ <ownedModuleElement xsi:type="mtl:Query" name="getHeaderSuffix" visibility="Public">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/4">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </source>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
+ <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="getHeaderSuffix()">
+ <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="/3/Sequence(OclVoid)" kind="Sequence"/>
+ </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="getBodySuffix" visibility="Public">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </source>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
+ <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="getBodySuffix()">
+ <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="/3/Sequence(OclVoid)" kind="Sequence"/>
+ </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="getCommentHeader" visibility="Public">
+ <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/6">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </source>
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils">
+ <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="getCommentHeader()">
+ <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="/3/Sequence(OclVoid)" kind="Sequence"/>
+ </expression>
+ <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </ownedModuleElement>
+ </mtl:Module>
+ <ecore:EPackage name="additions">
+ <eClassifiers xsi:type="ecore:EClass" name="String_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Real_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </eAnnotations>
+ <eOperations name="getHeaderSuffix">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getHeaderSuffix"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eOperations>
+ <eOperations name="getBodySuffix">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getBodySuffix"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eOperations>
+ <eOperations name="getCommentHeader">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <contents xsi:type="ocl.ecore:Constraint"/>
+ </eAnnotations>
+ <eAnnotations source="MTL" references="/0/getCommentHeader"/>
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ </eAnnotations>
+ <eOperations name="invoke">
+ <eAnnotations source="MTL non-standard"/>
+ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ <eParameters name="class">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ <eParameters name="method">
+ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+ </eParameters>
+ <eParameters name="arguments">
+ <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>
+ </eParameters>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">
+ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+ <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>
+ </eAnnotations>
+ </eClassifiers>
+ </ecore:EPackage>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
+ <ecore:EPackage name="collections">
+ <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclVoid)" instanceClassName="java.util.List">
+ <elementType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ocl.ecore:SequenceType" instanceClassName="java.util.List">
+ <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
+ </eClassifiers>
+ </ecore:EPackage>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
+ <ocl.ecore:Variable name="self">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </ocl.ecore:Variable>
+ <ecore:EAnnotation source="positions">
+ <eAnnotations source="positions.0" references="/0/getHeaderSuffix">
+ <details key="start" value="97"/>
+ <details key="end" value="246"/>
+ <details key="line" value="4"/>
+ </eAnnotations>
+ <eAnnotations source="positions.1" references="/0/getHeaderSuffix/%">
+ <details key="start" value="141"/>
+ <details key="end" value="243"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.2" references="/0/getHeaderSuffix/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.3" references="/0/getHeaderSuffix/%/%">
+ <details key="start" value="148"/>
+ <details key="end" value="209"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.4" references="/0/getHeaderSuffix/%/%.1">
+ <details key="start" value="211"/>
+ <details key="end" value="230"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.5" references="/0/getHeaderSuffix/%/%.2">
+ <details key="start" value="232"/>
+ <details key="end" value="242"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.6" references="/0/getBodySuffix">
+ <details key="start" value="249"/>
+ <details key="end" value="394"/>
+ <details key="line" value="8"/>
+ </eAnnotations>
+ <eAnnotations source="positions.7" references="/0/getBodySuffix/%">
+ <details key="start" value="291"/>
+ <details key="end" value="391"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.8" references="/0/getBodySuffix/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.9" references="/0/getBodySuffix/%/%">
+ <details key="start" value="298"/>
+ <details key="end" value="359"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.10" references="/0/getBodySuffix/%/%.1">
+ <details key="start" value="361"/>
+ <details key="end" value="378"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.11" references="/0/getBodySuffix/%/%.2">
+ <details key="start" value="380"/>
+ <details key="end" value="390"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.12" references="/0/getCommentHeader">
+ <details key="start" value="396"/>
+ <details key="end" value="547"/>
+ <details key="line" value="11"/>
+ </eAnnotations>
+ <eAnnotations source="positions.13" references="/0/getCommentHeader/%">
+ <details key="start" value="441"/>
+ <details key="end" value="544"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.14" references="/0/getCommentHeader/%/self">
+ <details key="start" value="-1"/>
+ <details key="end" value="-1"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.15" references="/0/getCommentHeader/%/%">
+ <details key="start" value="448"/>
+ <details key="end" value="509"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.16" references="/0/getCommentHeader/%/%.1">
+ <details key="start" value="511"/>
+ <details key="end" value="531"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ <eAnnotations source="positions.17" references="/0/getCommentHeader/%/%.2">
+ <details key="start" value="533"/>
+ <details key="end" value="543"/>
+ <details key="line" value="0"/>
+ </eAnnotations>
+ </ecore:EAnnotation>
+</xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 70dce57d00f..9d3549b2047 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -16,6 +16,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.papyrus.C_Cpp.CppRoot;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
import org.eclipse.papyrus.C_Cpp.External;
import org.eclipse.papyrus.C_Cpp.Include;
import org.eclipse.papyrus.C_Cpp.ManualGeneration;
@@ -39,18 +40,20 @@ import org.eclipse.uml2.uml.util.UMLUtil;
*/
public class CppModelElementsCreator extends ModelElementsCreator {
- public static final String ACCELEO_PREFIX = "org::eclipse::papyrus::cpp::codegen::acceleo::";
+ public static final String ACCELEO_PREFIX = "org::eclipse::papyrus::cpp::codegen::acceleo::"; //$NON-NLS-1$
- public static final String CppClassBody = ACCELEO_PREFIX + "CppClassBody";
+ public static final String CppClassBody = ACCELEO_PREFIX + "CppClassBody"; //$NON-NLS-1$
- public static final String CppClassHeader = ACCELEO_PREFIX + "CppClassHeader";
+ public static final String CppClassHeader = ACCELEO_PREFIX + "CppClassHeader"; //$NON-NLS-1$
- public static final String CppBindBody = ACCELEO_PREFIX + "CppBindBody";
+ public static final String CppBindBody = ACCELEO_PREFIX + "CppBindBody"; //$NON-NLS-1$
- public static final String CppBindHeader = ACCELEO_PREFIX + "CppBindHeader";
+ public static final String CppBindHeader = ACCELEO_PREFIX + "CppBindHeader"; //$NON-NLS-1$
- public static final String CppPackageHeader = ACCELEO_PREFIX + "CppPackageHeader";
+ public static final String CppPackageHeader = ACCELEO_PREFIX + "CppPackageHeader"; //$NON-NLS-1$
+ public static final String DOT = "."; //$NON-NLS-1$
+
/**
*
* Constructor.
@@ -102,7 +105,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
ManualGeneration mg = UMLUtil.getStereotypeApplication(classifier, ManualGeneration.class);
Include cppInclude = UMLUtil.getStereotypeApplication(classifier, Include.class);
String fileContent = commentHeader + cppInclude.getHeader();
- createFile(container, classifier.getName() + "." + hppExt, fileContent, true); //$NON-NLS-1$
+ createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);
String manualURI = "TODO"; // fileContent = AcceleoDriver.evaluateURI(new URI(CppPackageHeader)), classifier);
@@ -111,30 +114,31 @@ public class CppModelElementsCreator extends ModelElementsCreator {
if(ext.length() == 0) {
ext = cppExt;
}
- createFile(container, classifier.getName() + "." + ext, fileContent, true);
+ createFile(container, classifier.getName() + DOT + ext, fileContent, true);
}
// Only generate when no CppNoCodeGen stereotype is applied to the class
- else if((!GenUtils.hasStereotypeTree(classifier, NoCodeGen.class)) && (!GenUtils.hasStereotype(classifier, External.class)) && (!GenUtils.hasStereotype(classifier, Template.class))) {
+ else if((!noCodeGen(classifier)) &&
+ (!GenUtils.hasStereotype(classifier, Template.class))) {
// Template Bound Class
if(GenUtils.isTemplateBoundElement(classifier)) {
// TODO: Acceleo template is only defined for class (not for all classifiers)
String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindHeader, classifier);
- createFile(container, classifier.getName() + "." + hppExt, fileContent, true);
+ createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);
fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindBody, classifier);
- createFile(container, classifier.getName() + "." + cppExt, fileContent, true);
+ createFile(container, classifier.getName() + DOT + cppExt, fileContent, true);
}
else {
// Header file generation
String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppClassHeader, classifier);
- createFile(container, classifier.getName() + "." + hppExt, fileContent, true);
+ createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);
// Create class body
if(classifier instanceof Class) {
fileContent = commentHeader + AcceleoDriver.evaluateURI(CppClassBody, classifier);
- createFile(container, classifier.getName() + "." + cppExt, fileContent, true);
+ createFile(container, classifier.getName() + DOT + cppExt, fileContent, true);
}
}
}
@@ -144,7 +148,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
protected void createPackageFiles(IContainer packageContainer, IProgressMonitor monitor, Package pkg) throws CoreException {
// Creates the header for the package.
String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppPackageHeader, pkg);
- createFile(packageContainer, "Pkg_" + pkg.getName() + "." + hppExt, fileContent, true);
+ createFile(packageContainer, "Pkg_" + pkg.getName() + DOT + hppExt, fileContent, true); //$NON-NLS-1$
}
@@ -153,6 +157,9 @@ public class CppModelElementsCreator extends ModelElementsCreator {
}
protected boolean noCodeGen(Element element) {
- return GenUtils.hasStereotype(element, NoCodeGen.class);
+ return
+ GenUtils.hasStereotype(element, NoCodeGen.class) ||
+ GenUtils.hasStereotype(element, External.class) ||
+ GenUtils.hasStereotypeTree(element, ExternLibrary.class);
}
}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl
index 5448614144e..d7f116d65be 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.emtl
@@ -94,7 +94,7 @@
<argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.papyrus.cpp.codegen.utils.CppGenUtils">
<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="getType(org.eclipse.uml2.uml.TemplateParameter)">
+ <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="getTemplateTypeName(org.eclipse.uml2.uml.TemplateParameter)">
<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(TemplateParameter)" kind="Sequence">
@@ -591,7 +591,7 @@
</eAnnotations>
<eAnnotations source="positions.24" references="/0/getTemplateTypeName">
<details key="start" value="700"/>
- <details key="end" value="901"/>
+ <details key="end" value="913"/>
<details key="line" value="16"/>
</eAnnotations>
<eAnnotations source="positions.25" references="/0/getTemplateTypeName/arg0">
@@ -601,7 +601,7 @@
</eAnnotations>
<eAnnotations source="positions.26" references="/0/getTemplateTypeName/%">
<details key="start" value="772"/>
- <details key="end" value="898"/>
+ <details key="end" value="910"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.27" references="/0/getTemplateTypeName/%/self">
@@ -616,32 +616,32 @@
</eAnnotations>
<eAnnotations source="positions.29" references="/0/getTemplateTypeName/%/%.1">
<details key="start" value="832"/>
- <details key="end" value="881"/>
+ <details key="end" value="893"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.30" references="/0/getTemplateTypeName/%/%.2">
- <details key="start" value="883"/>
- <details key="end" value="897"/>
+ <details key="start" value="895"/>
+ <details key="end" value="909"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.31" references="/0/getTemplateTypeName/%/%.2/%/arg0">
- <details key="start" value="892"/>
- <details key="end" value="896"/>
+ <details key="start" value="904"/>
+ <details key="end" value="908"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.32" references="/0/getNamespace">
- <details key="start" value="903"/>
- <details key="end" value="1092"/>
+ <details key="start" value="915"/>
+ <details key="end" value="1104"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.33" references="/0/getNamespace/arg0">
- <details key="start" value="930"/>
- <details key="end" value="949"/>
+ <details key="start" value="942"/>
+ <details key="end" value="961"/>
<details key="line" value="20"/>
</eAnnotations>
<eAnnotations source="positions.34" references="/0/getNamespace/%">
- <details key="start" value="963"/>
- <details key="end" value="1089"/>
+ <details key="start" value="975"/>
+ <details key="end" value="1101"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.35" references="/0/getNamespace/%/self">
@@ -650,38 +650,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.36" references="/0/getNamespace/%/%">
- <details key="start" value="970"/>
- <details key="end" value="1021"/>
+ <details key="start" value="982"/>
+ <details key="end" value="1033"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.37" references="/0/getNamespace/%/%.1">
- <details key="start" value="1023"/>
- <details key="end" value="1072"/>
+ <details key="start" value="1035"/>
+ <details key="end" value="1084"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.38" references="/0/getNamespace/%/%.2">
- <details key="start" value="1074"/>
- <details key="end" value="1088"/>
+ <details key="start" value="1086"/>
+ <details key="end" value="1100"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.39" references="/0/getNamespace/%/%.2/%/arg0">
- <details key="start" value="1083"/>
- <details key="end" value="1087"/>
+ <details key="start" value="1095"/>
+ <details key="end" value="1099"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.40" references="/0/openNS">
- <details key="start" value="1094"/>
- <details key="end" value="1271"/>
+ <details key="start" value="1106"/>
+ <details key="end" value="1283"/>
<details key="line" value="24"/>
</eAnnotations>
<eAnnotations source="positions.41" references="/0/openNS/arg0">
- <details key="start" value="1115"/>
- <details key="end" value="1134"/>
+ <details key="start" value="1127"/>
+ <details key="end" value="1146"/>
<details key="line" value="24"/>
</eAnnotations>
<eAnnotations source="positions.42" references="/0/openNS/%">
- <details key="start" value="1148"/>
- <details key="end" value="1268"/>
+ <details key="start" value="1160"/>
+ <details key="end" value="1280"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.43" references="/0/openNS/%/self">
@@ -690,38 +690,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.44" references="/0/openNS/%/%">
- <details key="start" value="1155"/>
- <details key="end" value="1206"/>
+ <details key="start" value="1167"/>
+ <details key="end" value="1218"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.45" references="/0/openNS/%/%.1">
- <details key="start" value="1208"/>
- <details key="end" value="1251"/>
+ <details key="start" value="1220"/>
+ <details key="end" value="1263"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.46" references="/0/openNS/%/%.2">
- <details key="start" value="1253"/>
- <details key="end" value="1267"/>
+ <details key="start" value="1265"/>
+ <details key="end" value="1279"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.47" references="/0/openNS/%/%.2/%/arg0">
- <details key="start" value="1262"/>
- <details key="end" value="1266"/>
+ <details key="start" value="1274"/>
+ <details key="end" value="1278"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.48" references="/0/closeNS">
- <details key="start" value="1273"/>
- <details key="end" value="1452"/>
+ <details key="start" value="1285"/>
+ <details key="end" value="1464"/>
<details key="line" value="28"/>
</eAnnotations>
<eAnnotations source="positions.49" references="/0/closeNS/arg0">
- <details key="start" value="1295"/>
- <details key="end" value="1314"/>
+ <details key="start" value="1307"/>
+ <details key="end" value="1326"/>
<details key="line" value="28"/>
</eAnnotations>
<eAnnotations source="positions.50" references="/0/closeNS/%">
- <details key="start" value="1328"/>
- <details key="end" value="1449"/>
+ <details key="start" value="1340"/>
+ <details key="end" value="1461"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.51" references="/0/closeNS/%/self">
@@ -730,38 +730,38 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.52" references="/0/closeNS/%/%">
- <details key="start" value="1335"/>
- <details key="end" value="1386"/>
+ <details key="start" value="1347"/>
+ <details key="end" value="1398"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.53" references="/0/closeNS/%/%.1">
- <details key="start" value="1388"/>
- <details key="end" value="1432"/>
+ <details key="start" value="1400"/>
+ <details key="end" value="1444"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.54" references="/0/closeNS/%/%.2">
- <details key="start" value="1434"/>
- <details key="end" value="1448"/>
+ <details key="start" value="1446"/>
+ <details key="end" value="1460"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.55" references="/0/closeNS/%/%.2/%/arg0">
- <details key="start" value="1443"/>
- <details key="end" value="1447"/>
+ <details key="start" value="1455"/>
+ <details key="end" value="1459"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.56" references="/0/getGeneralizationVisibility">
- <details key="start" value="1454"/>
- <details key="end" value="1663"/>
+ <details key="start" value="1466"/>
+ <details key="end" value="1675"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.57" references="/0/getGeneralizationVisibility/arg0">
- <details key="start" value="1496"/>
- <details key="end" value="1510"/>
+ <details key="start" value="1508"/>
+ <details key="end" value="1522"/>
<details key="line" value="32"/>
</eAnnotations>
<eAnnotations source="positions.58" references="/0/getGeneralizationVisibility/%">
- <details key="start" value="1524"/>
- <details key="end" value="1660"/>
+ <details key="start" value="1536"/>
+ <details key="end" value="1672"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.59" references="/0/getGeneralizationVisibility/%/self">
@@ -770,23 +770,23 @@
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.60" references="/0/getGeneralizationVisibility/%/%">
- <details key="start" value="1531"/>
- <details key="end" value="1582"/>
+ <details key="start" value="1543"/>
+ <details key="end" value="1594"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.61" references="/0/getGeneralizationVisibility/%/%.1">
- <details key="start" value="1584"/>
- <details key="end" value="1643"/>
+ <details key="start" value="1596"/>
+ <details key="end" value="1655"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.62" references="/0/getGeneralizationVisibility/%/%.2">
- <details key="start" value="1645"/>
- <details key="end" value="1659"/>
+ <details key="start" value="1657"/>
+ <details key="end" value="1671"/>
<details key="line" value="0"/>
</eAnnotations>
<eAnnotations source="positions.63" references="/0/getGeneralizationVisibility/%/%.2/%/arg0">
- <details key="start" value="1654"/>
- <details key="end" value="1658"/>
+ <details key="start" value="1666"/>
+ <details key="end" value="1670"/>
<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/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 0b74e6c3570..25d9a99082d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.cpp.codegen.utils;
import java.util.Iterator;
+import org.eclipse.papyrus.C_Cpp.ExternLibrary;
import org.eclipse.papyrus.C_Cpp.External;
import org.eclipse.papyrus.C_Cpp.NoCodeGen;
import org.eclipse.papyrus.C_Cpp.Typedef;
@@ -46,6 +47,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
*/
public class CppGenUtils {
+ public static final String ANSI_C_LIB = "AnsiCLibrary"; //$NON-NLS-1$
+
/**
* Return a list of template parameters without type
*
@@ -122,9 +125,12 @@ public class CppGenUtils {
if(owner instanceof Package) {
owningPkgName = ((Package)owner).getName();
}
- if((GenUtils.hasStereotype(ne, External.class)) || (GenUtils.hasStereotype(ne, NoCodeGen.class))) {
+ if( GenUtils.hasStereotype(ne, External.class) ||
+ GenUtils.hasStereotypeTree(ne, NoCodeGen.class) ||
+ GenUtils.hasStereotypeTree(ne, ExternLibrary.class)) {
return ne.getName();
- } else if(owningPkgName.equals("AnsiCLibrary")) { //$NON-NLS-1$
+ }
+ else if(owningPkgName.equals(ANSI_C_LIB)) {
// always use the short name for types within the ANSI C library
return ne.getName();
}

Back to the top