diff options
| author | Camille Letavernier | 2014-03-06 13:44:33 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2014-03-06 13:44:33 +0000 |
| commit | 149b186212b177b3ae387180e84956fc0dab1fe2 (patch) | |
| tree | 0688947ec368013d8e4c7c78654481eea07bdef4 /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz | |
| parent | f386bb6246811ce320dbf3e1fd2afb707fcf8086 (diff) | |
| download | org.eclipse.papyrus-149b186212b177b3ae387180e84956fc0dab1fe2.tar.gz org.eclipse.papyrus-149b186212b177b3ae387180e84956fc0dab1fe2.tar.xz org.eclipse.papyrus-149b186212b177b3ae387180e84956fc0dab1fe2.zip | |
429744: [UML 2.5] Migrate Papyrus to UML 2.5
https://bugs.eclipse.org/bugs/show_bug.cgi?id=429744
The following URIs have been updated in all Papyrus extra plug-ins:
- http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2
-> http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard
- http://www.eclipse.org/uml2/4.0.0/UML
-> http://www.eclipse.org/uml2/5.0.0/UML
- http://www.eclipse.org/uml2/4.0.0/Types
-> http://www.eclipse.org/uml2/5.0.0/Types
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz')
16 files changed, 455 insertions, 455 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl index 9160967d3ce..cc99b6c77b0 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.emtl @@ -2,7 +2,7 @@ <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="CppClassAttributesDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassAttributesDeclaration" endHeaderPosition="78"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <imports href="../CppAttribute.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Template" name="CppClassAttributesDeclaration" visibility="Public"> @@ -12,7 +12,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../CppAttribute.emtl#/0/CppAttributeDeclaration"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -20,33 +20,33 @@ <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Property)"> <definition href="../CppAttribute.emtl#/0/getOwnedAttributes"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </source> <body xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassAttributesDeclaration/%/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/> </source> <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassAttributesDeclaration/visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </iterator> </iterSet> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> <parameter name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -77,10 +77,10 @@ <eAnnotations source="MTL" references="/0/CppClassAttributesDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> <eParameters name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eParameters> </eOperations> <eOperations name="CppAttributeDeclaration"> @@ -92,7 +92,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="attribute"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </eParameters> </eOperations> <eOperations name="getOwnedAttributes"> @@ -104,7 +104,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="../CppAttribute.emtl#/3/Sequence(Property)"/> <eParameters name="cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> </eClassifiers> @@ -130,12 +130,12 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Property_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -143,30 +143,30 @@ <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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Property)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl index a0fa5f1eab5..bb217ae9c3a 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassAttributesDeclaration.mtl @@ -1,4 +1,4 @@ -[module CppClassAttributesDeclaration('http://www.eclipse.org/uml2/4.0.0/UML')/] +[module CppClassAttributesDeclaration('http://www.eclipse.org/uml2/5.0.0/UML')/] [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/] 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 d97b19eb266..f500b4d11f5 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 @@ -2,7 +2,7 @@ <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="CppClassFriendDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassFriendDeclaration" endHeaderPosition="116"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -15,12 +15,12 @@ <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/cppQualifiedName"/> <argument xsi:type="ocl.ecore:VariableExp" name="friend" referredVariable="/0/CppClassFriendDeclaration/friend"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";"/> <parameter name="friend"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeFriendDeclaration" visibility="Public"> @@ -30,7 +30,7 @@ <body xsi:type="mtl:TemplateInvocation" definition="/0/CppClassFriendDeclaration"> <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="/16"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -40,7 +40,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/14/Friend"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Friend"/> @@ -52,7 +52,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/14/NoCodeGen"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/> @@ -66,12 +66,12 @@ <iterSet xsi:type="mtl:QueryInvocation" eType="/11/Sequence(Classifier)"> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getUsedClassifiers"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </iterSet> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -102,7 +102,7 @@ <eAnnotations source="MTL" references="/0/CppClassFriendDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="friend"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppClassIncludeFriendDeclaration"> @@ -112,7 +112,7 @@ <eAnnotations source="MTL" references="/0/CppClassIncludeFriendDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="getUsedClassifiers"> @@ -124,7 +124,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Sequence(Classifier)"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="hasStereotype"> @@ -136,7 +136,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -151,7 +151,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> </eClassifiers> @@ -177,57 +177,57 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -235,39 +235,39 @@ <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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="types"> <eClassifiers xsi:type="ocl.ecore:TypeType" name="Friend"> @@ -278,13 +278,13 @@ </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl index 943a3f3131f..362e4924037 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.mtl @@ -1,4 +1,4 @@ -[module CppClassFriendDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassFriendDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/] 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 616afb82cc8..b83c5c5d3fd 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 @@ -2,7 +2,7 @@ <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="CppClassIncludeClassDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeClassDeclaration" endHeaderPosition="122"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -19,7 +19,7 @@ <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/openNS"/> <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#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -29,7 +29,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Template"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/> @@ -40,20 +40,20 @@ <body xsi:type="ocl.ecore:PropertyCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <source 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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";
"/> <body xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../utils/CppGenUtils.emtl#/0/closeNS"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </argument> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppOwnerPackageIncludeDeclaration" visibility="Public"> @@ -63,16 +63,16 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/> <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#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/Pkg_"/> <body xsi:type="ocl.ecore:PropertyCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <source xsi:type="ocl.ecore:VariableExp" name="pkg" referredVariable="/0/CppOwnerPackageIncludeDeclaration/pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".h>
"/> <ifExpr xsi:type="ocl.ecore:OperationCallExp"> @@ -80,7 +80,7 @@ <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:VariableExp" name="pkg" referredVariable="/0/CppOwnerPackageIncludeDeclaration/pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </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"/> @@ -93,7 +93,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/8/CppRoot"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppRoot"/> @@ -105,41 +105,41 @@ </ifExpr> </body> <parameter name="pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassAllIncludesDeclaration" visibility="Public"> <body xsi:type="mtl:TemplateInvocation" definition="/0/CppClassAllIncludesDeclaration.1"> <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="/23"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)"> <definition href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </argument> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassAllIncludesDeclarationBody" visibility="Public"> <body xsi:type="mtl:TemplateInvocation" definition="/0/CppClassAllIncludesDeclaration.1"> <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="/28"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)"> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getTypesViaDependencies"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </argument> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassAllIncludesDeclaration" visibility="Public"> @@ -150,16 +150,16 @@ <body xsi:type="mtl:TemplateInvocation" definition="/0/CppOwnerPackageIncludeDeclaration"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/> </source> <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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </argument> @@ -170,11 +170,11 @@ <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/> </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"/> @@ -184,14 +184,14 @@ <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/owner"/> </source> <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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </argument> @@ -203,20 +203,20 @@ <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> <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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </source> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> <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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </argument> @@ -227,7 +227,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="CppClassIncludeDeclaration.emtl#/0/CppClassIncludeDeclaration"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -240,10 +240,10 @@ <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> <argument xsi:type="ocl.ecore:VariableExp" name="class" referredVariable="/0/CppClassAllIncludesDeclaration.1/class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/> </source> @@ -253,7 +253,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/8/NoCodeGen"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/> @@ -267,7 +267,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/8/External"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/> @@ -277,12 +277,12 @@ </ifExpr> </body> <loopVariable name="cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </loopVariable> <iterSet xsi:type="ocl.ecore:VariableExp" name="list" eType="/3/Sequence(Classifier)" referredVariable="/0/CppClassAllIncludesDeclaration.1/list"/> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> <parameter name="list" eType="/3/Sequence(Classifier)"/> </ownedModuleElement> @@ -314,7 +314,7 @@ <eAnnotations source="MTL" references="/0/CppClassIncludeClassDeclarationTemplate"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eParameters> </eOperations> <eOperations name="CppOwnerPackageIncludeDeclaration"> @@ -324,7 +324,7 @@ <eAnnotations source="MTL" references="/0/CppOwnerPackageIncludeDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eParameters> </eOperations> <eOperations name="CppClassAllIncludesDeclaration"> @@ -334,7 +334,7 @@ <eAnnotations source="MTL" references="/0/CppClassAllIncludesDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppClassAllIncludesDeclarationBody"> @@ -344,7 +344,7 @@ <eAnnotations source="MTL" references="/0/CppClassAllIncludesDeclarationBody"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppClassAllIncludesDeclaration"> @@ -354,7 +354,7 @@ <eAnnotations source="MTL" references="/0/CppClassAllIncludesDeclaration.1"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> <eParameters name="list" eType="/3/Sequence(Classifier)"/> </eOperations> @@ -367,7 +367,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/3/Sequence(Classifier)"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="getFullPath"> @@ -379,7 +379,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eParameters> </eOperations> <eOperations name="hasStereotype"> @@ -391,7 +391,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -406,7 +406,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> <eOperations name="closeNS"> @@ -418,7 +418,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> <eOperations name="includedClassifiers"> @@ -430,7 +430,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="../../../utils/ClassUtils.emtl#/3/Sequence(Classifier)"/> <eParameters name="cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppClassIncludeDeclaration"> @@ -442,7 +442,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> </eClassifiers> @@ -468,57 +468,57 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -527,20 +527,20 @@ </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Classifier)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </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#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </ocl.ecore:Variable> <ecore:EPackage name="types"> <eClassifiers xsi:type="ocl.ecore:TypeType" name="Template"> @@ -556,110 +556,110 @@ <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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </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/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </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#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> 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 0cf24ac0874..e1bffe7854d 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 @@ -1,4 +1,4 @@ -[module CppClassIncludeClassDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassIncludeClassDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/] [import org::eclipse::papyrus::cpp::codegen::utils::ClassUtils/] 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 706b27a273b..8431c80f360 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 @@ -2,7 +2,7 @@ <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="CppClassIncludeDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassIncludeDeclaration" endHeaderPosition="117"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -11,7 +11,7 @@ <imports href="../../../preferences/CppCodeGenUtils.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Query" name="includeName" visibility="Public"> <parameter name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </parameter> <expression xsi:type="ocl.ecore:IfExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -19,7 +19,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/4/Template"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/> @@ -33,7 +33,7 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/4/Template"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/> @@ -52,7 +52,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/4/External"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/> @@ -66,7 +66,7 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/4/External"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/> @@ -91,11 +91,11 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullPath"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </source> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/getNearestPackage"/> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getNearestPackage"/> </argument> </source> <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/"> @@ -106,9 +106,9 @@ <argument xsi:type="ocl.ecore:PropertyCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <source xsi:type="ocl.ecore:VariableExp" name="ne" referredVariable="/0/includeName/ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/> </source> @@ -121,7 +121,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/+"/> @@ -151,7 +151,7 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -169,7 +169,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -180,14 +180,14 @@ <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=">
"/> </else> </body> <parameter name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -218,7 +218,7 @@ <eAnnotations source="MTL" references="/0/includeName"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> <eOperations name="CppClassIncludeDeclaration"> @@ -228,7 +228,7 @@ <eAnnotations source="MTL" references="/0/CppClassIncludeDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> <eOperations name="getFullPath"> @@ -240,7 +240,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eParameters> </eOperations> <eOperations name="hasStereotype"> @@ -252,7 +252,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -267,7 +267,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -282,7 +282,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -297,7 +297,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -335,47 +335,47 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -383,7 +383,7 @@ <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/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </ocl.ecore:Variable> <ecore:EPackage name="types"> <eClassifiers xsi:type="ocl.ecore:TypeType" name="Template"> @@ -397,22 +397,22 @@ </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(String)" instanceClassName="java.util.Set"> @@ -420,7 +420,7 @@ </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -429,13 +429,13 @@ <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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> 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 7937e1a6bf5..7845223ccba 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 @@ -1,4 +1,4 @@ -[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassIncludeDeclaration('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::preferences::CppCodeGenUtils/] 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 0dbc6af346a..b5552177c0b 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 @@ -2,7 +2,7 @@ <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="CppClassInheritedDeclarations" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassInheritedDeclarations" endHeaderPosition="120"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -14,14 +14,14 @@ </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Query" name="filteredRelationships" visibility="Public" type="/3/Set(DirectedRelationship)"> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> <expression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/3/Set(DirectedRelationship)"> <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(DirectedRelationship)"> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/getSourceDirectedRelationships"/> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/getSourceDirectedRelationships"/> </source> <body xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> @@ -30,20 +30,20 @@ <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Generalization"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Generalization"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/> </source> <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/5/InterfaceRealization"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InterfaceRealization"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/> </argument> @@ -55,13 +55,13 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Sequence(Element)"> <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Element)"> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/filteredRelationships/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship/target"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/> </source> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/> </source> @@ -76,13 +76,13 @@ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </iterator> </expression> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Query" name="getCppVisibility" visibility="Public"> <parameter name="relationship"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </parameter> <expression xsi:type="ocl.ecore:IfExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -90,7 +90,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Visibility"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/> @@ -104,7 +104,7 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Visibility"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/> @@ -132,7 +132,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/> <source xsi:type="mtl:QueryInvocation" eType="/3/Set(DirectedRelationship)" definition="/0/filteredRelationships"> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </source> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/size"/> @@ -149,7 +149,7 @@ <body xsi:type="mtl:QueryInvocation" definition="/0/getCppVisibility"> <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="/18"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/> @@ -157,29 +157,29 @@ <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/cppQualifiedName"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> <source xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Sequence(Element)"> <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Element)"> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship/target"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship/target"/> </source> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/asSequence"/> </source> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)_Class/first"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Classifier"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </argument> </body> <iterSet xsi:type="mtl:QueryInvocation" eType="/3/Set(DirectedRelationship)" definition="/0/filteredRelationships"> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </iterSet> <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", 
"> @@ -187,7 +187,7 @@ </each> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -217,7 +217,7 @@ </eAnnotations> <eAnnotations source="MTL" references="/0/filteredRelationships"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="getCppVisibility"> @@ -227,7 +227,7 @@ <eAnnotations source="MTL" references="/0/getCppVisibility"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="relationship"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </eParameters> </eOperations> <eOperations name="CppClassInheritedDeclarations"> @@ -237,7 +237,7 @@ <eAnnotations source="MTL" references="/0/CppClassInheritedDeclarations"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="hasStereotype"> @@ -249,7 +249,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -264,7 +264,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -279,7 +279,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eParameters> </eOperations> </eClassifiers> @@ -305,62 +305,62 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Relationship_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -369,24 +369,24 @@ </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(DirectedRelationship)" instanceClassName="java.util.Set"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Element)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="types"> <eClassifiers xsi:type="ocl.ecore:TypeType" name="Generalization"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Generalization"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Generalization"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:TypeType" name="InterfaceRealization"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//InterfaceRealization"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//InterfaceRealization"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:TypeType" name="NoCodeGen"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/> @@ -395,53 +395,53 @@ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:TypeType" name="Classifier"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Relationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Relationship"/> </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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DirectedRelationship"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//DirectedRelationship"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl index f23c427aef4..66a0c4d223d 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.mtl @@ -1,4 +1,4 @@ -[module CppClassInheritedDeclarations('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassInheritedDeclarations('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/] diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl index 8e0bb41bdfb..482c027da43 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.emtl @@ -2,7 +2,7 @@ <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="CppClassOperationsDeclaration" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsDeclaration" endHeaderPosition="78"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <imports href="../operation/CppOperations.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Template" name="CppClassOperationsDeclaration" visibility="Public"> @@ -12,7 +12,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../operation/CppOperations.emtl#/0/CppOperationDeclaration"/> <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -20,25 +20,25 @@ <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Operation)"> <definition href="../operation/CppOperations.emtl#/0/getOwnedOperations"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </source> <body xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsDeclaration/%/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/> </source> <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassOperationsDeclaration/visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </iterator> </iterSet> </body> @@ -49,18 +49,18 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../operation/CppOperations.emtl#/0/CppBehaviorDeclaration"/> <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#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> <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"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/> <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/CppClassOperationsDeclaration/%.1/b"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior/specification"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/> </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"/> @@ -69,41 +69,41 @@ </ifExpr> </body> <loopVariable name="b"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </loopVariable> <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(OpaqueBehavior)"> <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Sequence(OpaqueBehavior)" referredOperation="/1/EObject_Class/eAllContents"> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/12/OpaqueBehavior"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </argument> </source> <body xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsDeclaration/%.1/select/temp2"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/> </source> <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/CppClassOperationsDeclaration/visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp2"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </iterator> </iterSet> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> <parameter name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -141,10 +141,10 @@ <eAnnotations source="MTL" references="/0/CppClassOperationsDeclaration"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> <eParameters name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eParameters> </eOperations> <eOperations name="getOwnedOperations"> @@ -156,7 +156,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="../operation/CppOperations.emtl#/3/Sequence(Operation)"/> <eParameters name="cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppOperationDeclaration"> @@ -168,7 +168,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="operation"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eParameters> </eOperations> <eOperations name="CppBehaviorDeclaration"> @@ -180,7 +180,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="behavior"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eParameters> </eOperations> </eClassifiers> @@ -206,27 +206,27 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -234,59 +234,59 @@ <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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OpaqueBehavior)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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> <ecore:EPackage name="types"> <eClassifiers xsi:type="ocl.ecore:TypeType" name="OpaqueBehavior"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl index 8b410a0f292..513dd1ed446 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsDeclaration.mtl @@ -1,4 +1,4 @@ -[module CppClassOperationsDeclaration('http://www.eclipse.org/uml2/4.0.0/UML')/] +[module CppClassOperationsDeclaration('http://www.eclipse.org/uml2/5.0.0/UML')/] [import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/] 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 35dcf51af03..d81f2c6d816 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 @@ -2,7 +2,7 @@ <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="CppClassOperationsImplementation" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation" endHeaderPosition="123"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -19,7 +19,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../operation/CppOperations.emtl#/0/CppOperationImplementation"/> <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#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> @@ -27,7 +27,7 @@ <source xsi:type="mtl:QueryInvocation" eType="/6/Sequence(Operation)"> <definition href="../operation/CppOperations.emtl#/0/getOwnedOperations"/> <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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> </source> <body xsi:type="ocl.ecore:OperationCallExp"> @@ -40,7 +40,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/NoCodeGen"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/> @@ -49,9 +49,9 @@ <argument xsi:type="ocl.ecore:PropertyCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature/isAbstract"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature/isAbstract"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/> </source> @@ -63,7 +63,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%/select/temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Inline"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/> @@ -77,7 +77,7 @@ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp1"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </iterator> </iterSet> </body> @@ -88,18 +88,18 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../operation/CppOperations.emtl#/0/CppBehaviorImplementation"/> <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#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> <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"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//BehavioralFeature"/> <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/CppClassOperationsImplementation/%.1/b"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior/specification"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior/specification"/> </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"/> @@ -108,15 +108,15 @@ </ifExpr> </body> <loopVariable name="b"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </loopVariable> <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(OpaqueBehavior)"> <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Sequence(OpaqueBehavior)" referredOperation="/1/EObject_Class/eAllContents"> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/OpaqueBehavior"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </argument> </source> <body xsi:type="ocl.ecore:OperationCallExp"> @@ -125,7 +125,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppClassOperationsImplementation/%.1/select/temp2"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Inline"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/> @@ -137,12 +137,12 @@ <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/> </body> <iterator xsi:type="ocl.ecore:Variable" name="temp2"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </iterator> </iterSet> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> <parameter name="inline"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> @@ -183,7 +183,7 @@ <eAnnotations source="MTL" references="/0/CppClassOperationsImplementation"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> <eParameters name="inline"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> @@ -198,7 +198,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -213,7 +213,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:SequenceType" href="../operation/CppOperations.emtl#/3/Sequence(Operation)"/> <eParameters name="cl"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppOperationImplementation"> @@ -225,7 +225,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="operation"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eParameters> </eOperations> <eOperations name="CppBehaviorImplementation"> @@ -237,7 +237,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="behavior"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eParameters> </eOperations> </eClassifiers> @@ -263,47 +263,47 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -311,23 +311,23 @@ <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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OpaqueBehavior)" instanceClassName="java.util.List"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eClassifiers> </ecore:EPackage> <ecore:EPackage name="types"> @@ -338,38 +338,38 @@ <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Inline"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:TypeType" name="OpaqueBehavior"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl index 0c3ab27938d..33716ef6e61 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassOperationsImplementation.mtl @@ -1,4 +1,4 @@ -[module CppClassOperationsImplementation('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassOperationsImplementation('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/] 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 bdf0e257ca7..1b7e59c0a31 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 @@ -2,7 +2,7 @@ <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="CppClassTypeAndEnum" nsURI="org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassTypeAndEnum" endHeaderPosition="110"> <input> - <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> + <takesTypesFrom href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> </input> <input> <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> @@ -18,12 +18,12 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../CppEnumerations.emtl#/0/CppEnumerationDefinition"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/9"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Enumeration"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </argument> @@ -31,10 +31,10 @@ <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"/> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Enumeration"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </ifExpr> @@ -45,12 +45,12 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <definition href="../CppPrimitiveTypes.emtl#/0/CppPrimitiveTypeDefinition"/> <argument xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/PrimitiveType"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </argument> @@ -58,10 +58,10 @@ <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"/> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/PrimitiveType"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> </ifExpr> @@ -77,7 +77,7 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/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#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </argument> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/NoCodeGen"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//NoCodeGen"/> @@ -88,10 +88,10 @@ <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <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#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Classifier"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/> </argument> @@ -100,21 +100,21 @@ <argument xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> <source xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> <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#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Classifier"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//NamedElement/visibility"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/visibility"/> </source> <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/TypeAndEnumForVisibility/visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </argument> <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/> </argument> @@ -122,10 +122,10 @@ </ifExpr> </body> <parameter name="element"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </parameter> <parameter name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="TypesAndEnumsForVisibility" visibility="Public"> @@ -133,24 +133,24 @@ <body xsi:type="mtl:TemplateInvocation" definition="/0/TypeAndEnumForVisibility"> <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="/19"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </argument> <argument xsi:type="ocl.ecore:VariableExp" name="visibilityFilter" referredVariable="/0/TypesAndEnumsForVisibility/visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </argument> </body> <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Element)"> <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/> + <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/> </iterSet> </body> <parameter name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </parameter> <parameter name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassTypeAndEnum" visibility="Public"> @@ -159,17 +159,17 @@ <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/getSection"/> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/public"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/> </argument> <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility"> <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="/26"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/public"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/> </argument> </argument> </body> @@ -178,17 +178,17 @@ <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/getSection"/> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/protected"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/> </argument> <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility"> <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="/27"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/protected"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/protected"/> </argument> </argument> </body> @@ -197,48 +197,48 @@ <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/getSection"/> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/private"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/> </argument> <argument xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility"> <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="/28"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </argument> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/private"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/private"/> </argument> </argument> </body> <parameter name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </parameter> </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassTypeAndEnumPackage" visibility="Public"> <body xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility"> <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="/33"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </argument> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/package"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/package"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> <body xsi:type="mtl:TemplateInvocation" definition="/0/TypesAndEnumsForVisibility"> <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="/34"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </argument> <argument xsi:type="ocl.ecore:EnumLiteralExp"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> - <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/public"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> + <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind/public"/> </argument> </body> <parameter name="pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </parameter> </ownedModuleElement> </mtl:Module> @@ -269,10 +269,10 @@ <eAnnotations source="MTL" references="/0/TypeAndEnumForVisibility"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="element"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eParameters> <eParameters name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eParameters> </eOperations> <eOperations name="TypesAndEnumsForVisibility"> @@ -282,10 +282,10 @@ <eAnnotations source="MTL" references="/0/TypesAndEnumsForVisibility"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="ne"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </eParameters> <eParameters name="visibilityFilter"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eParameters> </eOperations> <eOperations name="CppClassTypeAndEnum"> @@ -295,7 +295,7 @@ <eAnnotations source="MTL" references="/0/CppClassTypeAndEnum"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="class"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eParameters> </eOperations> <eOperations name="CppClassTypeAndEnumPackage"> @@ -305,7 +305,7 @@ <eAnnotations source="MTL" references="/0/CppClassTypeAndEnumPackage"/> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="pkg"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eParameters> </eOperations> <eOperations name="hasStereotype"> @@ -317,7 +317,7 @@ </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"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> @@ -332,7 +332,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="arg0"> - <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eParameters> <eParameters name="arg1"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -347,7 +347,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="primitiveType"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eParameters> </eOperations> <eOperations name="CppEnumerationDefinition"> @@ -359,7 +359,7 @@ </eAnnotations> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <eParameters name="enum"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/> </eParameters> </eOperations> </eClassifiers> @@ -385,67 +385,67 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Element_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Namespace_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Classifier_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Package_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Class_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateParameter"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//TemplateParameter"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NamedElement_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Operation_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Operation"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="OpaqueBehavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//OpaqueBehavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Behavior_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Behavior"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//PrimitiveType"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="VisibilityKind_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//VisibilityKind"/> </eAnnotations> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Enumeration_Class"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> - <references href="http://www.eclipse.org/uml2/4.0.0/UML#//Enumeration"/> + <references href="http://www.eclipse.org/uml2/5.0.0/UML#//Enumeration"/> </eAnnotations> </eClassifiers> </ecore:EPackage> @@ -453,71 +453,71 @@ <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/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </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#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ecore:EPackage name="types"> <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="Classifier"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.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"/> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </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/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </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#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Element)" instanceClassName="java.util.Set"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace"/> </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"/> @@ -526,40 +526,40 @@ <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/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Classifier"/> </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/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </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#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> </ocl.ecore:Variable> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl index f46d6e95933..d90230149a4 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.mtl @@ -1,4 +1,4 @@ -[module CppClassTypeAndEnum('http://www.eclipse.org/uml2/4.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] +[module CppClassTypeAndEnum('http://www.eclipse.org/uml2/5.0.0/UML', 'http://www.eclipse.org/papyrus/C_Cpp/1')/] [import org::eclipse::papyrus::acceleo::GenUtils/] [import org::eclipse::papyrus::cpp::codegen::utils::CppGenUtils/] [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppPrimitiveTypes/] |