diff options
Diffstat (limited to 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz')
7 files changed, 402 insertions, 191 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 a200248b23e..58ed22dd9a5 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 @@ -5,23 +5,82 @@ <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML#/"/> </input> <imports href="../CppAttribute.emtl#/0"/> + <ownedModuleElement xsi:type="mtl:Query" name="getOwnedAttributes" visibility="Public" type="/3/Sequence(Property)"> + <parameter name="cl"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + </parameter> + <expression xsi:type="ocl.ecore:IfExp"> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + <condition 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/getOwnedAttributes/cl"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + </source> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Class"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/> + </condition> + <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)"> + <source xsi:type="ocl.ecore:OperationCallExp"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + <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"/> + </source> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Class"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + </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:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/> + </thenExpression> + <elseExpression xsi:type="ocl.ecore:IfExp"> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + <condition 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/getOwnedAttributes/cl"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + </source> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/DataType"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/> + </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/> + </condition> + <thenExpression xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Property)"> + <source xsi:type="ocl.ecore:OperationCallExp"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/> + <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"/> + </source> + <argument xsi:type="ocl.ecore:TypeExp" eType="/5/DataType"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/> + </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:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType/ownedAttribute"/> + </thenExpression> + <elseExpression xsi:type="ocl.ecore:NullLiteralExp"> + <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/> + </elseExpression> + </elseExpression> + </expression> + </ownedModuleElement> <ownedModuleElement xsi:type="mtl:Template" name="CppClassAttributesDeclaration" visibility="Public"> <body xsi:type="mtl:ForBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
	"/> <body xsi:type="mtl:TemplateInvocation"> <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"> + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/13"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> - <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Set(Property)"> - <source xsi:type="ocl.ecore:PropertyCallExp" eType="/6/Set(Property)"> - <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7"> + <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/3/Sequence(Property)"> + <source xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Property)" definition="/0/getOwnedAttributes"> + <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#//Classifier"/> - </source> - <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/> + </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"/> @@ -70,6 +129,15 @@ <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </eAnnotations> + <eOperations name="getOwnedAttributes" eType="/3/Sequence(Property)"> + <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> + <contents xsi:type="ocl.ecore:Constraint"/> + </eAnnotations> + <eAnnotations source="MTL" references="/0/getOwnedAttributes"/> + <eParameters name="cl"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> + </eParameters> + </eOperations> <eOperations name="CppClassAttributesDeclaration"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> @@ -130,6 +198,31 @@ <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> + <ecore:EPackage name="collections"> + <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Property)" instanceClassName="java.util.List"> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/> + </eClassifiers> + <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Property)" instanceClassName="java.util.LinkedHashSet"> + <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.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"/> + </ocl.ecore:Variable> + <ecore:EPackage name="types"> + <eClassifiers xsi:type="ocl.ecore:TypeType" name="Class"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/> + </eClassifiers> + <eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/> + </eClassifiers> + </ecore:EPackage> + <ocl.ecore:Variable name="self"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.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"/> </ocl.ecore:Variable> @@ -139,11 +232,6 @@ <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </ocl.ecore:Variable> - <ecore:EPackage name="collections"> - <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Property)" instanceClassName="java.util.Set"> - <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.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"/> </ocl.ecore:Variable> @@ -163,85 +251,180 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/> </ocl.ecore:Variable> <ecore:EAnnotation source="positions"> - <eAnnotations source="positions.0" references="/0/CppClassAttributesDeclaration"> - <details key="start" value="159"/> - <details key="end" value="368"/> - <details key="line" value="6"/> + <eAnnotations source="positions.0" references="/0/getOwnedAttributes"> + <details key="start" value="158"/> + <details key="end" value="411"/> + <details key="line" value="5"/> + </eAnnotations> + <eAnnotations source="positions.1" references="/0/getOwnedAttributes/cl"> + <details key="start" value="191"/> + <details key="end" value="206"/> + <details key="line" value="5"/> + </eAnnotations> + <eAnnotations source="positions.2" references="/0/getOwnedAttributes/%"> + <details key="start" value="232"/> + <details key="end" value="408"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.3" references="/0/getOwnedAttributes/%/%"> + <details key="start" value="235"/> + <details key="end" value="258"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.4" references="/0/getOwnedAttributes/%/%/cl"> + <details key="start" value="236"/> + <details key="end" value="238"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.5" references="/0/getOwnedAttributes/%/%/%"> + <details key="start" value="251"/> + <details key="end" value="256"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.6" references="/0/getOwnedAttributes/%/%.1"> + <details key="start" value="266"/> + <details key="end" value="297"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.7" references="/0/getOwnedAttributes/%/%.1/%"> + <details key="start" value="266"/> + <details key="end" value="282"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.8" references="/0/getOwnedAttributes/%/%.1/%/self"> + <details key="start" value="-1"/> + <details key="end" value="-1"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.9" references="/0/getOwnedAttributes/%/%.1/%/%"> + <details key="start" value="276"/> + <details key="end" value="281"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.10" references="/0/getOwnedAttributes/%/%.2"> + <details key="start" value="306"/> + <details key="end" value="401"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.11" references="/0/getOwnedAttributes/%/%.2/%"> + <details key="start" value="309"/> + <details key="end" value="335"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.12" references="/0/getOwnedAttributes/%/%.2/%/cl"> + <details key="start" value="310"/> + <details key="end" value="312"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.13" references="/0/getOwnedAttributes/%/%.2/%/%"> + <details key="start" value="325"/> + <details key="end" value="333"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.14" references="/0/getOwnedAttributes/%/%.2/%.1"> + <details key="start" value="344"/> + <details key="end" value="378"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.15" references="/0/getOwnedAttributes/%/%.2/%.1/%"> + <details key="start" value="344"/> + <details key="end" value="363"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.16" references="/0/getOwnedAttributes/%/%.2/%.1/%/self"> + <details key="start" value="-1"/> + <details key="end" value="-1"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.17" references="/0/getOwnedAttributes/%/%.2/%.1/%/%"> + <details key="start" value="354"/> + <details key="end" value="362"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.18" references="/0/getOwnedAttributes/%/%.2/%.2"> + <details key="start" value="389"/> + <details key="end" value="393"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.19" references="/0/CppClassAttributesDeclaration"> + <details key="start" value="413"/> + <details key="end" value="633"/> + <details key="line" value="17"/> </eAnnotations> - <eAnnotations source="positions.1" references="/0/CppClassAttributesDeclaration/%"> - <details key="start" value="262"/> - <details key="end" value="356"/> - <details key="line" value="7"/> + <eAnnotations source="positions.20" references="/0/CppClassAttributesDeclaration/%"> + <details key="start" value="516"/> + <details key="end" value="621"/> + <details key="line" value="18"/> </eAnnotations> - <eAnnotations source="positions.2" references="/0/CppClassAttributesDeclaration/%/%"> - <details key="start" value="319"/> - <details key="end" value="321"/> - <details key="line" value="8"/> + <eAnnotations source="positions.21" references="/0/CppClassAttributesDeclaration/%/%"> + <details key="start" value="584"/> + <details key="end" value="586"/> + <details key="line" value="19"/> </eAnnotations> - <eAnnotations source="positions.3" references="/0/CppClassAttributesDeclaration/%/%.1"> - <details key="start" value="322"/> - <details key="end" value="347"/> + <eAnnotations source="positions.22" references="/0/CppClassAttributesDeclaration/%/%.1"> + <details key="start" value="587"/> + <details key="end" value="612"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.4" references="/0/CppClassAttributesDeclaration/%/%.1/self"> + <eAnnotations source="positions.23" references="/0/CppClassAttributesDeclaration/%/%.1/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.5" references="/0/CppClassAttributesDeclaration/%/%.2"> - <details key="start" value="349"/> - <details key="end" value="350"/> - <details key="line" value="10"/> + <eAnnotations source="positions.24" references="/0/CppClassAttributesDeclaration/%/%.2"> + <details key="start" value="614"/> + <details key="end" value="615"/> + <details key="line" value="21"/> </eAnnotations> - <eAnnotations source="positions.6" references="/0/CppClassAttributesDeclaration/%/select"> - <details key="start" value="268"/> - <details key="end" value="316"/> + <eAnnotations source="positions.25" references="/0/CppClassAttributesDeclaration/%/select"> + <details key="start" value="522"/> + <details key="end" value="581"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.7" references="/0/CppClassAttributesDeclaration/%/select/%"> - <details key="start" value="268"/> - <details key="end" value="277"/> + <eAnnotations source="positions.26" references="/0/CppClassAttributesDeclaration/%/select/%"> + <details key="start" value="522"/> + <details key="end" value="542"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.8" references="/0/CppClassAttributesDeclaration/%/select/%/self"> + <eAnnotations source="positions.27" references="/0/CppClassAttributesDeclaration/%/select/%/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.9" references="/0/CppClassAttributesDeclaration/%/select/%.1"> - <details key="start" value="286"/> - <details key="end" value="315"/> + <eAnnotations source="positions.28" references="/0/CppClassAttributesDeclaration/%/select/%.1"> + <details key="start" value="551"/> + <details key="end" value="580"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.10" references="/0/CppClassAttributesDeclaration/%/select/%.1/%"> - <details key="start" value="286"/> - <details key="end" value="296"/> + <eAnnotations source="positions.29" references="/0/CppClassAttributesDeclaration/%/select/%.1/%"> + <details key="start" value="551"/> + <details key="end" value="561"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.11" references="/0/CppClassAttributesDeclaration/%/select/%.1/%/temp1"> + <eAnnotations source="positions.30" references="/0/CppClassAttributesDeclaration/%/select/%.1/%/temp1"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.12" references="/0/CppClassAttributesDeclaration/%/select/%.1/visibilityFilter"> - <details key="start" value="299"/> - <details key="end" value="315"/> + <eAnnotations source="positions.31" references="/0/CppClassAttributesDeclaration/%/select/%.1/visibilityFilter"> + <details key="start" value="564"/> + <details key="end" value="580"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.13" references="/0/CppClassAttributesDeclaration/%/select/temp1"> + <eAnnotations source="positions.32" references="/0/CppClassAttributesDeclaration/%/select/temp1"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.14" references="/0/CppClassAttributesDeclaration/class"> - <details key="start" value="206"/> - <details key="end" value="224"/> - <details key="line" value="6"/> + <eAnnotations source="positions.33" references="/0/CppClassAttributesDeclaration/class"> + <details key="start" value="460"/> + <details key="end" value="478"/> + <details key="line" value="17"/> </eAnnotations> - <eAnnotations source="positions.15" references="/0/CppClassAttributesDeclaration/visibilityFilter"> - <details key="start" value="226"/> - <details key="end" value="259"/> - <details key="line" value="6"/> + <eAnnotations source="positions.34" references="/0/CppClassAttributesDeclaration/visibilityFilter"> + <details key="start" value="480"/> + <details key="end" value="513"/> + <details key="line" value="17"/> </eAnnotations> </ecore:EAnnotation> </xmi:XMI> 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 7ff3bd720e9..f4ad914778a 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 @@ -2,9 +2,20 @@ [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppAttribute/] +[query public getOwnedAttributes(cl : Classifier) : Sequence(Property) = + if (cl.oclIsKindOf(Class)) then + oclAsType(Class).ownedAttribute + else + if (cl.oclIsKindOf(DataType)) then + oclAsType(DataType).ownedAttribute + else + null + endif + endif +/] [template public CppClassAttributesDeclaration(class : Classifier, visibilityFilter : VisibilityKind)] -[for (attribute->select(visibility = visibilityFilter))] +[for (getOwnedAttributes()->select(visibility = visibilityFilter))] [CppAttributeDeclaration()/] [/for] 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 050bd67f409..8e0bb41bdfb 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 @@ -16,12 +16,12 @@ </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> - <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Set(Operation)"> - <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Set(Operation)"> - <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7"> + <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(Operation)"> + <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"/> - </source> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/getOperations"/> + </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"/> @@ -147,6 +147,18 @@ <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/> </eParameters> </eOperations> + <eOperations name="getOwnedOperations"> + <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> + <contents xsi:type="ocl.ecore:Constraint"/> + </eAnnotations> + <eAnnotations source="MTL"> + <references href="../operation/CppOperations.emtl#/0/getOwnedOperations"/> + </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"/> + </eParameters> + </eOperations> <eOperations name="CppOperationDeclaration"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> @@ -231,7 +243,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> - <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Operation)" instanceClassName="java.util.Set"> + <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"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> @@ -285,22 +297,22 @@ <ecore:EAnnotation source="positions"> <eAnnotations source="positions.0" references="/0/CppClassOperationsDeclaration"> <details key="start" value="170"/> - <details key="end" value="625"/> + <details key="end" value="630"/> <details key="line" value="5"/> </eAnnotations> <eAnnotations source="positions.1" references="/0/CppClassOperationsDeclaration/%"> <details key="start" value="273"/> - <details key="end" value="374"/> + <details key="end" value="379"/> <details key="line" value="6"/> </eAnnotations> <eAnnotations source="positions.2" references="/0/CppClassOperationsDeclaration/%/%"> - <details key="start" value="336"/> - <details key="end" value="339"/> + <details key="start" value="341"/> + <details key="end" value="344"/> <details key="line" value="7"/> </eAnnotations> <eAnnotations source="positions.3" references="/0/CppClassOperationsDeclaration/%/%.1"> - <details key="start" value="340"/> - <details key="end" value="365"/> + <details key="start" value="345"/> + <details key="end" value="370"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.4" references="/0/CppClassOperationsDeclaration/%/%.1/self"> @@ -309,18 +321,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.5" references="/0/CppClassOperationsDeclaration/%/%.2"> - <details key="start" value="367"/> - <details key="end" value="368"/> + <details key="start" value="372"/> + <details key="end" value="373"/> <details key="line" value="9"/> </eAnnotations> <eAnnotations source="positions.6" references="/0/CppClassOperationsDeclaration/%/select"> <details key="start" value="279"/> - <details key="end" value="333"/> + <details key="end" value="338"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.7" references="/0/CppClassOperationsDeclaration/%/select/%"> <details key="start" value="279"/> - <details key="end" value="294"/> + <details key="end" value="299"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.8" references="/0/CppClassOperationsDeclaration/%/select/%/self"> @@ -329,13 +341,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.9" references="/0/CppClassOperationsDeclaration/%/select/%.1"> - <details key="start" value="303"/> - <details key="end" value="332"/> + <details key="start" value="308"/> + <details key="end" value="337"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.10" references="/0/CppClassOperationsDeclaration/%/select/%.1/%"> - <details key="start" value="303"/> - <details key="end" value="313"/> + <details key="start" value="308"/> + <details key="end" value="318"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.11" references="/0/CppClassOperationsDeclaration/%/select/%.1/%/temp1"> @@ -344,8 +356,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.12" references="/0/CppClassOperationsDeclaration/%/select/%.1/visibilityFilter"> - <details key="start" value="316"/> - <details key="end" value="332"/> + <details key="start" value="321"/> + <details key="end" value="337"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.13" references="/0/CppClassOperationsDeclaration/%/select/temp1"> @@ -354,23 +366,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.14" references="/0/CppClassOperationsDeclaration/%.1"> - <details key="start" value="375"/> - <details key="end" value="613"/> + <details key="start" value="380"/> + <details key="end" value="618"/> <details key="line" value="10"/> </eAnnotations> <eAnnotations source="positions.15" references="/0/CppClassOperationsDeclaration/%.1/%"> - <details key="start" value="467"/> - <details key="end" value="606"/> + <details key="start" value="472"/> + <details key="end" value="611"/> <details key="line" value="11"/> </eAnnotations> <eAnnotations source="positions.16" references="/0/CppClassOperationsDeclaration/%.1/%/%"> - <details key="start" value="497"/> - <details key="end" value="572"/> + <details key="start" value="502"/> + <details key="end" value="577"/> <details key="line" value="12"/> </eAnnotations> <eAnnotations source="positions.17" references="/0/CppClassOperationsDeclaration/%.1/%/%.1"> - <details key="start" value="573"/> - <details key="end" value="597"/> + <details key="start" value="578"/> + <details key="end" value="602"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.18" references="/0/CppClassOperationsDeclaration/%.1/%/%.1/self"> @@ -379,43 +391,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.19" references="/0/CppClassOperationsDeclaration/%.1/%/%.2"> - <details key="start" value="599"/> - <details key="end" value="600"/> + <details key="start" value="604"/> + <details key="end" value="605"/> <details key="line" value="15"/> </eAnnotations> <eAnnotations source="positions.20" references="/0/CppClassOperationsDeclaration/%.1/%/%.3"> - <details key="start" value="471"/> - <details key="end" value="495"/> + <details key="start" value="476"/> + <details key="end" value="500"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.21" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%"> - <details key="start" value="472"/> - <details key="end" value="487"/> + <details key="start" value="477"/> + <details key="end" value="492"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.22" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%/b"> - <details key="start" value="472"/> - <details key="end" value="473"/> + <details key="start" value="477"/> + <details key="end" value="478"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.23" references="/0/CppClassOperationsDeclaration/%.1/%/%.3/%.1"> - <details key="start" value="490"/> - <details key="end" value="494"/> + <details key="start" value="495"/> + <details key="end" value="499"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.24" references="/0/CppClassOperationsDeclaration/%.1/b"> - <details key="start" value="381"/> - <details key="end" value="393"/> + <details key="start" value="386"/> + <details key="end" value="398"/> <details key="line" value="10"/> </eAnnotations> <eAnnotations source="positions.25" references="/0/CppClassOperationsDeclaration/%.1/select"> - <details key="start" value="396"/> - <details key="end" value="463"/> + <details key="start" value="401"/> + <details key="end" value="468"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.26" references="/0/CppClassOperationsDeclaration/%.1/select/%"> - <details key="start" value="396"/> - <details key="end" value="424"/> + <details key="start" value="401"/> + <details key="end" value="429"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.27" references="/0/CppClassOperationsDeclaration/%.1/select/%/self"> @@ -424,18 +436,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.28" references="/0/CppClassOperationsDeclaration/%.1/select/%/%"> - <details key="start" value="409"/> - <details key="end" value="423"/> + <details key="start" value="414"/> + <details key="end" value="428"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/CppClassOperationsDeclaration/%.1/select/%.1"> - <details key="start" value="433"/> - <details key="end" value="462"/> + <details key="start" value="438"/> + <details key="end" value="467"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.30" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/%"> - <details key="start" value="433"/> - <details key="end" value="443"/> + <details key="start" value="438"/> + <details key="end" value="448"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.31" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/%/temp1"> @@ -444,8 +456,8 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.32" references="/0/CppClassOperationsDeclaration/%.1/select/%.1/visibilityFilter"> - <details key="start" value="446"/> - <details key="end" value="462"/> + <details key="start" value="451"/> + <details key="end" value="467"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.33" references="/0/CppClassOperationsDeclaration/%.1/select/temp2"> 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 a73127c132a..8b410a0f292 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 @@ -3,7 +3,7 @@ [template public CppClassOperationsDeclaration(class : Classifier, visibilityFilter : VisibilityKind)] -[for (getOperations()->select(visibility = visibilityFilter))] +[for (getOwnedOperations()->select(visibility = visibilityFilter))] [CppOperationDeclaration()/] [/for] 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 ce3c9c9a852..35dcf51af03 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 @@ -23,12 +23,12 @@ </argument> </body> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="
