diff options
35 files changed, 549 insertions, 392 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl index 18f6528dd41..e64f37de6ae 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppIncludeUtils.emtl @@ -69,7 +69,7 @@ <letVariable name="header"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <initExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/> <source xsi:type="mtl:QueryInvocation"> @@ -166,7 +166,7 @@ <letVariable name="_body"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <initExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/> <source xsi:type="mtl:QueryInvocation"> @@ -263,7 +263,7 @@ <letVariable name="preBody"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> <initExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Include"/> <source xsi:type="mtl:QueryInvocation"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl index dbc69c10a84..9e348de6a52 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppEnumerations.emtl @@ -46,7 +46,7 @@ <body xsi:type="mtl:IfBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/> <body xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//Integer"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//CppInit"/> <source xsi:type="mtl:QueryInvocation"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl index f347149afb0..14bdcb4745a 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.emtl @@ -26,26 +26,33 @@ <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typedef "/> <body xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/replaceAll"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:PropertyCallExp"> + <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> - <source xsi:type="mtl:QueryInvocation"> - <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> - <definition href="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/5.0.0/UML#//PrimitiveType"/> - </argument> + <source xsi:type="ocl.ecore:PropertyCallExp"> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> + <source xsi:type="ocl.ecore:OperationCallExp"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> + <source xsi:type="mtl:QueryInvocation"> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + <definition href="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/5.0.0/UML#//PrimitiveType"/> + </argument> + <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> + </argument> + </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> - </argument> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/> + <argument xsi:type="ocl.ecore:TypeExp" eType="/7/String"> + <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </source> <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typeName"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -71,26 +78,33 @@ <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <source xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/String_Class/contains"> <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"> + <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> - <source xsi:type="ocl.ecore:OperationCallExp"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> - <source xsi:type="mtl:QueryInvocation"> - <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> - <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> - <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10"> - <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> - </argument> + <source xsi:type="ocl.ecore:PropertyCallExp"> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> + <source xsi:type="ocl.ecore:OperationCallExp"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> + <source xsi:type="mtl:QueryInvocation"> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> + <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/> + <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/10"> + <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> + </argument> + <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> + <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> + </argument> + </source> <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </source> - <argument xsi:type="ocl.ecore:TypeExp" eType="/7/Typedef"> - <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> - </argument> - <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> + <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/> </source> - <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef/definition"/> + <argument xsi:type="ocl.ecore:TypeExp" eType="/7/String"> + <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + </argument> + <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/> </source> <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="typeName"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> @@ -328,6 +342,9 @@ <eClassifiers xsi:type="ocl.ecore:TypeType" name="Typedef"> <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Typedef"/> </eClassifiers> + <eClassifiers xsi:type="ocl.ecore:TypeType" name="String"> + <referredType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//PrimitiveType"/> @@ -355,7 +372,7 @@ </eAnnotations> <eAnnotations source="positions.1" references="/0/CppPrimitiveTypeDefinition"> <details key="start" value="1134"/> - <details key="end" value="1537"/> + <details key="end" value="1573"/> <details key="line" value="22"/> </eAnnotations> <eAnnotations source="positions.2" references="/0/CppPrimitiveTypeDefinition/%"> @@ -375,7 +392,7 @@ </eAnnotations> <eAnnotations source="positions.5" references="/0/CppPrimitiveTypeDefinition/%.2"> <details key="start" value="1229"/> - <details key="end" value="1525"/> + <details key="end" value="1561"/> <details key="line" value="24"/> </eAnnotations> <eAnnotations source="positions.6" references="/0/CppPrimitiveTypeDefinition/%.2/%"> @@ -385,160 +402,180 @@ </eAnnotations> <eAnnotations source="positions.7" references="/0/CppPrimitiveTypeDefinition/%.2/%.1"> <details key="start" value="1268"/> - <details key="end" value="1364"/> + <details key="end" value="1382"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.8" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%"> <details key="start" value="1268"/> - <details key="end" value="1321"/> + <details key="end" value="1339"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.9" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%"> <details key="start" value="1268"/> - <details key="end" value="1310"/> + <details key="end" value="1321"/> <details key="line" value="0"/> </eAnnotations> <eAnnotations source="positions.10" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%"> <details key="start" value="1268"/> + <details key="end" value="1310"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.11" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%"> + <details key="start" value="1268"/> <details key="end" value="1291"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.11" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/self"> + <eAnnotations source="positions.12" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.12" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%"> + <eAnnotations source="positions.13" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%/%"> <details key="start" value="1283"/> <details key="end" value="1290"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.13" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%.1"> + <eAnnotations source="positions.14" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%/%/%.1"> <details key="start" value="1302"/> <details key="end" value="1309"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.14" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.1"> - <details key="start" value="1333"/> - <details key="end" value="1343"/> + <eAnnotations source="positions.15" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%/%.1"> + <details key="start" value="1332"/> + <details key="end" value="1338"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.15" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2"> - <details key="start" value="1345"/> - <details key="end" value="1363"/> + <eAnnotations source="positions.16" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.1"> + <details key="start" value="1351"/> + <details key="end" value="1361"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.16" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2/primitiveType"> - <details key="start" value="1345"/> - <details key="end" value="1358"/> + <eAnnotations source="positions.17" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2"> + <details key="start" value="1363"/> + <details key="end" value="1381"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.17" references="/0/CppPrimitiveTypeDefinition/%.2/%.2"> - <details key="start" value="1368"/> - <details key="end" value="1480"/> + <eAnnotations source="positions.18" references="/0/CppPrimitiveTypeDefinition/%.2/%.1/%.2/primitiveType"> + <details key="start" value="1363"/> + <details key="end" value="1376"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.19" references="/0/CppPrimitiveTypeDefinition/%.2/%.2"> + <details key="start" value="1386"/> + <details key="end" value="1516"/> <details key="line" value="26"/> </eAnnotations> - <eAnnotations source="positions.18" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%"> - <details key="start" value="1453"/> - <details key="end" value="1454"/> + <eAnnotations source="positions.20" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%"> + <details key="start" value="1489"/> + <details key="end" value="1490"/> <details key="line" value="26"/> </eAnnotations> - <eAnnotations source="positions.19" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1"> - <details key="start" value="1455"/> - <details key="end" value="1473"/> + <eAnnotations source="positions.21" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1"> + <details key="start" value="1491"/> + <details key="end" value="1509"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.22" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1/primitiveType"> + <details key="start" value="1491"/> + <details key="end" value="1504"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.20" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.1/primitiveType"> - <details key="start" value="1455"/> - <details key="end" value="1468"/> + <eAnnotations source="positions.23" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2"> + <details key="start" value="1390"/> + <details key="end" value="1488"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.21" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2"> - <details key="start" value="1372"/> - <details key="end" value="1452"/> + <eAnnotations source="positions.24" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%"> + <details key="start" value="1395"/> + <details key="end" value="1487"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.22" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%"> - <details key="start" value="1377"/> - <details key="end" value="1451"/> + <eAnnotations source="positions.25" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%"> + <details key="start" value="1395"/> + <details key="end" value="1466"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.23" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%"> - <details key="start" value="1377"/> - <details key="end" value="1430"/> + <eAnnotations source="positions.26" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%"> + <details key="start" value="1395"/> + <details key="end" value="1448"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.24" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%"> - <details key="start" value="1377"/> - <details key="end" value="1419"/> + <eAnnotations source="positions.27" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%"> + <details key="start" value="1395"/> + <details key="end" value="1437"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.25" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%"> - <details key="start" value="1377"/> - <details key="end" value="1400"/> + <eAnnotations source="positions.28" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%"> + <details key="start" value="1395"/> + <details key="end" value="1418"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.26" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/self"> + <eAnnotations source="positions.29" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.27" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%"> - <details key="start" value="1392"/> - <details key="end" value="1399"/> + <eAnnotations source="positions.30" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%/%"> + <details key="start" value="1410"/> + <details key="end" value="1417"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.28" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%.1"> - <details key="start" value="1411"/> - <details key="end" value="1418"/> + <eAnnotations source="positions.31" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%/%/%.1"> + <details key="start" value="1429"/> + <details key="end" value="1436"/> + <details key="line" value="0"/> + </eAnnotations> + <eAnnotations source="positions.32" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%/%.1"> + <details key="start" value="1459"/> + <details key="end" value="1465"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.29" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%.1"> - <details key="start" value="1440"/> - <details key="end" value="1450"/> + <eAnnotations source="positions.33" references="/0/CppPrimitiveTypeDefinition/%.2/%.2/%.2/%/%.1"> + <details key="start" value="1476"/> + <details key="end" value="1486"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.30" references="/0/CppPrimitiveTypeDefinition/%.2/%.3"> - <details key="start" value="1480"/> - <details key="end" value="1482"/> + <eAnnotations source="positions.34" references="/0/CppPrimitiveTypeDefinition/%.2/%.3"> + <details key="start" value="1516"/> + <details key="end" value="1518"/> <details key="line" value="26"/> </eAnnotations> - <eAnnotations source="positions.31" references="/0/CppPrimitiveTypeDefinition/%.2/%.4"> + <eAnnotations source="positions.35" references="/0/CppPrimitiveTypeDefinition/%.2/%.4"> <details key="start" value="1233"/> <details key="end" value="1257"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.32" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/self"> + <eAnnotations source="positions.36" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/self"> <details key="start" value="-1"/> <details key="end" value="-1"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.33" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/%"> + <eAnnotations source="positions.37" references="/0/CppPrimitiveTypeDefinition/%.2/%.4/%"> <details key="start" value="1248"/> <details key="end" value="1255"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.34" references="/0/CppPrimitiveTypeDefinition/%.2/%.5"> - <details key="start" value="1482"/> - <details key="end" value="1520"/> + <eAnnotations source="positions.38" references="/0/CppPrimitiveTypeDefinition/%.2/%.5"> + <details key="start" value="1518"/> + <details key="end" value="1556"/> <details key="line" value="27"/> </eAnnotations> - <eAnnotations source="positions.35" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%"> - <details key="start" value="1490"/> - <details key="end" value="1516"/> + <eAnnotations source="positions.39" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%"> + <details key="start" value="1526"/> + <details key="end" value="1552"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.36" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%/primitiveType"> - <details key="start" value="1502"/> - <details key="end" value="1515"/> + <eAnnotations source="positions.40" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%/primitiveType"> + <details key="start" value="1538"/> + <details key="end" value="1551"/> <details key="line" value="0"/> </eAnnotations> - <eAnnotations source="positions.37" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%.1"> - <details key="start" value="1518"/> - <details key="end" value="1520"/> + <eAnnotations source="positions.41" references="/0/CppPrimitiveTypeDefinition/%.2/%.5/%.1"> + <details key="start" value="1554"/> + <details key="end" value="1556"/> <details key="line" value="28"/> </eAnnotations> - <eAnnotations source="positions.38" references="/0/CppPrimitiveTypeDefinition/primitiveType"> + <eAnnotations source="positions.42" references="/0/CppPrimitiveTypeDefinition/primitiveType"> <details key="start" value="1178"/> <details key="end" value="1207"/> <details key="line" value="22"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl index e71028e5266..1450157608b 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppPrimitiveTypes.mtl @@ -22,8 +22,8 @@ [template public CppPrimitiveTypeDefinition(primitiveType : PrimitiveType)] [CppElementDoc()/] [if (hasStereotype(Typedef))] -typedef [getApplication(Typedef).oclAsType(Typedef).definition.replaceAll('typeName', primitiveType.name) - /][if (not getApplication(Typedef).oclAsType(Typedef).definition.contains('typeName'))] [primitiveType.name/][/if]; +typedef [getApplication(Typedef).oclAsType(Typedef).definition.oclAsType(String).replaceAll('typeName', primitiveType.name) + /][if (not getApplication(Typedef).oclAsType(Typedef).definition.oclAsType(String).contains('typeName'))] [primitiveType.name/][/if]; [else] [getStdtypes(primitiveType)/]; [/if] 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 4a8bb6965dd..ad8af1fb270 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 @@ -14,7 +14,7 @@ <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"/> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <condition xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> @@ -26,7 +26,7 @@ </argument> </condition> <thenExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template"/> <source xsi:type="mtl:QueryInvocation"> @@ -47,7 +47,7 @@ <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Template/declaration"/> </thenExpression> <elseExpression xsi:type="ocl.ecore:IfExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <condition xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> @@ -59,7 +59,7 @@ </argument> </condition> <thenExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//External"/> <source xsi:type="mtl:QueryInvocation"> @@ -140,7 +140,7 @@ <loopVariable name="include"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> </loopVariable> - <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/11/Set(String)"> + <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/11/Set(null)"> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ExternLibrary"/> <source xsi:type="mtl:QueryInvocation"> @@ -418,8 +418,8 @@ <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"> - <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(null)" instanceClassName="java.util.Set"> + <elementType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> </eClassifiers> </ecore:EPackage> <ocl.ecore:Variable name="self"> 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 b5552177c0b..065063e27cd 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 @@ -85,7 +85,7 @@ <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"/> + <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/> <condition xsi:type="mtl:QueryInvocation"> <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/> <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/> @@ -97,7 +97,7 @@ </argument> </condition> <thenExpression xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//Visibility"/> <source xsi:type="mtl:QueryInvocation"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl index defb56ec5e7..5a9f2997d9e 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl @@ -622,7 +622,7 @@ <body xsi:type="mtl:IfBlock"> <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" : "/> <body xsi:type="ocl.ecore:PropertyCallExp"> - <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/> + <eType xsi:type="ecore:EDataType" href="platform:/resource/org.eclipse.papyrus.cpp.profile/profiles/types.ecore#//String"/> <source xsi:type="ocl.ecore:OperationCallExp"> <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/papyrus/C_Cpp/1#//ConstInit"/> <source xsi:type="mtl:QueryInvocation"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..c537b63063c --- /dev/null +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore index 8bfc83622e0..6c664789c45 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.ecore @@ -6,70 +6,68 @@ <details key="documentation" value=""declaration" attribute should only be used, if more than one indirections of pointers (often "**")"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/> + unique="false" eType="ecore:EClass uml.ecore#//Parameter"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + unique="false" eType="ecore:EClass uml.ecore#//Property"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" ordered="false" - unique="false" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" eType="ecore:EDataType types.ecore#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Include"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="An arbitrary string that is added to header and body file. Although primarily intended for manual include directives, it can be used for arbitrary definitions.
"preBody" is added to a C++ body file before automatic include statements, "body" after"/> </eAnnotations> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String" + <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" ordered="false" eType="ecore:EDataType types.ecore#//String" defaultValueLiteral=""/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="preBody" ordered="false" - eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String" - defaultValueLiteral=""/> + eType="ecore:EDataType types.ecore#//String" defaultValueLiteral=""/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="header" ordered="false" - eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String" - defaultValueLiteral=""/> + eType="ecore:EDataType types.ecore#//String" defaultValueLiteral=""/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/> + unique="false" eType="ecore:EClass uml.ecore#//Package"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_class" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/> + unique="false" eType="ecore:EClass uml.ecore#//Class"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_PackageImport" ordered="false" - eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//PackageImport"/> + eType="ecore:EClass uml.ecore#//PackageImport"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ManualGeneration"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Some toolkits require a quite particular way of use. For instance, LTTng requires the use of C (not C++) for the declaration of a trace provider and the header file is read several time with redefined macros. Therefore, the code generator supports a "manual" generation mode, in which primarily the contents of the CppInclude directive is written."/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensionBody" ordered="false" - lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false" - lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/> + lowerBound="1" eType="ecore:EClass uml.ecore#//Class"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ExternLibrary"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Mark a package as External Library. If this package is used, the associated CDT project will be configured accordingly."/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EAttribute" name="includePaths" ordered="false" - unique="false" upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" upperBound="-1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Package"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="libPaths" ordered="false" - upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + upperBound="-1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="macros" ordered="false" - upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + upperBound="-1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="libs" ordered="false" upperBound="-1" - eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="includes" ordered="false" - upperBound="-1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + upperBound="-1" eType="ecore:EDataType types.ecore#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="NoCodeGen"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="No code generation should be done for this element. This also means that no include directive is generated, if the class is referenced."/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_element" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Element"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Element"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CppRoot"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> <details key="documentation" value="Indicates that this package shoudl be a root package, i.e. its contents should appear on top level folder during generation. Currently not used"/> </eAnnotations> <eStructuralFeatures xsi:type="ecore:EReference" name="base_package" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Package"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Package"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind"> <eLiterals name="private"/> @@ -78,93 +76,93 @@ </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Array"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/> + unique="false" eType="ecore:EClass uml.ecore#//Parameter"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + unique="false" eType="ecore:EClass uml.ecore#//Property"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_association" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Association"/> + unique="false" eType="ecore:EClass uml.ecore#//Association"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Const"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/> + unique="false" eType="ecore:EClass uml.ecore#//Parameter"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + unique="false" eType="ecore:EClass uml.ecore#//Property"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + unique="false" eType="ecore:EClass uml.ecore#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Ref"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_parameter" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/> + unique="false" eType="ecore:EClass uml.ecore#//Parameter"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_property" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + unique="false" eType="ecore:EClass uml.ecore#//Property"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="External"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" - eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Classifier" ordered="false" - lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Classifier"/> + lowerBound="1" eType="ecore:EClass uml.ecore#//Classifier"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ConstInit"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="initialisation" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Friend"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_dependency" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/> + unique="false" eType="ecore:EClass uml.ecore#//Dependency"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false" - unique="false" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + unique="false" eType="ecore:EClass uml.ecore#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Inline"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Virtual"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_operation" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Operation"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Operation"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Typedef"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="definition" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_primitivetype" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//PrimitiveType"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//PrimitiveType"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Visibility"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_generalization" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Generalization"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Generalization"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CppInit"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Integer"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//Integer"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_enumerationliteral" - ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//EnumerationLiteral"/> + ordered="false" unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//EnumerationLiteral"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Template"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_class" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//Class"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateBinding"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="binding" ordered="false" - unique="false" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + unique="false" lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_templatebinding" ordered="false" - unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateBinding"/> + unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//TemplateBinding"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="TemplateParameter"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" - lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//String"/> + lowerBound="1" eType="ecore:EDataType types.ecore#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_templateparameter" - ordered="false" unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateParameter"/> + ordered="false" unique="false" lowerBound="1" eType="ecore:EClass uml.ecore#//TemplateParameter"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Union"> <eStructuralFeatures xsi:type="ecore:EReference" name="base_DataType" ordered="false" - lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//DataType"/> + lowerBound="1" eType="ecore:EClass uml.ecore#//DataType"/> </eClassifiers> <eClassifiers xsi:type="ecore:EEnum" name="EAccessKind"> <eLiterals name="read"/> @@ -180,8 +178,8 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="storageClass" ordered="false" unique="false" lowerBound="1" eType="#//EStorageClass"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Parameter" ordered="false" - eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Parameter"/> + eType="ecore:EClass uml.ecore#//Parameter"/> <eStructuralFeatures xsi:type="ecore:EReference" name="base_Property" ordered="false" - eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Property"/> + eType="ecore:EClass uml.ecore#//Property"/> </eClassifiers> </ecore:EPackage> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel index 5699bcbf6af..3577d0d8f41 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST

All rights reserved. This program and the accompanying materials are
made available under the terms of the Eclipse Public License v1.0 which
accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 CEA LIST - Initial API and implementation
" + xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2014 CEA LIST

All rights reserved. This program and the accompanying materials are
made available under the terms of the Eclipse Public License v1.0 which
accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
 Ansgar Radermacher - Initial API and implementation
" modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile" - modelName="C_Cpp" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml"> + modelName="C_Cpp" nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" + importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false" + language="" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml" + operationReflection="true" importOrganizing="true"> <foreignModel>C_Cpp.ecore</foreignModel> <genPackages prefix="C_Cpp" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true" ecorePackage="C_Cpp.ecore#/"> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml index 4fa6b4c876c..4034bded03a 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.profile.uml @@ -1,99 +1,99 @@ <?xml version="1.0" encoding="UTF-8"?> -<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"> +<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"> <uml:Profile xmi:id="_j9REUByGEduN1bTiWJ0lyw" name="C_Cpp" metaclassReference="_TRvswByHEduN1bTiWJ0lyw _gphJsByIEduN1bTiWJ0lyw _Gt0nQByJEduN1bTiWJ0lyw _GuFF8ByJEduN1bTiWJ0lyw _G0LmkByMEdu0tMSz-ceC5A _G0XMwByMEdu0tMSz-ceC5A _G0a3IByMEdu0tMSz-ceC5A _jBetUByNEdu0tMSz-ceC5A _jB15sByNEdu0tMSz-ceC5A _jB_qsByNEdu0tMSz-ceC5A _jCCuAByNEdu0tMSz-ceC5A _jCGYYByNEdu0tMSz-ceC5A _jCJbsByNEdu0tMSz-ceC5A _X7dJsDlPEd2mO4M0idYmag _OiGWgF5fEeKpvPHLdOdp2Q _41Sz8I1SEeKTUILNxKtfZw _CBeJwOPxEeKKu7vQg_d5Xw"> - <ownedComment xmi:type="uml:Comment" xmi:id="_KaTwkNY9EeGH9LIP6-_nLw" annotatedElement="_19ZzgByHEduN1bTiWJ0lyw"> + <ownedComment xmi:id="_KaTwkNY9EeGH9LIP6-_nLw" annotatedElement="_19ZzgByHEduN1bTiWJ0lyw"> <body>"declaration" attribute should only be used, if more than one indirections of pointers (often "**")</body> </ownedComment> - <ownedComment xmi:type="uml:Comment" xmi:id="_Ew5PMP2IEeGbWP4cpLE0gg" annotatedElement="_RwTdQByJEduN1bTiWJ0lyw"> + <ownedComment xmi:id="_Ew5PMP2IEeGbWP4cpLE0gg" annotatedElement="_RwTdQByJEduN1bTiWJ0lyw"> <body>An arbitrary string that is added to header and body file. Although primarily intended for manual include directives, it can be used for arbitrary definitions. "preBody" is added to a C++ body file before automatic include statements, "body" after</body> </ownedComment> - <ownedComment xmi:type="uml:Comment" xmi:id="_GS8LQCYNEeKe9vxHwEdBmA" annotatedElement="_A3_lgCYNEeKe9vxHwEdBmA"> + <ownedComment xmi:id="_GS8LQCYNEeKe9vxHwEdBmA" annotatedElement="_A3_lgCYNEeKe9vxHwEdBmA"> <body>Some toolkits require a quite particular way of use. For instance, LTTng requires the use of C (not C++) for the declaration of a trace provider and the header file is read several time with redefined macros. Therefore, the code generator supports a "manual" generation mode, in which primarily the contents of the CppInclude directive is written.</body> </ownedComment> - <ownedComment xmi:type="uml:Comment" xmi:id="_w-x6sNTPEeKiLbHSN_MIRQ" annotatedElement="_PmXVQByJEduN1bTiWJ0lyw"> + <ownedComment xmi:id="_w-x6sNTPEeKiLbHSN_MIRQ" annotatedElement="_PmXVQByJEduN1bTiWJ0lyw"> <body>Mark a package as External Library. If this package is used, the associated CDT project will be configured accordingly.</body> </ownedComment> - <ownedComment xmi:type="uml:Comment" xmi:id="_LBAtgNTQEeKiLbHSN_MIRQ" annotatedElement="_IHjS8ByMEdu0tMSz-ceC5A"> + <ownedComment xmi:id="_LBAtgNTQEeKiLbHSN_MIRQ" annotatedElement="_IHjS8ByMEdu0tMSz-ceC5A"> <body>No code generation should be done for this element. This also means that no include directive is generated, if the class is referenced.</body> </ownedComment> - <ownedComment xmi:type="uml:Comment" xmi:id="_PJcigNTQEeKiLbHSN_MIRQ" annotatedElement="_u3zF8ByLEdu0tMSz-ceC5A"> + <ownedComment xmi:id="_PJcigNTQEeKiLbHSN_MIRQ" annotatedElement="_u3zF8ByLEdu0tMSz-ceC5A"> <body>Indicates that this package shoudl be a root package, i.e. its contents should appear on top level folder during generation. Currently not used</body> </ownedComment> - <elementImport xmi:type="uml:ElementImport" xmi:id="_TRvswByHEduN1bTiWJ0lyw"> + <elementImport xmi:id="_TRvswByHEduN1bTiWJ0lyw"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_gphJsByIEduN1bTiWJ0lyw"> + <elementImport xmi:id="_gphJsByIEduN1bTiWJ0lyw"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_Gt0nQByJEduN1bTiWJ0lyw"> + <elementImport xmi:id="_Gt0nQByJEduN1bTiWJ0lyw"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_GuFF8ByJEduN1bTiWJ0lyw"> + <elementImport xmi:id="_GuFF8ByJEduN1bTiWJ0lyw"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_G0LmkByMEdu0tMSz-ceC5A"> + <elementImport xmi:id="_G0LmkByMEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_G0XMwByMEdu0tMSz-ceC5A"> + <elementImport xmi:id="_G0XMwByMEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_G0a3IByMEdu0tMSz-ceC5A"> + <elementImport xmi:id="_G0a3IByMEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jBetUByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jBetUByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jB15sByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jB15sByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jB_qsByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jB_qsByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jCCuAByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jCCuAByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateParameter"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jCGYYByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jCGYYByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_jCJbsByNEdu0tMSz-ceC5A"> + <elementImport xmi:id="_jCJbsByNEdu0tMSz-ceC5A"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_X7dJsDlPEd2mO4M0idYmag" alias="PackageImport"> + <elementImport xmi:id="_X7dJsDlPEd2mO4M0idYmag" alias="PackageImport"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PackageImport"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_OiGWgF5fEeKpvPHLdOdp2Q" alias="DataType"> + <elementImport xmi:id="_OiGWgF5fEeKpvPHLdOdp2Q" alias="DataType"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_41Sz8I1SEeKTUILNxKtfZw" alias="Feature"> + <elementImport xmi:id="_41Sz8I1SEeKTUILNxKtfZw" alias="Feature"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Feature"/> </elementImport> - <elementImport xmi:type="uml:ElementImport" xmi:id="_CBeJwOPxEeKKu7vQg_d5Xw" alias="Classifier"> + <elementImport xmi:id="_CBeJwOPxEeKKu7vQg_d5Xw" alias="Classifier"> <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> </elementImport> - <packageImport xmi:type="uml:PackageImport" xmi:id="_6G_4UP2HEeGbWP4cpLE0gg"> + <packageImport xmi:id="_6G_4UP2HEeGbWP4cpLE0gg"> <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/> </packageImport> <packagedElement xmi:type="uml:Enumeration" xmi:id="_rIXZEByGEduN1bTiWJ0lyw" name="VisibilityKind"> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_v6MwYByGEduN1bTiWJ0lyw" name="private"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_wz28QByGEduN1bTiWJ0lyw" name="protected"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_xKmBQByGEduN1bTiWJ0lyw" name="public"/> + <ownedLiteral xmi:id="_v6MwYByGEduN1bTiWJ0lyw" name="private"/> + <ownedLiteral xmi:id="_wz28QByGEduN1bTiWJ0lyw" name="protected"/> + <ownedLiteral xmi:id="_xKmBQByGEduN1bTiWJ0lyw" name="public"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_WgwmcByHEduN1bTiWJ0lyw" name="Array"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_Z3w-gByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Z4QGsByHEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_Z3w-gByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Z4QGsByHEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ibI3cCBEEeOBrb_t_69W4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ibQMMCBEEeOBrb_t_69W4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_a8S9oByHEduN1bTiWJ0lyw" name="definition" isUnique="false"> + <ownedAttribute xmi:id="_a8S9oByHEduN1bTiWJ0lyw" name="definition" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_jd4uwByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_jeImYByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_jd4uwByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_jeImYByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jdmaACBEEeOBrb_t_69W4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jdsgoCBEEeOBrb_t_69W4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_guP0gByPEduuTv8efIb91A" name="base_association" isUnique="false" association="_gufsIByPEduuTv8efIb91A"> + <ownedAttribute xmi:id="_guP0gByPEduuTv8efIb91A" name="base_association" isUnique="false" association="_gufsIByPEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kZzjkCBEEeOBrb_t_69W4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kZ8tgCBEEeOBrb_t_69W4Q" value="1"/> @@ -103,17 +103,17 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Z4QGsRyHEduN1bTiWJ0lyw" name="extension_Array" type="_WgwmcByHEduN1bTiWJ0lyw" association="_Z4QGsByHEduN1bTiWJ0lyw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_l2faUByHEduN1bTiWJ0lyw" name="Const"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_q3qOIByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_q3wUwByHEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_q3qOIByHEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_q3wUwByHEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_D7WaMOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_D7dH4OL5EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_kJX7wByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_kJ5gMByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_kJX7wByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_kJ5gMByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I03G0OL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I0-bkOL5EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_ThDh0ByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_ThSyYByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_ThDh0ByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_ThSyYByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L-zTQOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L-6oAOL5EeK7avO_9XJm4Q" value="1"/> @@ -123,29 +123,29 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_q3wUwRyHEduN1bTiWJ0lyw" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_q3wUwByHEduN1bTiWJ0lyw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_19ZzgByHEduN1bTiWJ0lyw" name="Ptr"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_VbvCoByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Vb-6QByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_VbvCoByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_Vb-6QByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5qhDkOL4EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5qrboOL4EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_lylVQByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_lzRRwByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_lylVQByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_lzRRwByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9dMD8OL4EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9dbUgOL4EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_5xNQUNY8EeGH9LIP6-_nLw" name="declaration" visibility="public" isUnique="false"> + <ownedAttribute xmi:id="_5xNQUNY8EeGH9LIP6-_nLw" name="declaration" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9QCHoNY8EeGH9LIP6-_nLw"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9QFK8NY8EeGH9LIP6-_nLw" value="1"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_2VwCEByHEduN1bTiWJ0lyw" name="Ref"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_V-XOkByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_V-ysYByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_V-XOkByIEduN1bTiWJ0lyw" name="base_parameter" isUnique="false" association="_V-ysYByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__nXcgOL4EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__nfYUOL4EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_mbfIUByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_mb27wByIEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_mbfIUByIEduN1bTiWJ0lyw" name="base_property" isUnique="false" association="_mb27wByIEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BOSXAOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BOaS0OL5EeK7avO_9XJm4Q" value="1"/> @@ -170,17 +170,17 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_mb27wRyIEduN1bTiWJ0lyw" name="extension_Ref" type="_2VwCEByHEduN1bTiWJ0lyw" association="_mb27wByIEduN1bTiWJ0lyw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_MyI6IByJEduN1bTiWJ0lyw" name="External"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_UiU48ByJEduN1bTiWJ0lyw" name="name" isUnique="false"> + <ownedAttribute xmi:id="_UiU48ByJEduN1bTiWJ0lyw" name="name" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ho9-oOL9EeKxe91u-BdTVQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HpF6cOL9EeKxe91u-BdTVQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_Ibp-8OPxEeKKu7vQg_d5Xw" name="base_Classifier" association="_Ibyh0OPxEeKKu7vQg_d5Xw"> + <ownedAttribute xmi:id="_Ibp-8OPxEeKKu7vQg_d5Xw" name="base_Classifier" association="_Ibyh0OPxEeKKu7vQg_d5Xw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_PmXVQByJEduN1bTiWJ0lyw" name="ExternLibrary"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_WFVj0ByJEduN1bTiWJ0lyw" name="includePaths" visibility="public" isUnique="false"> + <ownedAttribute xmi:id="_WFVj0ByJEduN1bTiWJ0lyw" name="includePaths" visibility="public" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x4IIgOL8EeKxe91u-BdTVQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x4hxIOL8EeKxe91u-BdTVQ" value="*"/> @@ -188,10 +188,10 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_zqayUByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_zqqC4ByJEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_zqayUByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_zqqC4ByJEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_qvPI4NTHEeKiLbHSN_MIRQ" name="libPaths" visibility="public"> + <ownedAttribute xmi:id="_qvPI4NTHEeKiLbHSN_MIRQ" name="libPaths" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E5XWoNTMEeKiLbHSN_MIRQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E5ggkNTMEeKiLbHSN_MIRQ" value="*"/> @@ -199,7 +199,7 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_FRPjwNTPEeKiLbHSN_MIRQ" name="macros" visibility="public"> + <ownedAttribute xmi:id="_FRPjwNTPEeKiLbHSN_MIRQ" name="macros" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FftdkNTPEeKiLbHSN_MIRQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ff648NTPEeKiLbHSN_MIRQ" value="*"/> @@ -207,7 +207,7 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_FzcR4NTPEeKiLbHSN_MIRQ" name="libs" visibility="public"> + <ownedAttribute xmi:id="_FzcR4NTPEeKiLbHSN_MIRQ" name="libs" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F6mCwNTPEeKiLbHSN_MIRQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F6wa0NTPEeKiLbHSN_MIRQ" value="*"/> @@ -215,7 +215,7 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_NkWpcNTPEeKiLbHSN_MIRQ" name="includes" visibility="public"> + <ownedAttribute xmi:id="_NkWpcNTPEeKiLbHSN_MIRQ" name="includes" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Pkq7YNTPEeKiLbHSN_MIRQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PkyQINTPEeKiLbHSN_MIRQ" value="*"/> @@ -225,35 +225,35 @@ </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_RwTdQByJEduN1bTiWJ0lyw" name="Include"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_XU2q8ByJEduN1bTiWJ0lyw" name="body" visibility="public"> + <ownedAttribute xmi:id="_XU2q8ByJEduN1bTiWJ0lyw" name="body" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XhvLMBybEdudA-H9lQdiWg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XiD7UBybEdudA-H9lQdiWg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_RyRCMBBXEdyoOLr5UzE5gA" value=""/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_r9C7EP2HEeGbWP4cpLE0gg" name="preBody" visibility="public"> + <ownedAttribute xmi:id="_r9C7EP2HEeGbWP4cpLE0gg" name="preBody" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_siaR8P2HEeGbWP4cpLE0gg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sia5AP2HEeGbWP4cpLE0gg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_5Ewt4JVWEeKvxuXeCtLm5w" name="" value=""/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_YtvwgByJEduN1bTiWJ0lyw" name="header" visibility="public"> + <ownedAttribute xmi:id="_YtvwgByJEduN1bTiWJ0lyw" name="header" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dbl6gBybEdudA-H9lQdiWg"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dbnIoBybEdudA-H9lQdiWg" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_RT5rMBBXEdyoOLr5UzE5gA" value=""/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_0IP90ByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_0It34ByJEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_0IP90ByJEduN1bTiWJ0lyw" name="base_package" isUnique="false" association="_0It34ByJEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eMPUEOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eMekoOL5EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_0ja24ByJEduN1bTiWJ0lyw" name="base_class" isUnique="false" association="_0jpgYByJEduN1bTiWJ0lyw"> + <ownedAttribute xmi:id="_0ja24ByJEduN1bTiWJ0lyw" name="base_class" isUnique="false" association="_0jpgYByJEduN1bTiWJ0lyw"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fSqJkOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fSw3QOL5EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_kKB_YTlPEd2mO4M0idYmag" name="base_PackageImport" association="_kJ7RsDlPEd2mO4M0idYmag"> + <ownedAttribute xmi:id="_kKB_YTlPEd2mO4M0idYmag" name="base_PackageImport" association="_kJ7RsDlPEd2mO4M0idYmag"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PackageImport"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gANMEOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gAb1kOL5EeK7avO_9XJm4Q" value="1"/> @@ -269,7 +269,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_0jpgYRyJEduN1bTiWJ0lyw" name="extension_Include" type="_RwTdQByJEduN1bTiWJ0lyw" association="_0jpgYByJEduN1bTiWJ0lyw"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_u3zF8ByLEdu0tMSz-ceC5A" name="CppRoot"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_xOLHcByLEdu0tMSz-ceC5A" name="base_package" isUnique="false" association="_xObmIByLEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_xOLHcByLEdu0tMSz-ceC5A" name="base_package" isUnique="false" association="_xObmIByLEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/> </ownedAttribute> </packagedElement> @@ -277,7 +277,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_xOcNMByLEdu0tMSz-ceC5A" name="Extension_CppRoot" type="_u3zF8ByLEdu0tMSz-ceC5A" association="_xObmIByLEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_IHjS8ByMEdu0tMSz-ceC5A" name="NoCodeGen"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_KiFbsByMEdu0tMSz-ceC5A" name="base_element" isUnique="false" association="_KiZkwByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_KiFbsByMEdu0tMSz-ceC5A" name="base_element" isUnique="false" association="_KiZkwByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/> </ownedAttribute> </packagedElement> @@ -288,10 +288,10 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ThSyYRyMEdu0tMSz-ceC5A" name="extension_Const" type="_l2faUByHEduN1bTiWJ0lyw" association="_ThSyYByMEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_Vk8FIByMEdu0tMSz-ceC5A" name="ConstInit"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_XYIhEByMEdu0tMSz-ceC5A" name="initialisation" isUnique="false"> + <ownedAttribute xmi:id="_XYIhEByMEdu0tMSz-ceC5A" name="initialisation" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_dtKJcByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_dtaoIByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_dtKJcByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_dtaoIByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </ownedAttribute> </packagedElement> @@ -299,12 +299,12 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_dtaoIRyMEdu0tMSz-ceC5A" name="Extension_CppConstInit" type="_Vk8FIByMEdu0tMSz-ceC5A" association="_dtaoIByMEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_e6bN0ByMEdu0tMSz-ceC5A" name="Friend"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_gvjjcByMEdu0tMSz-ceC5A" name="base_dependency" isUnique="false" association="_gvyM8ByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_gvjjcByMEdu0tMSz-ceC5A" name="base_dependency" isUnique="false" association="_gvyM8ByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WZnFQOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WZ1uwOL5EeK7avO_9XJm4Q" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_hPAfkByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_hPPwIByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_hPAfkByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_hPPwIByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XZ6EoOL5EeK7avO_9XJm4Q"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XaHgAOL5EeK7avO_9XJm4Q" value="1"/> @@ -317,7 +317,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_hPPwIRyMEdu0tMSz-ceC5A" name="extension_Friend" type="_e6bN0ByMEdu0tMSz-ceC5A" association="_hPPwIByMEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_lfbL4ByMEdu0tMSz-ceC5A" name="Inline"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_n0_8IByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_n1PMsByMEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_n0_8IByMEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_n1PMsByMEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </ownedAttribute> </packagedElement> @@ -325,7 +325,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_n1PMsRyMEdu0tMSz-ceC5A" name="extension_Inline" type="_lfbL4ByMEdu0tMSz-ceC5A" association="_n1PMsByMEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_FA2LQByNEdu0tMSz-ceC5A" name="Virtual"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_K5A4gByNEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_K5gnwByNEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_K5A4gByNEdu0tMSz-ceC5A" name="base_operation" isUnique="false" association="_K5gnwByNEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/> </ownedAttribute> </packagedElement> @@ -333,10 +333,10 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_K5gnwRyNEdu0tMSz-ceC5A" name="extension_Virtual" type="_FA2LQByNEdu0tMSz-ceC5A" association="_K5gnwByNEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_5yQWcByNEdu0tMSz-ceC5A" name="Typedef"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_7C5e8ByNEdu0tMSz-ceC5A" name="definition" isUnique="false"> + <ownedAttribute xmi:id="_7C5e8ByNEdu0tMSz-ceC5A" name="definition" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_DgXagByOEdu0tMSz-ceC5A" name="base_primitivetype" isUnique="false" association="_DqJooByOEdu0tMSz-ceC5A"> + <ownedAttribute xmi:id="_DgXagByOEdu0tMSz-ceC5A" name="base_primitivetype" isUnique="false" association="_DqJooByOEdu0tMSz-ceC5A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#PrimitiveType"/> </ownedAttribute> </packagedElement> @@ -344,10 +344,10 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_DqJooRyOEdu0tMSz-ceC5A" name="Extension_CppType" type="_5yQWcByNEdu0tMSz-ceC5A" association="_DqJooByOEdu0tMSz-ceC5A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_ALgiEByPEduuTv8efIb91A" name="Visibility"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_HbLNwByPEduuTv8efIb91A" name="value" isUnique="false"> + <ownedAttribute xmi:id="_HbLNwByPEduuTv8efIb91A" name="value" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_NQc_EByPEduuTv8efIb91A" name="base_generalization" isUnique="false" association="_NQs2sByPEduuTv8efIb91A"> + <ownedAttribute xmi:id="_NQc_EByPEduuTv8efIb91A" name="base_generalization" isUnique="false" association="_NQs2sByPEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Generalization"/> </ownedAttribute> </packagedElement> @@ -355,10 +355,10 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_NQs2sRyPEduuTv8efIb91A" name="Extension_CppVisibility" type="_ALgiEByPEduuTv8efIb91A" association="_NQs2sByPEduuTv8efIb91A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_S_sZ0ByPEduuTv8efIb91A" name="CppInit"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_VcWCcByPEduuTv8efIb91A" name="value" isUnique="false"> + <ownedAttribute xmi:id="_VcWCcByPEduuTv8efIb91A" name="value" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_aoPfkByPEduuTv8efIb91A" name="base_enumerationliteral" isUnique="false" association="_aoVmMByPEduuTv8efIb91A"> + <ownedAttribute xmi:id="_aoPfkByPEduuTv8efIb91A" name="base_enumerationliteral" isUnique="false" association="_aoVmMByPEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#EnumerationLiteral"/> </ownedAttribute> </packagedElement> @@ -369,26 +369,26 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_gufsIRyPEduuTv8efIb91A" name="extension_Array" type="_WgwmcByHEduN1bTiWJ0lyw" association="_gufsIByPEduuTv8efIb91A"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_5W6MUByPEduuTv8efIb91A" name="Template"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_7e8P0ByPEduuTv8efIb91A" name="declaration" isUnique="false"> + <ownedAttribute xmi:id="_7e8P0ByPEduuTv8efIb91A" name="declaration" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_Op3MkByQEduuTv8efIb91A" name="base_class" isUnique="false" association="_OqF2EByQEduuTv8efIb91A"> + <ownedAttribute xmi:id="_Op3MkByQEduuTv8efIb91A" name="base_class" isUnique="false" association="_OqF2EByQEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_9oCDQByPEduuTv8efIb91A" name="TemplateBinding"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_AOo5IByQEduuTv8efIb91A" name="binding" isUnique="false"> + <ownedAttribute xmi:id="_AOo5IByQEduuTv8efIb91A" name="binding" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_O8vFQByQEduuTv8efIb91A" name="base_templatebinding" isUnique="false" association="_O9D1YByQEduuTv8efIb91A"> + <ownedAttribute xmi:id="_O8vFQByQEduuTv8efIb91A" name="base_templatebinding" isUnique="false" association="_O9D1YByQEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateBinding"/> </ownedAttribute> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_CYoEcByQEduuTv8efIb91A" name="TemplateParameter"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_EV0J4ByQEduuTv8efIb91A" name="name" isUnique="false"> + <ownedAttribute xmi:id="_EV0J4ByQEduuTv8efIb91A" name="name" isUnique="false"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_OXfqMByQEduuTv8efIb91A" name="base_templateparameter" isUnique="false" association="_OYBOoByQEduuTv8efIb91A"> + <ownedAttribute xmi:id="_OXfqMByQEduuTv8efIb91A" name="base_templateparameter" isUnique="false" association="_OYBOoByQEduuTv8efIb91A"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateParameter"/> </ownedAttribute> </packagedElement> @@ -405,7 +405,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_kKB_YDlPEd2mO4M0idYmag" name="extension_Include" type="_RwTdQByJEduN1bTiWJ0lyw" aggregation="composite" association="_kJ7RsDlPEd2mO4M0idYmag"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_A3_lgCYNEeKe9vxHwEdBmA" name="ManualGeneration"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_vOBBoCYNEeKe9vxHwEdBmA" name="extensionBody" visibility="public"> + <ownedAttribute xmi:id="_vOBBoCYNEeKe9vxHwEdBmA" name="extensionBody" visibility="public"> <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5zd9YCYNEeKe9vxHwEdBmA" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5zgZoCYNEeKe9vxHwEdBmA" value="1"/> @@ -413,7 +413,7 @@ <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_KEpF0CYOEeKe9vxHwEdBmA" name="base_Class" association="_KEps4CYOEeKe9vxHwEdBmA"> + <ownedAttribute xmi:id="_KEpF0CYOEeKe9vxHwEdBmA" name="base_Class" association="_KEps4CYOEeKe9vxHwEdBmA"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/> </ownedAttribute> </packagedElement> @@ -421,7 +421,7 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_KEps4SYOEeKe9vxHwEdBmA" name="extension_ManualGeneration" type="_A3_lgCYNEeKe9vxHwEdBmA" aggregation="composite" association="_KEps4CYOEeKe9vxHwEdBmA"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_QCUzIF5fEeKpvPHLdOdp2Q" name="Union"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_R-F8QF5fEeKpvPHLdOdp2Q" name="base_DataType" association="_R-F8QV5fEeKpvPHLdOdp2Q"> + <ownedAttribute xmi:id="_R-F8QF5fEeKpvPHLdOdp2Q" name="base_DataType" association="_R-F8QV5fEeKpvPHLdOdp2Q"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/> </ownedAttribute> </packagedElement> @@ -429,29 +429,29 @@ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_R-F8Ql5fEeKpvPHLdOdp2Q" name="extension_Union" type="_QCUzIF5fEeKpvPHLdOdp2Q" aggregation="composite" association="_R-F8QV5fEeKpvPHLdOdp2Q"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_yOu8UJMIEeKrb5fnA81_2Q" name="EAccessKind"> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zX48wJMIEeKrb5fnA81_2Q" name="read"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_0bzQ0JMIEeKrb5fnA81_2Q" name="write"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_1C3Q0JMIEeKrb5fnA81_2Q" name="readWrite"/> + <ownedLiteral xmi:id="_zX48wJMIEeKrb5fnA81_2Q" name="read"/> + <ownedLiteral xmi:id="_0bzQ0JMIEeKrb5fnA81_2Q" name="write"/> + <ownedLiteral xmi:id="_1C3Q0JMIEeKrb5fnA81_2Q" name="readWrite"/> </packagedElement> <packagedElement xmi:type="uml:Enumeration" xmi:id="_YVBzYJMIEeKrb5fnA81_2Q" name="EStorageClass"> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_g3RhQJMIEeKrb5fnA81_2Q" name="volatile"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_iJ4_sJMIEeKrb5fnA81_2Q" name="register"/> - <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_irt6YJMIEeKrb5fnA81_2Q" name="extern"/> + <ownedLiteral xmi:id="_g3RhQJMIEeKrb5fnA81_2Q" name="volatile"/> + <ownedLiteral xmi:id="_iJ4_sJMIEeKrb5fnA81_2Q" name="register"/> + <ownedLiteral xmi:id="_irt6YJMIEeKrb5fnA81_2Q" name="extern"/> </packagedElement> <packagedElement xmi:type="uml:Stereotype" xmi:id="_U3BNgJVPEeKCE6_KfOehJw" name="StorageClass"> - <ownedAttribute xmi:type="uml:Property" xmi:id="_X910gJVPEeKCE6_KfOehJw" name="storageClass" visibility="public" type="_YVBzYJMIEeKrb5fnA81_2Q" isUnique="false"> + <ownedAttribute xmi:id="_X910gJVPEeKCE6_KfOehJw" name="storageClass" visibility="public" type="_YVBzYJMIEeKrb5fnA81_2Q" isUnique="false"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yd3YYJVPEeKCE6_KfOehJw" value="1"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yd4mgJVPEeKCE6_KfOehJw" value="1"/> <defaultValue xmi:type="uml:LiteralString" xmi:id="_Yd7CwJVPEeKCE6_KfOehJw"> <value xsi:nil="true"/> </defaultValue> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_bu81cOL9EeKxe91u-BdTVQ" name="base_Parameter" association="_bvC8EOL9EeKxe91u-BdTVQ"> + <ownedAttribute xmi:id="_bu81cOL9EeKxe91u-BdTVQ" name="base_Parameter" association="_bvC8EOL9EeKxe91u-BdTVQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d4yPwOL9EeKxe91u-BdTVQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d4918OL9EeKxe91u-BdTVQ" value="1"/> </ownedAttribute> - <ownedAttribute xmi:type="uml:Property" xmi:id="_cKdswOL9EeKxe91u-BdTVQ" name="base_Property" association="_cKgwEOL9EeKxe91u-BdTVQ"> + <ownedAttribute xmi:id="_cKdswOL9EeKxe91u-BdTVQ" name="base_Property" association="_cKgwEOL9EeKxe91u-BdTVQ"> <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_esvcQOL9EeKxe91u-BdTVQ"/> <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_es2J8OL9EeKxe91u-BdTVQ" value="1"/> @@ -466,11 +466,11 @@ <packagedElement xmi:type="uml:Extension" xmi:id="_Ibyh0OPxEeKKu7vQg_d5Xw" name="E_External_Classifier1" memberEnd="_Ibyh0ePxEeKKu7vQg_d5Xw _Ibp-8OPxEeKKu7vQg_d5Xw"> <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_Ibyh0ePxEeKKu7vQg_d5Xw" name="extension_External" type="_MyI6IByJEduN1bTiWJ0lyw" aggregation="composite" association="_Ibyh0OPxEeKKu7vQg_d5Xw"/> </packagedElement> - <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_QS19UMogEeGKstsYRuxdvw"> - <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QUmQ0MogEeGKstsYRuxdvw" source="http://www.eclipse.org/uml2/2.0.0/UML"> + <profileApplication xmi:id="_QS19UMogEeGKstsYRuxdvw"> + <eAnnotations xmi:id="_QUmQ0MogEeGKstsYRuxdvw" source="http://www.eclipse.org/uml2/2.0.0/UML"> <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/> </eAnnotations> - <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> + <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/> </profileApplication> </uml:Profile> <Ecore:EPackage xmi:id="_RRUXwMogEeGKstsYRuxdvw" base_Package="_j9REUByGEduN1bTiWJ0lyw" packageName="C_Cpp" nsPrefix="C_Cpp" nsURI="http://www.eclipse.org/papyrus/C_Cpp/1" prefix="C_Cpp"/> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java index 4fe5f4d9ced..bbb88a14228 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java @@ -113,6 +113,15 @@ public interface C_CppPackage extends EPackage { int PTR_FEATURE_COUNT = 3; /** + * The number of operations of the '<em>Ptr</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PTR_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.IncludeImpl <em>Include</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -186,6 +195,15 @@ public interface C_CppPackage extends EPackage { int INCLUDE_FEATURE_COUNT = 6; /** + * The number of operations of the '<em>Include</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int INCLUDE_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -223,6 +241,15 @@ public interface C_CppPackage extends EPackage { int MANUAL_GENERATION_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Manual Generation</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int MANUAL_GENERATION_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -296,6 +323,15 @@ public interface C_CppPackage extends EPackage { int EXTERN_LIBRARY_FEATURE_COUNT = 6; /** + * The number of operations of the '<em>Extern Library</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERN_LIBRARY_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -324,6 +360,15 @@ public interface C_CppPackage extends EPackage { int NO_CODE_GEN_FEATURE_COUNT = 1; /** + * The number of operations of the '<em>No Code Gen</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int NO_CODE_GEN_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -352,6 +397,15 @@ public interface C_CppPackage extends EPackage { int CPP_ROOT_FEATURE_COUNT = 1; /** + * The number of operations of the '<em>Cpp Root</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CPP_ROOT_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -407,6 +461,15 @@ public interface C_CppPackage extends EPackage { int ARRAY_FEATURE_COUNT = 4; /** + * The number of operations of the '<em>Array</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ARRAY_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -453,6 +516,15 @@ public interface C_CppPackage extends EPackage { int CONST_FEATURE_COUNT = 3; /** + * The number of operations of the '<em>Const</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CONST_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -490,6 +562,15 @@ public interface C_CppPackage extends EPackage { int REF_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Ref</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int REF_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternalImpl <em>External</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -527,6 +608,15 @@ public interface C_CppPackage extends EPackage { int EXTERNAL_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>External</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int EXTERNAL_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -564,6 +654,15 @@ public interface C_CppPackage extends EPackage { int CONST_INIT_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Const Init</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CONST_INIT_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.FriendImpl <em>Friend</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -601,6 +700,15 @@ public interface C_CppPackage extends EPackage { int FRIEND_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Friend</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int FRIEND_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.InlineImpl <em>Inline</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -629,6 +737,15 @@ public interface C_CppPackage extends EPackage { int INLINE_FEATURE_COUNT = 1; /** + * The number of operations of the '<em>Inline</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int INLINE_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.VirtualImpl <em>Virtual</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -657,6 +774,15 @@ public interface C_CppPackage extends EPackage { int VIRTUAL_FEATURE_COUNT = 1; /** + * The number of operations of the '<em>Virtual</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int VIRTUAL_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TypedefImpl <em>Typedef</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -694,6 +820,15 @@ public interface C_CppPackage extends EPackage { int TYPEDEF_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Typedef</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TYPEDEF_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.VisibilityImpl <em>Visibility</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -731,6 +866,15 @@ public interface C_CppPackage extends EPackage { int VISIBILITY_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Visibility</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int VISIBILITY_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppInitImpl <em>Cpp Init</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -768,6 +912,15 @@ public interface C_CppPackage extends EPackage { int CPP_INIT_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Cpp Init</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int CPP_INIT_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateImpl <em>Template</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -805,6 +958,15 @@ public interface C_CppPackage extends EPackage { int TEMPLATE_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Template</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TEMPLATE_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateBindingImpl <em>Template Binding</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -842,6 +1004,15 @@ public interface C_CppPackage extends EPackage { int TEMPLATE_BINDING_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Template Binding</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TEMPLATE_BINDING_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.TemplateParameterImpl <em>Template Parameter</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -879,6 +1050,15 @@ public interface C_CppPackage extends EPackage { int TEMPLATE_PARAMETER_FEATURE_COUNT = 2; /** + * The number of operations of the '<em>Template Parameter</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TEMPLATE_PARAMETER_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.UnionImpl <em>Union</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -907,6 +1087,15 @@ public interface C_CppPackage extends EPackage { int UNION_FEATURE_COUNT = 1; /** + * The number of operations of the '<em>Union</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int UNION_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.StorageClassImpl <em>Storage Class</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -953,6 +1142,15 @@ public interface C_CppPackage extends EPackage { int STORAGE_CLASS_FEATURE_COUNT = 3; /** + * The number of operations of the '<em>Storage Class</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int STORAGE_CLASS_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.VisibilityKind <em>Visibility Kind</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java index 7cf2e70faca..c8d3eebc140 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.Array; import org.eclipse.papyrus.C_Cpp.C_CppPackage; - import org.eclipse.uml2.uml.Association; import org.eclipse.uml2.uml.Parameter; import org.eclipse.uml2.uml.Property; @@ -43,7 +39,7 @@ import org.eclipse.uml2.uml.Property; * * @generated */ -public class ArrayImpl extends EObjectImpl implements Array { +public class ArrayImpl extends MinimalEObjectImpl.Container implements Array { /** * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java index 3dc29d49efd..fb8889f1969 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java @@ -1154,7 +1154,7 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage { // Add supertypes to classes - // Initialize classes and features; add operations and parameters + // Initialize classes, features, and operations; add parameters initEClass(ptrEClass, Ptr.class, "Ptr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference(getPtr_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ initEReference(getPtr_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java index 180684ae7c8..32c757c2caa 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Const; - import org.eclipse.uml2.uml.Operation; import org.eclipse.uml2.uml.Parameter; import org.eclipse.uml2.uml.Property; @@ -42,7 +38,7 @@ import org.eclipse.uml2.uml.Property; * * @generated */ -public class ConstImpl extends EObjectImpl implements Const { +public class ConstImpl extends MinimalEObjectImpl.Container implements Const { /** * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java index 243c3a89d5b..84fa37dec0f 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.ConstInit; - import org.eclipse.uml2.uml.Operation; /** @@ -39,7 +35,7 @@ import org.eclipse.uml2.uml.Operation; * * @generated */ -public class ConstInitImpl extends EObjectImpl implements ConstInit { +public class ConstInitImpl extends MinimalEObjectImpl.Container implements ConstInit { /** * The default value of the '{@link #getInitialisation() <em>Initialisation</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java index 3577393c04b..9b68d686a64 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.CppInit; - import org.eclipse.uml2.uml.EnumerationLiteral; /** @@ -39,7 +35,7 @@ import org.eclipse.uml2.uml.EnumerationLiteral; * * @generated */ -public class CppInitImpl extends EObjectImpl implements CppInit { +public class CppInitImpl extends MinimalEObjectImpl.Container implements CppInit { /** * The default value of the '{@link #getValue() <em>Value</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java index 5ff1611f37f..52f2f1492d9 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java @@ -13,13 +13,10 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.CppRoot; @@ -36,7 +33,7 @@ import org.eclipse.papyrus.C_Cpp.CppRoot; * * @generated */ -public class CppRootImpl extends EObjectImpl implements CppRoot { +public class CppRootImpl extends MinimalEObjectImpl.Container implements CppRoot { /** * The cached value of the '{@link #getBase_package() <em>Base package</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java index ec3fd5bd057..a93f2c91de9 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java @@ -13,20 +13,14 @@ package org.eclipse.papyrus.C_Cpp.impl; import java.util.Collection; - import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EDataTypeEList; import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; - import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.ExternLibrary; @@ -48,7 +42,7 @@ import org.eclipse.papyrus.C_Cpp.ExternLibrary; * * @generated */ -public class ExternLibraryImpl extends EObjectImpl implements ExternLibrary { +public class ExternLibraryImpl extends MinimalEObjectImpl.Container implements ExternLibrary { /** * The cached value of the '{@link #getIncludePaths() <em>Include Paths</em>}' attribute list. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java index 445edd26b03..a9caa1fe592 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.External; - import org.eclipse.uml2.uml.Classifier; /** @@ -39,7 +35,7 @@ import org.eclipse.uml2.uml.Classifier; * * @generated */ -public class ExternalImpl extends EObjectImpl implements External { +public class ExternalImpl extends MinimalEObjectImpl.Container implements External { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java index a706156afd3..7c2500ed29b 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Friend; - import org.eclipse.uml2.uml.Dependency; import org.eclipse.uml2.uml.Operation; @@ -40,7 +36,7 @@ import org.eclipse.uml2.uml.Operation; * * @generated */ -public class FriendImpl extends EObjectImpl implements Friend { +public class FriendImpl extends MinimalEObjectImpl.Container implements Friend { /** * The cached value of the '{@link #getBase_dependency() <em>Base dependency</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java index 98b1c0f7e65..e28ad27bf18 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Include; - import org.eclipse.uml2.uml.PackageImport; /** @@ -43,7 +39,7 @@ import org.eclipse.uml2.uml.PackageImport; * * @generated */ -public class IncludeImpl extends EObjectImpl implements Include { +public class IncludeImpl extends MinimalEObjectImpl.Container implements Include { /** * The default value of the '{@link #getBody() <em>Body</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java index f19d48ea55f..8e835d808e0 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Inline; - import org.eclipse.uml2.uml.Operation; /** @@ -38,7 +34,7 @@ import org.eclipse.uml2.uml.Operation; * * @generated */ -public class InlineImpl extends EObjectImpl implements Inline { +public class InlineImpl extends MinimalEObjectImpl.Container implements Inline { /** * The cached value of the '{@link #getBase_operation() <em>Base operation</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java index 773c700415b..d904664b30e 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java @@ -13,13 +13,10 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.ManualGeneration; @@ -37,7 +34,7 @@ import org.eclipse.papyrus.C_Cpp.ManualGeneration; * * @generated */ -public class ManualGenerationImpl extends EObjectImpl implements ManualGeneration { +public class ManualGenerationImpl extends MinimalEObjectImpl.Container implements ManualGeneration { /** * The default value of the '{@link #getExtensionBody() <em>Extension Body</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java index 3d2cd0294b2..3bd687a2ce6 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.NoCodeGen; - import org.eclipse.uml2.uml.Element; /** @@ -38,7 +34,7 @@ import org.eclipse.uml2.uml.Element; * * @generated */ -public class NoCodeGenImpl extends EObjectImpl implements NoCodeGen { +public class NoCodeGenImpl extends MinimalEObjectImpl.Container implements NoCodeGen { /** * The cached value of the '{@link #getBase_element() <em>Base element</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java index 0baf3316362..54a10590ce2 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Ptr; - import org.eclipse.uml2.uml.Parameter; import org.eclipse.uml2.uml.Property; @@ -41,7 +37,7 @@ import org.eclipse.uml2.uml.Property; * * @generated */ -public class PtrImpl extends EObjectImpl implements Ptr { +public class PtrImpl extends MinimalEObjectImpl.Container implements Ptr { /** * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java index 0bfd518fe31..af6e5225e4e 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Ref; - import org.eclipse.uml2.uml.Parameter; import org.eclipse.uml2.uml.Property; @@ -40,7 +36,7 @@ import org.eclipse.uml2.uml.Property; * * @generated */ -public class RefImpl extends EObjectImpl implements Ref { +public class RefImpl extends MinimalEObjectImpl.Container implements Ref { /** * The cached value of the '{@link #getBase_parameter() <em>Base parameter</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java index da047385df4..91d79413203 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java @@ -13,17 +13,13 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.EStorageClass; import org.eclipse.papyrus.C_Cpp.StorageClass; - import org.eclipse.uml2.uml.Parameter; import org.eclipse.uml2.uml.Property; @@ -42,7 +38,7 @@ import org.eclipse.uml2.uml.Property; * * @generated */ -public class StorageClassImpl extends EObjectImpl implements StorageClass { +public class StorageClassImpl extends MinimalEObjectImpl.Container implements StorageClass { /** * The default value of the '{@link #getStorageClass() <em>Storage Class</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java index 31a5eb704bd..7a742a4f8e3 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java @@ -13,13 +13,10 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.TemplateBinding; @@ -37,7 +34,7 @@ import org.eclipse.papyrus.C_Cpp.TemplateBinding; * * @generated */ -public class TemplateBindingImpl extends EObjectImpl implements TemplateBinding { +public class TemplateBindingImpl extends MinimalEObjectImpl.Container implements TemplateBinding { /** * The default value of the '{@link #getBinding() <em>Binding</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java index e08e8191865..94c8e9fcd37 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java @@ -13,13 +13,10 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Template; @@ -37,7 +34,7 @@ import org.eclipse.papyrus.C_Cpp.Template; * * @generated */ -public class TemplateImpl extends EObjectImpl implements Template { +public class TemplateImpl extends MinimalEObjectImpl.Container implements Template { /** * The default value of the '{@link #getDeclaration() <em>Declaration</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java index be480f86259..b5ca4a4d2ab 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java @@ -13,13 +13,10 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.TemplateParameter; @@ -37,7 +34,7 @@ import org.eclipse.papyrus.C_Cpp.TemplateParameter; * * @generated */ -public class TemplateParameterImpl extends EObjectImpl implements TemplateParameter { +public class TemplateParameterImpl extends MinimalEObjectImpl.Container implements TemplateParameter { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java index 48617d94072..bdfd0302335 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Typedef; - import org.eclipse.uml2.uml.PrimitiveType; /** @@ -39,7 +35,7 @@ import org.eclipse.uml2.uml.PrimitiveType; * * @generated */ -public class TypedefImpl extends EObjectImpl implements Typedef { +public class TypedefImpl extends MinimalEObjectImpl.Container implements Typedef { /** * The default value of the '{@link #getDefinition() <em>Definition</em>}' attribute. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java index f27e0903b80..ed776852d28 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Union; - import org.eclipse.uml2.uml.DataType; /** @@ -38,7 +34,7 @@ import org.eclipse.uml2.uml.DataType; * * @generated */ -public class UnionImpl extends EObjectImpl implements Union { +public class UnionImpl extends MinimalEObjectImpl.Container implements Union { /** * The cached value of the '{@link #getBase_DataType() <em>Base Data Type</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java index b65063e91a2..afb08eb0cf3 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Virtual; - import org.eclipse.uml2.uml.Operation; /** @@ -38,7 +34,7 @@ import org.eclipse.uml2.uml.Operation; * * @generated */ -public class VirtualImpl extends EObjectImpl implements Virtual { +public class VirtualImpl extends MinimalEObjectImpl.Container implements Virtual { /** * The cached value of the '{@link #getBase_operation() <em>Base operation</em>}' reference. * <!-- begin-user-doc --> diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java index 2d8a41ef4d8..7dc8f56e826 100644 --- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java +++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java @@ -13,16 +13,12 @@ package org.eclipse.papyrus.C_Cpp.impl; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.papyrus.C_Cpp.C_CppPackage; import org.eclipse.papyrus.C_Cpp.Visibility; - import org.eclipse.uml2.uml.Generalization; /** @@ -39,7 +35,7 @@ import org.eclipse.uml2.uml.Generalization; * * @generated */ -public class VisibilityImpl extends EObjectImpl implements Visibility { +public class VisibilityImpl extends MinimalEObjectImpl.Container implements Visibility { /** * The default value of the '{@link #getValue() <em>Value</em>}' attribute. * <!-- begin-user-doc --> |