"/> - <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Set(Operation)"> - <source xsi:type="ocl.ecore:OperationCallExp" eType="/6/Set(Operation)"> - <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/8"> + <iterSet xsi:type="ocl.ecore:IteratorExp" name="select" eType="/6/Sequence(Operation)"> + <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"/> - </source> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/getOperations"/> + </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"/> @@ -204,6 +204,18 @@ <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> </eParameters> </eOperations> + <eOperations name="getOwnedOperations"> + <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> + <contents xsi:type="ocl.ecore:Constraint"/> + </eAnnotations> + <eAnnotations source="MTL"> + <references href="../operation/CppOperations.emtl#/0/getOwnedOperations"/> + </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"/> + </eParameters> + </eOperations> <eOperations name="CppOperationImplementation"> <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL"> <contents xsi:type="ocl.ecore:Constraint"/> @@ -308,7 +320,7 @@ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/> </ocl.ecore:Variable> <ecore:EPackage name="collections"> - <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Operation)" instanceClassName="java.util.Set"> + <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"/> </eClassifiers> <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List"> @@ -373,22 +385,22 @@ </eAnnotations> <eAnnotations source="positions.1" references="/0/CppClassOperationsImplementation"> <details key="start" value="396"/> - <details key="end" value="924"/> + <details key="end" value="929"/> <details key="line" value="8"/> </eAnnotations> <eAnnotations source="positions.2" references="/0/CppClassOperationsImplementation/%"> <details key="start" value="485"/> - <details key="end" value="653"/> + <details key="end" value="658"/> <details key="line" value="9"/> </eAnnotations> <eAnnotations source="positions.3" references="/0/CppClassOperationsImplementation/%/%"> - <details key="start" value="614"/> - <details key="end" value="615"/> + <details key="start" value="619"/> + <details key="end" value="620"/> <details key="line" value="12"/> </eAnnotations> <eAnnotations source="positions.4" references="/0/CppClassOperationsImplementation/%/%.1"> - <details key="start" value="616"/> - <details key="end" value="644"/> + <details key="start" value="621"/> + <details key="end" value="649"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.5" references="/0/CppClassOperationsImplementation/%/%.1/self"> @@ -397,18 +409,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.6" references="/0/CppClassOperationsImplementation/%/%.2"> - <details key="start" value="646"/> - <details key="end" value="647"/> + <details key="start" value="651"/> + <details key="end" value="652"/> <details key="line" value="14"/> </eAnnotations> <eAnnotations source="positions.7" references="/0/CppClassOperationsImplementation/%/select"> <details key="start" value="491"/> - <details key="end" value="611"/> + <details key="end" value="616"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.8" references="/0/CppClassOperationsImplementation/%/select/%"> <details key="start" value="491"/> - <details key="end" value="506"/> + <details key="end" value="511"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.9" references="/0/CppClassOperationsImplementation/%/select/%/self"> @@ -417,23 +429,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.10" references="/0/CppClassOperationsImplementation/%/select/%.1"> - <details key="start" value="518"/> - <details key="end" value="610"/> + <details key="start" value="523"/> + <details key="end" value="615"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.11" references="/0/CppClassOperationsImplementation/%/select/%.1/%"> - <details key="start" value="518"/> - <details key="end" value="564"/> + <details key="start" value="523"/> + <details key="end" value="569"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.12" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%"> - <details key="start" value="523"/> - <details key="end" value="563"/> + <details key="start" value="528"/> + <details key="end" value="568"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.13" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%"> - <details key="start" value="524"/> - <details key="end" value="548"/> + <details key="start" value="529"/> + <details key="end" value="553"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.14" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%/temp1"> @@ -442,13 +454,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.15" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%/%"> - <details key="start" value="538"/> - <details key="end" value="547"/> + <details key="start" value="543"/> + <details key="end" value="552"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.16" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%.1"> - <details key="start" value="552"/> - <details key="end" value="562"/> + <details key="start" value="557"/> + <details key="end" value="567"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.17" references="/0/CppClassOperationsImplementation/%/select/%.1/%/%/%.1/temp1"> @@ -457,13 +469,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.18" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1"> - <details key="start" value="571"/> - <details key="end" value="610"/> + <details key="start" value="576"/> + <details key="end" value="615"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.19" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%"> - <details key="start" value="572"/> - <details key="end" value="600"/> + <details key="start" value="577"/> + <details key="end" value="605"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.20" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%/temp1"> @@ -472,13 +484,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.21" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/%/%"> - <details key="start" value="586"/> - <details key="end" value="599"/> + <details key="start" value="591"/> + <details key="end" value="604"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.22" references="/0/CppClassOperationsImplementation/%/select/%.1/%.1/inline"> - <details key="start" value="603"/> - <details key="end" value="609"/> + <details key="start" value="608"/> + <details key="end" value="614"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.23" references="/0/CppClassOperationsImplementation/%/select/temp1"> @@ -487,23 +499,23 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.24" references="/0/CppClassOperationsImplementation/%.1"> - <details key="start" value="654"/> - <details key="end" value="912"/> + <details key="start" value="659"/> + <details key="end" value="917"/> <details key="line" value="15"/> </eAnnotations> <eAnnotations source="positions.25" references="/0/CppClassOperationsImplementation/%.1/%"> - <details key="start" value="765"/> - <details key="end" value="905"/> + <details key="start" value="770"/> + <details key="end" value="910"/> <details key="line" value="17"/> </eAnnotations> <eAnnotations source="positions.26" references="/0/CppClassOperationsImplementation/%.1/%/%"> - <details key="start" value="795"/> - <details key="end" value="868"/> + <details key="start" value="800"/> + <details key="end" value="873"/> <details key="line" value="18"/> </eAnnotations> <eAnnotations source="positions.27" references="/0/CppClassOperationsImplementation/%.1/%/%.1"> - <details key="start" value="869"/> - <details key="end" value="896"/> + <details key="start" value="874"/> + <details key="end" value="901"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.28" references="/0/CppClassOperationsImplementation/%.1/%/%.1/self"> @@ -512,43 +524,43 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.29" references="/0/CppClassOperationsImplementation/%.1/%/%.2"> - <details key="start" value="898"/> - <details key="end" value="899"/> + <details key="start" value="903"/> + <details key="end" value="904"/> <details key="line" value="21"/> </eAnnotations> <eAnnotations source="positions.30" references="/0/CppClassOperationsImplementation/%.1/%/%.3"> - <details key="start" value="769"/> - <details key="end" value="793"/> + <details key="start" value="774"/> + <details key="end" value="798"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.31" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%"> - <details key="start" value="770"/> - <details key="end" value="785"/> + <details key="start" value="775"/> + <details key="end" value="790"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.32" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%/b"> - <details key="start" value="770"/> - <details key="end" value="771"/> + <details key="start" value="775"/> + <details key="end" value="776"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.33" references="/0/CppClassOperationsImplementation/%.1/%/%.3/%.1"> - <details key="start" value="788"/> - <details key="end" value="792"/> + <details key="start" value="793"/> + <details key="end" value="797"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.34" references="/0/CppClassOperationsImplementation/%.1/b"> - <details key="start" value="660"/> - <details key="end" value="678"/> + <details key="start" value="665"/> + <details key="end" value="683"/> <details key="line" value="15"/> </eAnnotations> <eAnnotations source="positions.35" references="/0/CppClassOperationsImplementation/%.1/select"> - <details key="start" value="681"/> - <details key="end" value="761"/> + <details key="start" value="686"/> + <details key="end" value="766"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.36" references="/0/CppClassOperationsImplementation/%.1/select/%"> - <details key="start" value="681"/> - <details key="end" value="709"/> + <details key="start" value="686"/> + <details key="end" value="714"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.37" references="/0/CppClassOperationsImplementation/%.1/select/%/self"> @@ -557,18 +569,18 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.38" references="/0/CppClassOperationsImplementation/%.1/select/%/%"> - <details key="start" value="694"/> - <details key="end" value="708"/> + <details key="start" value="699"/> + <details key="end" value="713"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.39" references="/0/CppClassOperationsImplementation/%.1/select/%.1"> - <details key="start" value="721"/> - <details key="end" value="760"/> + <details key="start" value="726"/> + <details key="end" value="765"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.40" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%"> - <details key="start" value="722"/> - <details key="end" value="750"/> + <details key="start" value="727"/> + <details key="end" value="755"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.41" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%/temp1"> @@ -577,13 +589,13 @@ <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.42" references="/0/CppClassOperationsImplementation/%.1/select/%.1/%/%"> - <details key="start" value="736"/> - <details key="end" value="749"/> + <details key="start" value="741"/> + <details key="end" value="754"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.43" references="/0/CppClassOperationsImplementation/%.1/select/%.1/inline"> - <details key="start" value="753"/> - <details key="end" value="759"/> + <details key="start" value="758"/> + <details key="end" value="764"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.44" references="/0/CppClassOperationsImplementation/%.1/select/temp2"> 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 fc54cddb7de..0c3ab27938d 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 @@ -6,7 +6,7 @@ [comment implementations of a classifier, parameter controls whether only inline (or only not inline) operations are produced/] [template public CppClassOperationsImplementation(class : Classifier, inline : Boolean)] -[for (getOperations()->select( +[for (getOwnedOperations()->select( (not (hasStereotype(NoCodeGen) or isAbstract)) and (hasStereotype(C_Cpp::Inline) = inline)))] 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 48d38fca763..3f959ab9cf8 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 @@ -8,14 +8,7 @@ <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/> </input> <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/> -<<<<<<< HEAD -<<<<<<< HEAD -======= <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> ->>>>>>> - [Bug 420376] Generated C++ code is not formatted -======= - <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/> ->>>>>>> refs/heads/Qompass <imports href="../CppPrimitiveTypes.emtl#/0"/> <imports href="../CppEnumerations.emtl#/0"/> <ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public"> |