diff options
| author | ptessier | 2014-04-04 12:09:24 +0000 |
|---|---|---|
| committer | ptessier | 2014-04-04 12:09:24 +0000 |
| commit | 18a004eb3fa268c6a8bf4bed30498a9e8154fa3f (patch) | |
| tree | 38428e826f0c1a09fc853d644c585ef760bb62ca | |
| parent | 0296a41791f35a5091fea5c0d7cfe34c407128a7 (diff) | |
| parent | e6b92948d34a7a2f10c443f9e991ed99e4b61853 (diff) | |
| download | org.eclipse.papyrus-18a004eb3fa268c6a8bf4bed30498a9e8154fa3f.tar.gz org.eclipse.papyrus-18a004eb3fa268c6a8bf4bed30498a9e8154fa3f.tar.xz org.eclipse.papyrus-18a004eb3fa268c6a8bf4bed30498a9e8154fa3f.zip | |
Merge branch 'master' of ssh://ptessier@git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus.git
67 files changed, 1642 insertions, 1794 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF index 4797222df87..d5df075e20b 100644 --- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF +++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF @@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.cdo.dawn.gmf;bundle-version="[2.1.0,3.0.0)",
org.eclipse.emf.cdo.dawn.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",
org.eclipse.papyrus.infra.onefile;bundle-version="1.0.0",
org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.0",
org.eclipse.papyrus.cdo.validation.problems;bundle-version="1.0.0",
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 --> diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF index d04f87971a5..a41c16b7328 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Export-Package: org.eclipse.papyrus.dsml.validation.generation.ui Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.uml2.uml;bundle-version="3.1.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.1",
org.eclipse.papyrus.dsml.validation.wizard;bundle-version="1.0.0",
org.eclipse.papyrus.dsml.validation.model;bundle-version="1.0.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF index 847b35d4af2..e6657944925 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/META-INF/MANIFEST.MF @@ -1,7 +1,8 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.dsml.validation
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.uml2.uml;bundle-version="5.0.0"
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml index 7318917a64e..6096a87449d 100644 --- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml +++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation/plugin.xml @@ -18,4 +18,18 @@ provider="Eclipse Modeling Project">
</profile>
</extension>
+ <extension
+ point="org.eclipse.uml2.uml.dynamic_package">
+ <profile
+ location="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#_0"
+ uri="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML">
+ </profile>
+ </extension>
+ <extension
+ point="org.eclipse.emf.ecore.dynamic_package">
+ <resource
+ location="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML.uml#_0"
+ uri="pathmap://DSMLValidation_PROFILES/PapyrusValidationRuleDSML">
+ </resource>
+ </extension>
</plugin>
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF index 2711d42416f..c261291ee54 100644 --- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF +++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/META-INF/MANIFEST.MF @@ -9,8 +9,8 @@ Require-Bundle: org.eclipse.papyrus.marte.vsl;bundle-version="1.0.0", org.antlr.runtime,
org.eclipse.uml2.uml;bundle-version="3.1.0",
org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0",
- org.apache.log4j;bundle-version="1.2.15"
+ org.apache.log4j;bundle-version="1.2.15",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.marte.vsl.ui.contentassist,
org.eclipse.papyrus.marte.vsl.ui.contentassist.antlr
Bundle-Vendor: %providerName
diff --git a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java index 2a497a9dfdd..87e3d3ef5b1 100644 --- a/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java +++ b/extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui/src/org/eclipse/papyrus/marte/vsl/ui/contentassist/VSLProposalProvider.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2010 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 @@ -21,7 +21,6 @@ import java.util.Map; import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist.CompletionProposalUtils; import org.eclipse.papyrus.marte.vsl.extensions.VSLContextUtil; import org.eclipse.papyrus.marte.vsl.scoping.VSLScopeProvider; import org.eclipse.papyrus.marte.vsl.scoping.visitors.ScopingVisitors; @@ -45,6 +44,7 @@ import org.eclipse.papyrus.marte.vsl.vSL.VSLPackage; import org.eclipse.papyrus.marte.vsl.vSL.ValueNamePair; import org.eclipse.papyrus.marte.vsl.validation.VSLJavaValidator; import org.eclipse.papyrus.marte.vsl.validation.VSLJavaValidator.VSLValidationResult; +import org.eclipse.papyrus.uml.xtext.integration.CompletionProposalUtils; import org.eclipse.uml2.uml.Behavior; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.DurationObservation; @@ -74,464 +74,398 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; public class VSLProposalProvider extends AbstractVSLProposalProvider { @Override - public void completeExpression_Exp(EObject model, Assignment assignment, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeExpression_Exp(model, assignment, context, acceptor); } @Override - public void completeAndOrXorExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - - if (model instanceof AndOrXorExpression) { - AndOrXorExpression exp = (AndOrXorExpression)model ; - List<EqualityExpression> nestedExpressions = exp.getExp() ; - if (nestedExpressions.size() >= 2) { - VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkEqualityExpression(nestedExpressions.get(nestedExpressions.size()-2)) ; - Classifier specifiedType = (Classifier)validationResult.inferedType() ; - String operator = exp.getOp().get(nestedExpressions.size()-2) ; - if (VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { - for (Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeAndOrXorExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + + if(model instanceof AndOrXorExpression) { + AndOrXorExpression exp = (AndOrXorExpression)model; + List<EqualityExpression> nestedExpressions = exp.getExp(); + if(nestedExpressions.size() >= 2) { + VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkEqualityExpression(nestedExpressions.get(nestedExpressions.size() - 2)); + Classifier specifiedType = (Classifier)validationResult.inferedType(); + String operator = exp.getOp().get(nestedExpressions.size() - 2); + if(VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { + for(Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } } - } - else + } else { super.completeAndOrXorExpression_Exp(model, assignment, context, acceptor); + } } @Override - public void completeAndOrXorExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeAndOrXorExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeAndOrXorExpression_Op(model, assignment, context, acceptor); } @Override - public void completeEqualityExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof EqualityExpression) { - EqualityExpression exp = (EqualityExpression)model ; - List<RelationalExpression> nestedExpressions = exp.getExp() ; - if (nestedExpressions.size() >= 2) { - VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkRelationalExpression(nestedExpressions.get(nestedExpressions.size()-2)) ; - Classifier specifiedType = (Classifier)validationResult.inferedType() ; - String operator = exp.getOp().get(nestedExpressions.size()-2) ; - if (VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { - for (Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeEqualityExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof EqualityExpression) { + EqualityExpression exp = (EqualityExpression)model; + List<RelationalExpression> nestedExpressions = exp.getExp(); + if(nestedExpressions.size() >= 2) { + VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkRelationalExpression(nestedExpressions.get(nestedExpressions.size() - 2)); + Classifier specifiedType = (Classifier)validationResult.inferedType(); + String operator = exp.getOp().get(nestedExpressions.size() - 2); + if(VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { + for(Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } } - } - else + } else { super.completeEqualityExpression_Exp(model, assignment, context, acceptor); + } } @Override - public void completeEqualityExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeEqualityExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeEqualityExpression_Op(model, assignment, context, acceptor); } @Override - public void completeRelationalExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof RelationalExpression) { - RelationalExpression exp = (RelationalExpression)model ; - List<ConditionalExpression> nestedExpressions = exp.getExp() ; - if (nestedExpressions.size() >= 2) { - VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkConditionalExpression(nestedExpressions.get(nestedExpressions.size()-2)) ; - Classifier specifiedType = (Classifier)validationResult.inferedType() ; - String operator = exp.getOp().get(nestedExpressions.size()-2) ; - if (VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { - for (Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeRelationalExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof RelationalExpression) { + RelationalExpression exp = (RelationalExpression)model; + List<ConditionalExpression> nestedExpressions = exp.getExp(); + if(nestedExpressions.size() >= 2) { + VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkConditionalExpression(nestedExpressions.get(nestedExpressions.size() - 2)); + Classifier specifiedType = (Classifier)validationResult.inferedType(); + String operator = exp.getOp().get(nestedExpressions.size() - 2); + if(VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { + for(Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } - } - } - else + } + } else { super.completeRelationalExpression_Exp(model, assignment, context, acceptor); + } } @Override - public void completeRelationalExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeRelationalExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeRelationalExpression_Op(model, assignment, context, acceptor); } @Override - public void completeConditionalExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeConditionalExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeConditionalExpression_Exp(model, assignment, context, acceptor); } @Override - public void completeConditionalExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeConditionalExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeConditionalExpression_Op(model, assignment, context, acceptor); } @Override - public void completeAdditiveExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof AdditiveExpression) { - AdditiveExpression exp = (AdditiveExpression)model ; - List<MultiplicativeExpression> nestedExpressions = exp.getExp() ; - if (nestedExpressions.size() >= 2) { - VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkMultiplicativeExpression(nestedExpressions.get(nestedExpressions.size()-2)) ; - Classifier specifiedType = (Classifier)validationResult.inferedType() ; - String operator = exp.getOp().get(nestedExpressions.size()-2) ; - if (VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { - for (Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeAdditiveExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof AdditiveExpression) { + AdditiveExpression exp = (AdditiveExpression)model; + List<MultiplicativeExpression> nestedExpressions = exp.getExp(); + if(nestedExpressions.size() >= 2) { + VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkMultiplicativeExpression(nestedExpressions.get(nestedExpressions.size() - 2)); + Classifier specifiedType = (Classifier)validationResult.inferedType(); + String operator = exp.getOp().get(nestedExpressions.size() - 2); + if(VSLJavaValidator.binaryOpTypeBinding.get(operator) != null && VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType) != null) { + for(Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? ((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? ((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } } - } - else + } else { super.completeAdditiveExpression_Exp(model, assignment, context, acceptor); + } } @Override - public void completeAdditiveExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeAdditiveExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeAdditiveExpression_Op(model, assignment, context, acceptor); } @Override - public void completeMultiplicativeExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof MultiplicativeExpression) { - MultiplicativeExpression exp = (MultiplicativeExpression)model ; - List<UnaryExpression> nestedExpressions = exp.getExp() ; - if (nestedExpressions.size() >= 1) { - VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkUnaryExpression(nestedExpressions.get(nestedExpressions.size()-1)) ; - Classifier specifiedType = (Classifier)validationResult.inferedType() ; - String operator = exp.getOp().get(exp.getOp().size() == 0 ? 0 : nestedExpressions.size()-1) ; - for (Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeMultiplicativeExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof MultiplicativeExpression) { + MultiplicativeExpression exp = (MultiplicativeExpression)model; + List<UnaryExpression> nestedExpressions = exp.getExp(); + if(nestedExpressions.size() >= 1) { + VSLValidationResult validationResult = VSLJavaValidator.eInstance.checkUnaryExpression(nestedExpressions.get(nestedExpressions.size() - 1)); + Classifier specifiedType = (Classifier)validationResult.inferedType(); + String operator = exp.getOp().get(exp.getOp().size() == 0 ? 0 : nestedExpressions.size() - 1); + for(Type possibleType : VSLJavaValidator.binaryOpTypeBinding.get(operator).get(specifiedType)) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)possibleType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } - } - else + } else { super.completeMultiplicativeExpression_Exp(model, assignment, context, acceptor); + } } @Override - public void completeMultiplicativeExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeMultiplicativeExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeMultiplicativeExpression_Op(model, assignment, context, acceptor); } @Override - public void completeUnaryExpression_Op(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeUnaryExpression_Op(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeUnaryExpression_Op(model, assignment, context, acceptor); } @Override - public void completeUnaryExpression_Unary(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeUnaryExpression_Unary(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeUnaryExpression_Unary(model, assignment, context, acceptor); } @Override - public void completeUnaryExpression_Exp(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeUnaryExpression_Exp(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeUnaryExpression_Exp(model, assignment, context, acceptor); } @Override - public void completePrimaryExpression_Prefix(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completePrimaryExpression_Prefix(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completePrimaryExpression_Prefix(model, assignment, context, acceptor); } @Override - public void completePrimaryExpression_Suffix(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completePrimaryExpression_Suffix(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completePrimaryExpression_Suffix(model, assignment, context, acceptor); } @Override - public void completePropertyCallExpression_Property(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - Classifier classifierForScoping ; - if (model instanceof PrimaryExpression) { - classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(((PrimaryExpression)model).getPrefix()).getClassifierForScoping() ; - } - else { - classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping() ; + public void completePropertyCallExpression_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + Classifier classifierForScoping; + if(model instanceof PrimaryExpression) { + classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(((PrimaryExpression)model).getPrefix()).getClassifierForScoping(); + } else { + classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping(); } - List<Property> allProperties = new ArrayList<Property>() ; - if (classifierForScoping != null) { - for (Feature f : classifierForScoping.allFeatures()) { - if (f instanceof Property) - allProperties.add((Property)f) ; + List<Property> allProperties = new ArrayList<Property>(); + if(classifierForScoping != null) { + for(Feature f : classifierForScoping.allFeatures()) { + if(f instanceof Property) { + allProperties.add((Property)f); + } } } - Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allProperties) ; - IScope scope = new SimpleScope(iterableIEobjectDescription) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { - String displayString = eobjectDescription.getName() + " : " + (((Property)eobjectDescription.getEObjectOrProxy()).getType() != null ? ((Property)eobjectDescription.getEObjectOrProxy()).getType().getName() : "<Undefined>") ; - String completionString = eobjectDescription.getName().getLastSegment() ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allProperties); + IScope scope = new SimpleScope(iterableIEobjectDescription); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + String displayString = eobjectDescription.getName() + " : " + (((Property)eobjectDescription.getEObjectOrProxy()).getType() != null ? ((Property)eobjectDescription.getEObjectOrProxy()).getType().getName() : "<Undefined>"); + String completionString = eobjectDescription.getName().getLastSegment(); + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } } @Override - public void completePropertyCallExpression_Suffix(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completePropertyCallExpression_Suffix(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub - super.completePropertyCallExpression_Suffix(model, assignment, context, - acceptor); + super.completePropertyCallExpression_Suffix(model, assignment, context, acceptor); } @Override - public void completeOperationCallExpression_Operation(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - Classifier classifierForScoping ; - if (model instanceof PrimaryExpression) { - classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(((PrimaryExpression)model).getPrefix()).getClassifierForScoping() ; - } - else { - classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping() ; + public void completeOperationCallExpression_Operation(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + Classifier classifierForScoping; + if(model instanceof PrimaryExpression) { + classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(((PrimaryExpression)model).getPrefix()).getClassifierForScoping(); + } else { + classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping(); } - List<Operation> allOperations = new ArrayList<Operation>() ; - if (classifierForScoping != null) { - for (Feature f : classifierForScoping.allFeatures()) { - if (f instanceof Operation) { - Operation o = (Operation)f ; - if (o.getType() != null && - !(o.getName().equals("<") - || o.getName().equals(">") - || o.getName().equals("<=") - || o.getName().equals(">=") - || o.getName().equals("==") - || o.getName().equals("<>") - || o.getName().equals("+") - || o.getName().equals("-") - || o.getName().equals("*") - || o.getName().equals("/") - || o.getName().equals("^"))) { - allOperations.add(o) ; + List<Operation> allOperations = new ArrayList<Operation>(); + if(classifierForScoping != null) { + for(Feature f : classifierForScoping.allFeatures()) { + if(f instanceof Operation) { + Operation o = (Operation)f; + if(o.getType() != null && !(o.getName().equals("<") || o.getName().equals(">") || o.getName().equals("<=") || o.getName().equals(">=") || o.getName().equals("==") || o.getName().equals("<>") || o.getName().equals("+") || o.getName().equals("-") || o.getName().equals("*") || o.getName().equals("/") || o.getName().equals("^"))) { + allOperations.add(o); } } } } - Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allOperations) ; - IScope scope = new SimpleScope(iterableIEobjectDescription) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { - Operation calledOperation = (Operation)eobjectDescription.getEObjectOrProxy() ; - String displayString = VSLProposalUtils.buildDisplayStringForOperationCall(calledOperation) ; - String completionString = VSLProposalUtils.buildCompletionStringForOperationCall(calledOperation) ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allOperations); + IScope scope = new SimpleScope(iterableIEobjectDescription); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + Operation calledOperation = (Operation)eobjectDescription.getEObjectOrProxy(); + String displayString = VSLProposalUtils.buildDisplayStringForOperationCall(calledOperation); + String completionString = VSLProposalUtils.buildCompletionStringForOperationCall(calledOperation); + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } } @Override - public void completeOperationCallExpression_Arguments(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - - if (! (model instanceof OperationCallExpression)) - return ; - - Operation calledOperation = ((OperationCallExpression)model).getOperation() ; - if (calledOperation != null) { - Parameter firstParameter = null ; - Iterator<Parameter> allParameters = calledOperation.getOwnedParameters().iterator() ; - while (allParameters.hasNext() && firstParameter == null) { - Parameter currentParam = allParameters.next() ; - if (currentParam.getDirection() != ParameterDirectionKind.RETURN_LITERAL) - firstParameter = currentParam ; + public void completeOperationCallExpression_Arguments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + + if(!(model instanceof OperationCallExpression)) { + return; + } + + Operation calledOperation = ((OperationCallExpression)model).getOperation(); + if(calledOperation != null) { + Parameter firstParameter = null; + Iterator<Parameter> allParameters = calledOperation.getOwnedParameters().iterator(); + while(allParameters.hasNext() && firstParameter == null) { + Parameter currentParam = allParameters.next(); + if(currentParam.getDirection() != ParameterDirectionKind.RETURN_LITERAL) { + firstParameter = currentParam; + } } - if (firstParameter != null) { - Classifier expectedType = (Classifier)firstParameter.getType() ; - Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; + if(firstParameter != null) { + Classifier expectedType = (Classifier)firstParameter.getType(); + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; - } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } @@ -539,104 +473,95 @@ public class VSLProposalProvider extends AbstractVSLProposalProvider { } @Override - public void completeOperationCallExpression_Suffix(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeOperationCallExpression_Suffix(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeOperationCallExpression_Suffix(model, assignment, context, - acceptor); + super.completeOperationCallExpression_Suffix(model, assignment, context, acceptor); } @Override - public void completeNameOrChoiceOrBehaviorCall_Path(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeNameOrChoiceOrBehaviorCall_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeNameOrChoiceOrBehaviorCall_Path(model, assignment, context, - acceptor); + super.completeNameOrChoiceOrBehaviorCall_Path(model, assignment, context, acceptor); } @Override - public void completeNameOrChoiceOrBehaviorCall_Id(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof NameOrChoiceOrBehaviorCall && ((NameOrChoiceOrBehaviorCall)model).getPath() != null) { - IScope scope = VSLScopeProvider.eInstance.scope_NameOrChoiceOrBehaviorCall_id((NameOrChoiceOrBehaviorCall)model, VSLPackage.eINSTANCE.getNameOrChoiceOrBehaviorCall_Id()) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + public void completeNameOrChoiceOrBehaviorCall_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof NameOrChoiceOrBehaviorCall && ((NameOrChoiceOrBehaviorCall)model).getPath() != null) { + IScope scope = VSLScopeProvider.eInstance.scope_NameOrChoiceOrBehaviorCall_id((NameOrChoiceOrBehaviorCall)model, VSLPackage.eINSTANCE.getNameOrChoiceOrBehaviorCall_Id()); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { boolean goOn = true; - if (eobjectDescription.getEObjectOrProxy() instanceof Behavior) { - Behavior behavior = (Behavior)eobjectDescription.getEObjectOrProxy() ; - boolean behaviorHasAReturnType = false ; - for (Parameter p : behavior.getOwnedParameters()) { - if (p.getDirection() == ParameterDirectionKind.RETURN_LITERAL) - behaviorHasAReturnType = true ; + if(eobjectDescription.getEObjectOrProxy() instanceof Behavior) { + Behavior behavior = (Behavior)eobjectDescription.getEObjectOrProxy(); + boolean behaviorHasAReturnType = false; + for(Parameter p : behavior.getOwnedParameters()) { + if(p.getDirection() == ParameterDirectionKind.RETURN_LITERAL) { + behaviorHasAReturnType = true; + } } - goOn = behaviorHasAReturnType ; + goOn = behaviorHasAReturnType; } - if (goOn) { - String displayString = eobjectDescription.getName().getLastSegment() ; - String completionString = eobjectDescription.getName().getLastSegment() ; - if (eobjectDescription.getEObjectOrProxy() instanceof Behavior) { - displayString = VSLProposalUtils.buildDisplayStringForBehaviorCall((Behavior)eobjectDescription.getEObjectOrProxy()) ; - completionString = VSLProposalUtils.buildCompletionStringForBehaviorCall((Behavior)eobjectDescription.getEObjectOrProxy()) ; + if(goOn) { + String displayString = eobjectDescription.getName().getLastSegment(); + String completionString = eobjectDescription.getName().getLastSegment(); + if(eobjectDescription.getEObjectOrProxy() instanceof Behavior) { + displayString = VSLProposalUtils.buildDisplayStringForBehaviorCall((Behavior)eobjectDescription.getEObjectOrProxy()); + completionString = VSLProposalUtils.buildCompletionStringForBehaviorCall((Behavior)eobjectDescription.getEObjectOrProxy()); } - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } } - } - else { + } else { // ignore. Already handled by other rules. } } @Override - public void completeNameOrChoiceOrBehaviorCall_Arguments(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (! (model instanceof NameOrChoiceOrBehaviorCall)) - return ; - - NamedElement cddBehavior = ((NameOrChoiceOrBehaviorCall)model).getId() ; - if (cddBehavior == null || !(cddBehavior instanceof Behavior)) - return ; - Behavior calledBehavior = (Behavior)cddBehavior ; - - if (calledBehavior != null) { - Parameter firstParameter = null ; - Iterator<Parameter> allParameters = calledBehavior.getOwnedParameters().iterator() ; - while (allParameters.hasNext() && firstParameter == null) { - Parameter currentParam = allParameters.next() ; - if (currentParam.getDirection() != ParameterDirectionKind.RETURN_LITERAL) - firstParameter = currentParam ; + public void completeNameOrChoiceOrBehaviorCall_Arguments(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(!(model instanceof NameOrChoiceOrBehaviorCall)) { + return; + } + + NamedElement cddBehavior = ((NameOrChoiceOrBehaviorCall)model).getId(); + if(cddBehavior == null || !(cddBehavior instanceof Behavior)) { + return; + } + Behavior calledBehavior = (Behavior)cddBehavior; + + if(calledBehavior != null) { + Parameter firstParameter = null; + Iterator<Parameter> allParameters = calledBehavior.getOwnedParameters().iterator(); + while(allParameters.hasNext() && firstParameter == null) { + Parameter currentParam = allParameters.next(); + if(currentParam.getDirection() != ParameterDirectionKind.RETURN_LITERAL) { + firstParameter = currentParam; + } } - if (firstParameter != null) { - Classifier expectedType = (Classifier)firstParameter.getType() ; - Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + if(firstParameter != null) { + Classifier expectedType = (Classifier)firstParameter.getType(); + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } @@ -644,164 +569,149 @@ public class VSLProposalProvider extends AbstractVSLProposalProvider { } @Override - public void completeQualifiedName_Path(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeQualifiedName_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // ignore. Treated by qualifiedName_Remaining, or the context rule. } @Override - public void completeQualifiedName_Remaining(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof QualifiedName) { - IScope scope = VSLScopeProvider.eInstance.scope_QualifiedName_remaining((QualifiedName)model, VSLPackage.eINSTANCE.getQualifiedName_Remaining()) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + public void completeQualifiedName_Remaining(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof QualifiedName) { + IScope scope = VSLScopeProvider.eInstance.scope_QualifiedName_remaining((QualifiedName)model, VSLPackage.eINSTANCE.getQualifiedName_Remaining()); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { String displayString = eobjectDescription.getName() + "::"; String completionString = eobjectDescription.getName() + "::"; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } - } - else { + } else { // ignore. Should already be treated by the context rule } } @Override - public void completeInterval_IsLowerIncluded(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeInterval_IsLowerIncluded(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub //super.completeInterval_IsLowerIncluded(model, assignment, context, acceptor); } @Override - public void completeInterval_Lower(EObject model, Assignment assignment, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeInterval_Lower(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeInterval_Lower(model, assignment, context, acceptor); } @Override - public void completeInterval_Upper(EObject model, Assignment assignment, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeInterval_Upper(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeInterval_Upper(model, assignment, context, acceptor); } @Override - public void completeInterval_IsUpperIncluded(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeInterval_IsUpperIncluded(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub //super.completeInterval_IsUpperIncluded(model, assignment, context, acceptor); } @Override - public void completeCollectionOrTuple_ListOfValues(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeCollectionOrTuple_ListOfValues(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeCollectionOrTuple_ListOfValues(model, assignment, context, - acceptor); + super.completeCollectionOrTuple_ListOfValues(model, assignment, context, acceptor); } @Override - public void completeTuple_ListOfValueNamePairs(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeTuple_ListOfValueNamePairs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeTuple_ListOfValueNamePairs(model, assignment, context, acceptor); } @Override - public void completeListOfValues_Values(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof OperationCallExpression || model instanceof NameOrChoiceOrBehaviorCall || model instanceof CollectionOrTuple) - return ; // already treated by other cases - - INode node = context.getCurrentNode() ; - IDocument document = context.getViewer().getDocument() ; - char startChar = ' ' ; - char openingListChar = ' '; - int rule = -1 ; // 0 => OperationCall, 1 => BehaviorCall, 2 => CollectionOrTuple - if (model.eContainer() instanceof OperationCallExpression) { - startChar = '.' ; - openingListChar = '(' ; - rule = 0 ; + public void completeListOfValues_Values(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof OperationCallExpression || model instanceof NameOrChoiceOrBehaviorCall || model instanceof CollectionOrTuple) { + return; // already treated by other cases } - else if (model.eContainer() instanceof NameOrChoiceOrBehaviorCall) { - startChar = ' ' ; - openingListChar = '(' ; - rule = 1 ; - } - else if (model.eContainer() instanceof CollectionOrTuple) { - startChar = ' ' ; - openingListChar = '{' ; - rule = 2 ; + + INode node = context.getCurrentNode(); + IDocument document = context.getViewer().getDocument(); + char startChar = ' '; + char openingListChar = ' '; + int rule = -1; // 0 => OperationCall, 1 => BehaviorCall, 2 => CollectionOrTuple + if(model.eContainer() instanceof OperationCallExpression) { + startChar = '.'; + openingListChar = '('; + rule = 0; + } else if(model.eContainer() instanceof NameOrChoiceOrBehaviorCall) { + startChar = ' '; + openingListChar = '('; + rule = 1; + } else if(model.eContainer() instanceof CollectionOrTuple) { + startChar = ' '; + openingListChar = '{'; + rule = 2; } try { - Classifier expectedType = null ; - char[] completePrefix = document.get(0, node.getOffset()).toCharArray() ; - boolean dotCallFound = false ; - boolean openingListCharFound = false ; - int i = completePrefix.length - 1 ; - int positionInTheList = 0 ; - int closingCharacters = 0 ; - while (i > 0 && !dotCallFound) { - char currentChar = completePrefix[i] ; - if (currentChar == '(' || currentChar == '{') { - if (closingCharacters != 0) - closingCharacters-- ; - else - openingListCharFound = true ; - } - else if (currentChar == ')' || currentChar == '}') - closingCharacters ++ ; - else if (currentChar == ',') { + Classifier expectedType = null; + char[] completePrefix = document.get(0, node.getOffset()).toCharArray(); + boolean dotCallFound = false; + boolean openingListCharFound = false; + int i = completePrefix.length - 1; + int positionInTheList = 0; + int closingCharacters = 0; + while(i > 0 && !dotCallFound) { + char currentChar = completePrefix[i]; + if(currentChar == '(' || currentChar == '{') { + if(closingCharacters != 0) { + closingCharacters--; + } else { + openingListCharFound = true; + } + } else if(currentChar == ')' || currentChar == '}') { + closingCharacters++; + } else if(currentChar == ',') { //if () - if (closingCharacters == 0) - positionInTheList ++ ; - } - else if (currentChar == startChar && openingListCharFound) { - dotCallFound = true ; + if(closingCharacters == 0) { + positionInTheList++; + } + } else if(currentChar == startChar && openingListCharFound) { + dotCallFound = true; } - i-- ; + i--; } - if (openingListCharFound) { - switch (rule) { + if(openingListCharFound) { + switch(rule) { case 0: // OperationCall - OperationCallExpression callOp = (OperationCallExpression) model.eContainer() ; - if (callOp.getOperation() == null || callOp.getOperation().getOwnedParameters() == null) - return ; - List<Parameter> operationParameters = new ArrayList<Parameter>() ; - for (Parameter p : callOp.getOperation().getOwnedParameters()) { - if (p.getDirection() != ParameterDirectionKind.RETURN_LITERAL) - operationParameters.add(p) ; + OperationCallExpression callOp = (OperationCallExpression)model.eContainer(); + if(callOp.getOperation() == null || callOp.getOperation().getOwnedParameters() == null) { + return; + } + List<Parameter> operationParameters = new ArrayList<Parameter>(); + for(Parameter p : callOp.getOperation().getOwnedParameters()) { + if(p.getDirection() != ParameterDirectionKind.RETURN_LITERAL) { + operationParameters.add(p); + } } - if (positionInTheList < operationParameters.size()) { - expectedType = (Classifier)operationParameters.get(positionInTheList).getType() ; + if(positionInTheList < operationParameters.size()) { + expectedType = (Classifier)operationParameters.get(positionInTheList).getType(); } break; case 1: // BehaviorCall - NameOrChoiceOrBehaviorCall callBehav = (NameOrChoiceOrBehaviorCall) model.eContainer() ; - NamedElement cddBehavior = callBehav.getId() ; - if (cddBehavior instanceof Behavior) { - Behavior behavior = (Behavior)cddBehavior ; - if (behavior.getOwnedParameters()== null) - return ; - List<Parameter> behaviorParameters = new ArrayList<Parameter>() ; - for (Parameter p : behavior.getOwnedParameters()) { - if (p.getDirection() != ParameterDirectionKind.RETURN_LITERAL) - behaviorParameters.add(p) ; + NameOrChoiceOrBehaviorCall callBehav = (NameOrChoiceOrBehaviorCall)model.eContainer(); + NamedElement cddBehavior = callBehav.getId(); + if(cddBehavior instanceof Behavior) { + Behavior behavior = (Behavior)cddBehavior; + if(behavior.getOwnedParameters() == null) { + return; } - if (positionInTheList < behaviorParameters.size()) { - expectedType = (Classifier)behaviorParameters.get(positionInTheList).getType() ; + List<Parameter> behaviorParameters = new ArrayList<Parameter>(); + for(Parameter p : behavior.getOwnedParameters()) { + if(p.getDirection() != ParameterDirectionKind.RETURN_LITERAL) { + behaviorParameters.add(p); + } + } + if(positionInTheList < behaviorParameters.size()) { + expectedType = (Classifier)behaviorParameters.get(positionInTheList).getType(); } } break; @@ -811,730 +721,613 @@ public class VSLProposalProvider extends AbstractVSLProposalProvider { default: break; } - if (expectedType != null) { - Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + if(expectedType != null) { + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType(expectedType); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } } - } - catch (Exception exception) { - exception.printStackTrace() ; + } catch (Exception exception) { + exception.printStackTrace(); } //super.completeListOfValues_Values(model, assignment, context, acceptor); } - + @Override - public void completeListOfValueNamePairs_ValueNamePairs(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeListOfValueNamePairs_ValueNamePairs(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeListOfValueNamePairs_ValueNamePairs(model, assignment, context, - acceptor); + super.completeListOfValueNamePairs_ValueNamePairs(model, assignment, context, acceptor); } @Override - public void completeValueNamePair_Property(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeValueNamePair_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // First retrieves all the properties available for the context type, in the case where the context type is a tuple or nfp type - Classifier classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping() ; - if (! VSLContextUtil.isATupleType(classifierForScoping)) + Classifier classifierForScoping = VSLScopeProvider.eInstance.new ScopingHelper(model).getClassifierForScoping(); + if(!VSLContextUtil.isATupleType(classifierForScoping)) { // TMP solution. Forces the classifier for scoping to be nfp_duration classifierForScoping = (Classifier)VSLJavaValidator._nfp_duration; - List<Property> allProperties = new ArrayList<Property>() ; - for (Feature f : classifierForScoping.allFeatures()) { - if (f instanceof Property) - allProperties.add((Property)f) ; } - + List<Property> allProperties = new ArrayList<Property>(); + for(Feature f : classifierForScoping.allFeatures()) { + if(f instanceof Property) { + allProperties.add((Property)f); + } + } + // Removes already specified properties from the context ListOfValueNamePairs - List<Property> allReadySpecifiedProperties = new ArrayList<Property>() ; - EObject cddContextListOfValueNamePairs = model ; - if (cddContextListOfValueNamePairs instanceof Tuple) { - cddContextListOfValueNamePairs = ((Tuple)cddContextListOfValueNamePairs).getListOfValueNamePairs() ; + List<Property> allReadySpecifiedProperties = new ArrayList<Property>(); + EObject cddContextListOfValueNamePairs = model; + if(cddContextListOfValueNamePairs instanceof Tuple) { + cddContextListOfValueNamePairs = ((Tuple)cddContextListOfValueNamePairs).getListOfValueNamePairs(); } - while (cddContextListOfValueNamePairs != null && ! (cddContextListOfValueNamePairs instanceof ListOfValueNamePairs)) { - cddContextListOfValueNamePairs = cddContextListOfValueNamePairs.eContainer() ; + while(cddContextListOfValueNamePairs != null && !(cddContextListOfValueNamePairs instanceof ListOfValueNamePairs)) { + cddContextListOfValueNamePairs = cddContextListOfValueNamePairs.eContainer(); } - if (cddContextListOfValueNamePairs != null) { - ListOfValueNamePairs listOfValueNamePairs = (ListOfValueNamePairs)cddContextListOfValueNamePairs ; - for (ValueNamePair valueNamePair : listOfValueNamePairs.getValueNamePairs()) { - if (valueNamePair.getProperty() != null) - allReadySpecifiedProperties.add(valueNamePair.getProperty()) ; + if(cddContextListOfValueNamePairs != null) { + ListOfValueNamePairs listOfValueNamePairs = (ListOfValueNamePairs)cddContextListOfValueNamePairs; + for(ValueNamePair valueNamePair : listOfValueNamePairs.getValueNamePairs()) { + if(valueNamePair.getProperty() != null) { + allReadySpecifiedProperties.add(valueNamePair.getProperty()); + } } } - allProperties.removeAll(allReadySpecifiedProperties) ; - + allProperties.removeAll(allReadySpecifiedProperties); + // Then builds the proposal list - Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allProperties) ; - IScope scope = new SimpleScope(iterableIEobjectDescription) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + Iterable<IEObjectDescription> iterableIEobjectDescription = Scopes.scopedElementsFor(allProperties); + IScope scope = new SimpleScope(iterableIEobjectDescription); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { String displayString = eobjectDescription.getName() + " = "; String completionString = eobjectDescription.getName() + " = "; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } //super.completeValueNamePair_Property(model, assignment, context, acceptor); } @Override - public void completeValueNamePair_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model == null || !(model instanceof ValueNamePair)) - return ; - ValueNamePair valueNamePairRuleRule = (ValueNamePair)model ; - - if (valueNamePairRuleRule.getProperty() == null || valueNamePairRuleRule.getProperty().getType() == null) - return ; - - Property p = valueNamePairRuleRule.getProperty() ; - - Map<String,Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)p.getType()) ; - for (String s : allProposals.keySet()) { - if (s.startsWith(context.getPrefix())) { - String completionString ; - String displayString ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - } - else { - if (! s.contains("|")) { - completionString = s ; - displayString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + public void completeValueNamePair_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model == null || !(model instanceof ValueNamePair)) { + return; + } + ValueNamePair valueNamePairRuleRule = (ValueNamePair)model; + + if(valueNamePairRuleRule.getProperty() == null || valueNamePairRuleRule.getProperty().getType() == null) { + return; + } + + Property p = valueNamePairRuleRule.getProperty(); + + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)p.getType()); + for(String s : allProposals.keySet()) { + if(s.startsWith(context.getPrefix())) { + String completionString; + String displayString; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + } else { + if(!s.contains("|")) { + completionString = s; + displayString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context) ; + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(((allProposals.get(s) != null) && (allProposals.get(s) instanceof NamedElement)) ? (NamedElement)allProposals.get(s) : null, completionString, displayString, context); } - acceptor.accept(completionProposal) ; + acceptor.accept(completionProposal); } } } @Override - public void completeInstantObsExpression_Id(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - for (Element e : ScopingVisitors.recursivelyownedAndImportedInstantObservations.visit(VSLJavaValidator.getModel())) { - TimeObservation t = (TimeObservation)e ; - if (t.getName().toLowerCase().contains((context.getPrefix().toLowerCase()))) { - String displayString = t.getQualifiedName() ; - String completionString = CompletionProposalUtils.getQualifiedNameLabelWithSufficientDepth(t, VSLJavaValidator.getModel()) ; - ICompletionProposal proposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(t, completionString, displayString, context) ; - acceptor.accept(proposal) ; + public void completeInstantObsExpression_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + for(Element e : ScopingVisitors.recursivelyownedAndImportedInstantObservations.visit(VSLJavaValidator.getModel())) { + TimeObservation t = (TimeObservation)e; + if(t.getName().toLowerCase().contains((context.getPrefix().toLowerCase()))) { + String displayString = t.getQualifiedName(); + String completionString = CompletionProposalUtils.getQualifiedNameLabelWithSufficientDepth(t, VSLJavaValidator.getModel()); + ICompletionProposal proposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(t, completionString, displayString, context); + acceptor.accept(proposal); } } } @Override - public void completeInstantObsExpression_Index(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeInstantObsExpression_Index(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeInstantObsExpression_Index(model, assignment, context, acceptor); } @Override - public void completeInstantObsExpression_Condition(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeInstantObsExpression_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub - super.completeInstantObsExpression_Condition(model, assignment, context, - acceptor); + super.completeInstantObsExpression_Condition(model, assignment, context, acceptor); } @Override - public void completeInstantObsName_Path(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeInstantObsName_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // ignore. already treated by InstantObsExpression } @Override - public void completeInstantObsName_InstantId(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof InstantObsName) { - IScope scope = VSLScopeProvider.eInstance.scope_InstantObsName_instantId((InstantObsName)model, VSLPackage.eINSTANCE.getInstantObsName_InstantId()) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { - String displayString = eobjectDescription.getName().getLastSegment() ; - String completionString = eobjectDescription.getName().getLastSegment() ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + public void completeInstantObsName_InstantId(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof InstantObsName) { + IScope scope = VSLScopeProvider.eInstance.scope_InstantObsName_instantId((InstantObsName)model, VSLPackage.eINSTANCE.getInstantObsName_InstantId()); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + String displayString = eobjectDescription.getName().getLastSegment(); + String completionString = eobjectDescription.getName().getLastSegment(); + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } - } - else { + } else { // ignore. Already treated by rule InstantObsExpression_ID } } @Override - public void completeDurationObsExpression_Id(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - for (Element e : ScopingVisitors.recursivelyownedAndImportedDurationObservations.visit(VSLJavaValidator.getModel())) { - DurationObservation d = (DurationObservation)e ; - if (d.getName().toLowerCase().contains((context.getPrefix().toLowerCase()))) { - String displayString = d.getQualifiedName() ; - String completionString = CompletionProposalUtils.getQualifiedNameLabelWithSufficientDepth(d, VSLJavaValidator.getModel()) ; - ICompletionProposal proposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(d, completionString, displayString, context) ; - acceptor.accept(proposal) ; + public void completeDurationObsExpression_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + for(Element e : ScopingVisitors.recursivelyownedAndImportedDurationObservations.visit(VSLJavaValidator.getModel())) { + DurationObservation d = (DurationObservation)e; + if(d.getName().toLowerCase().contains((context.getPrefix().toLowerCase()))) { + String displayString = d.getQualifiedName(); + String completionString = CompletionProposalUtils.getQualifiedNameLabelWithSufficientDepth(d, VSLJavaValidator.getModel()); + ICompletionProposal proposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(d, completionString, displayString, context); + acceptor.accept(proposal); } } } @Override - public void completeDurationObsExpression_Index(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeDurationObsExpression_Index(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeDurationObsExpression_Index(model, assignment, context, acceptor); } @Override - public void completeDurationObsExpression_Condition(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeDurationObsExpression_Condition(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub - super.completeDurationObsExpression_Condition(model, assignment, context, - acceptor); + super.completeDurationObsExpression_Condition(model, assignment, context, acceptor); } @Override - public void completeDurationObsName_Path(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeDurationObsName_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeDurationObsName_Path(model, assignment, context, acceptor); } @Override - public void completeDurationObsName_DurationId(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model instanceof DurationObsName) { - IScope scope = VSLScopeProvider.eInstance.scope_DurationObsName_durationId((DurationObsName)model, VSLPackage.eINSTANCE.getDurationObsName_DurationId()) ; - for (IEObjectDescription eobjectDescription : scope.getAllElements()) { - if (eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { - String displayString = eobjectDescription.getName().getLastSegment() ; - String completionString = eobjectDescription.getName().getLastSegment() ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + public void completeDurationObsName_DurationId(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model instanceof DurationObsName) { + IScope scope = VSLScopeProvider.eInstance.scope_DurationObsName_durationId((DurationObsName)model, VSLPackage.eINSTANCE.getDurationObsName_DurationId()); + for(IEObjectDescription eobjectDescription : scope.getAllElements()) { + if(eobjectDescription.getName().getLastSegment().toLowerCase().contains(context.getPrefix().toLowerCase())) { + String displayString = eobjectDescription.getName().getLastSegment(); + String completionString = eobjectDescription.getName().getLastSegment(); + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)eobjectDescription.getEObjectOrProxy(), completionString, displayString, context); + acceptor.accept(completionProposal); } } - } - else { + } else { // ignore. Already treated by rule DurationObsExpression_ID } } @Override - public void completeJitterExp_FirstInstant(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (!context.getPrefix().equals("@")) { - String displayString = "@" ; - String completionString = "@" ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(null, completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + public void completeJitterExp_FirstInstant(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(!context.getPrefix().equals("@")) { + String displayString = "@"; + String completionString = "@"; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(null, completionString, displayString, context); + acceptor.accept(completionProposal); } } @Override - public void completeJitterExp_SecondInstant(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (!context.getPrefix().equals("@")) { - String displayString = "@" ; - String completionString = "@" ; - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(null, completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + public void completeJitterExp_SecondInstant(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(!context.getPrefix().equals("@")) { + String displayString = "@"; + String completionString = "@"; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(null, completionString, displayString, context); + acceptor.accept(completionProposal); } } @Override - public void completeVariableDeclaration_VariableDeclaration(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeVariableDeclaration_VariableDeclaration(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeVariableDeclaration_VariableDeclaration(model, assignment, - context, acceptor); + super.completeVariableDeclaration_VariableDeclaration(model, assignment, context, acceptor); } @Override - public void completeVariableDeclaration_Name(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeVariableDeclaration_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeVariableDeclaration_Name(model, assignment, context, acceptor); } @Override - public void completeVariableDeclaration_Type(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeVariableDeclaration_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeVariableDeclaration_Type(model, assignment, context, acceptor); } @Override - public void completeVariableDeclaration_InitValue(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeVariableDeclaration_InitValue(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - super.completeVariableDeclaration_InitValue(model, assignment, context, - acceptor); + super.completeVariableDeclaration_InitValue(model, assignment, context, acceptor); } @Override - public void completeDataTypeName_Path(EObject model, Assignment assignment, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeDataTypeName_Path(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeDataTypeName_Path(model, assignment, context, acceptor); } @Override - public void completeDataTypeName_Type(EObject model, Assignment assignment, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void completeDataTypeName_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.completeDataTypeName_Type(model, assignment, context, acceptor); } @Override - public void completeIntegerLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeIntegerLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeIntegerLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeUnlimitedLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeUnlimitedLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeUnlimitedLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeRealLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeRealLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeRealLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeDateTimeLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeDateTimeLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeDateTimeLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeBooleanLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeBooleanLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeBooleanLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeNullLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeNullLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeNullLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeDefaultLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeDefaultLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeDefaultLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void completeStringLiteralRule_Value(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void completeStringLiteralRule_Value(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.completeStringLiteralRule_Value(model, assignment, context, acceptor); } @Override - public void complete_Expression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_Expression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.complete_Expression(model, ruleCall, context, acceptor); } @Override - public void complete_AndOrXorExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_AndOrXorExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.complete_AndOrXorExpression(model, ruleCall, context, acceptor); } @Override - public void complete_EqualityExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_EqualityExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // Auto-generated method stub super.complete_EqualityExpression(model, ruleCall, context, acceptor); } @Override - public void complete_RelationalExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_RelationalExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_RelationalExpression(model, ruleCall, context, acceptor); } @Override - public void complete_ConditionalExpression(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_ConditionalExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_ConditionalExpression(model, ruleCall, context, acceptor); } @Override - public void complete_AdditiveExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_AdditiveExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_AdditiveExpression(model, ruleCall, context, acceptor); } @Override - public void complete_MultiplicativeExpression(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_MultiplicativeExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_MultiplicativeExpression(model, ruleCall, context, acceptor); } @Override - public void complete_UnaryExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_UnaryExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_UnaryExpression(model, ruleCall, context, acceptor); } @Override - public void complete_PrimaryExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_PrimaryExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_PrimaryExpression(model, ruleCall, context, acceptor); } @Override - public void complete_ValueSpecification(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_ValueSpecification(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_ValueSpecification(model, ruleCall, context, acceptor); } @Override - public void complete_SuffixExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_SuffixExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_SuffixExpression(model, ruleCall, context, acceptor); } @Override - public void complete_PropertyCallExpression(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_PropertyCallExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_PropertyCallExpression(model, ruleCall, context, acceptor); } @Override - public void complete_OperationCallExpression(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_OperationCallExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_OperationCallExpression(model, ruleCall, context, acceptor); } @Override - public void complete_Literal(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_Literal(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_Literal(model, ruleCall, context, acceptor); } @Override - public void complete_NameOrChoiceOrBehaviorCall(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_NameOrChoiceOrBehaviorCall(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub //super.complete_NameOrChoiceOrBehaviorCall(model, ruleCall, context, acceptor); } @Override - public void complete_QualifiedName(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_QualifiedName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_QualifiedName(model, ruleCall, context, acceptor); } @Override - public void complete_Interval(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_Interval(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_Interval(model, ruleCall, context, acceptor); } @Override - public void complete_CollectionOrTuple(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_CollectionOrTuple(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_CollectionOrTuple(model, ruleCall, context, acceptor); } @Override - public void complete_Tuple(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_Tuple(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_Tuple(model, ruleCall, context, acceptor); } @Override - public void complete_ListOfValues(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_ListOfValues(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_ListOfValues(model, ruleCall, context, acceptor); } @Override - public void complete_ListOfValueNamePairs(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_ListOfValueNamePairs(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_ListOfValueNamePairs(model, ruleCall, context, acceptor); } @Override - public void complete_ValueNamePair(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_ValueNamePair(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_ValueNamePair(model, ruleCall, context, acceptor); } @Override - public void complete_TimeExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_TimeExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_TimeExpression(model, ruleCall, context, acceptor); } @Override - public void complete_InstantObsExpression(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_InstantObsExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_InstantObsExpression(model, ruleCall, context, acceptor); } @Override - public void complete_InstantObsName(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_InstantObsName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - + super.complete_InstantObsName(model, ruleCall, context, acceptor); } @Override - public void complete_DurationObsExpression(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_DurationObsExpression(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DurationObsExpression(model, ruleCall, context, acceptor); } @Override - public void complete_DurationObsName(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_DurationObsName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DurationObsName(model, ruleCall, context, acceptor); } @Override - public void complete_JitterExp(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_JitterExp(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_JitterExp(model, ruleCall, context, acceptor); } @Override - public void complete_VariableDeclaration(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_VariableDeclaration(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_VariableDeclaration(model, ruleCall, context, acceptor); } @Override - public void complete_VariableDirectionKind(EObject model, - RuleCall ruleCall, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { + public void complete_VariableDirectionKind(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_VariableDirectionKind(model, ruleCall, context, acceptor); } @Override - public void complete_DataTypeName(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_DataTypeName(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DataTypeName(model, ruleCall, context, acceptor); } @Override - public void complete_NumberLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_NumberLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_NumberLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_IntegerLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_IntegerLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_IntegerLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_IntegerLiteral(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_IntegerLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_IntegerLiteral(model, ruleCall, context, acceptor); } @Override - public void complete_UnlimitedLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_UnlimitedLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_UnlimitedLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_RealLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_RealLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_RealLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_RealLiteral(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_RealLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_RealLiteral(model, ruleCall, context, acceptor); } @Override - public void complete_DateTimeLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_DateTimeLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DateTimeLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_DateTimeLiteral(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_DateTimeLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DateTimeLiteral(model, ruleCall, context, acceptor); } @Override - public void complete_BooleanLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_BooleanLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_BooleanLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_BooleanLiteral(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_BooleanLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_BooleanLiteral(model, ruleCall, context, acceptor); } @Override - public void complete_NullLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_NullLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_NullLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_NullLiteral(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_NullLiteral(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_NullLiteral(model, ruleCall, context, acceptor); } @Override - public void complete_DefaultLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_DefaultLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_DefaultLiteralRule(model, ruleCall, context, acceptor); } @Override - public void complete_StringLiteralRule(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_StringLiteralRule(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub super.complete_StringLiteralRule(model, ruleCall, context, acceptor); } @Override - public void completeKeyword(Keyword keyword, - ContentAssistContext contentAssistContext, - ICompletionProposalAcceptor acceptor) { + public void completeKeyword(Keyword keyword, ContentAssistContext contentAssistContext, ICompletionProposalAcceptor acceptor) { // TODO Auto-generated method stub - if (!contentAssistContext.getPrefix().equals("")) { - if (keyword.getValue().startsWith(contentAssistContext.getPrefix())) + if(!contentAssistContext.getPrefix().equals("")) { + if(keyword.getValue().startsWith(contentAssistContext.getPrefix())) { super.completeKeyword(keyword, contentAssistContext, acceptor); + } } } @Override - public void complete_STRING(EObject model, RuleCall ruleCall, - ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + public void complete_STRING(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { // super.complete_STRING(model, ruleCall, context, acceptor); } - + } diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF index 5138be76919..f08b6986572 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/META-INF/MANIFEST.MF @@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext;bundl org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
org.eclipse.papyrus.marte.vsl;bundle-version="1.0.0",
org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ui/contributions/ConstraintWithVSLPopupEditorConfiguration.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ui/contributions/ConstraintWithVSLPopupEditorConfiguration.java index 7c2c3e770d6..7539d50b219 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ui/contributions/ConstraintWithVSLPopupEditorConfiguration.java +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/ui/contributions/ConstraintWithVSLPopupEditorConfiguration.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -14,37 +14,28 @@ package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui.contributions;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXtextEMFReconciler;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintRule;
import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.constraintWithVSLl.ConstraintSpecification;
import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui.internal.ConstraintWithVSLlActivator;
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.ConstraintWithVSLlJavaValidator;
-import org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation.SemanticValidator;
import org.eclipse.papyrus.marte.vsl.extensions.VSLSerializationUtil;
-import org.eclipse.papyrus.marte.vsl.validation.VSLJavaValidator;
+import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;
import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.OpaqueExpression;
import org.eclipse.uml2.uml.UMLFactory;
import com.google.inject.Injector;
-public class ConstraintWithVSLPopupEditorConfiguration extends PopupEditorConfiguration {
-
- private Constraint constraint = null;
-
- private String newBody = "";
+public class ConstraintWithVSLPopupEditorConfiguration extends DefaultXtextDirectEditorConfiguration implements ICustomDirectEditorConfiguration {
public ConstraintWithVSLPopupEditorConfiguration() {
super();
@@ -74,95 +65,17 @@ public class ConstraintWithVSLPopupEditorConfiguration extends PopupEditorConfig }
}
-
-
- @Override
- public IPopupEditorHelper createPopupEditorHelper(Object editPart) {
- // resolves the edit part, and the associated semantic element
- IGraphicalEditPart graphicalEditPart = null;
- if(!(editPart instanceof IGraphicalEditPart)) {
- return null;
- }
- graphicalEditPart = (IGraphicalEditPart)editPart;
- if(!(graphicalEditPart.resolveSemanticElement() instanceof Constraint)) {
- return null;
- }
- constraint = (Constraint)graphicalEditPart.resolveSemanticElement();
-
- ConstraintWithVSLlJavaValidator.init(constraint);
- // initializes VSL editor
- VSLJavaValidator.init(constraint);
-
- // retrieves the XText injector
- Injector injector = ConstraintWithVSLlActivator.getInstance().getInjector("org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ConstraintWithVSLl");
-
- // builds the text content and extension for a temporary file, to be edited by the xtext editor
- String textToEdit = "" + this.getTextToEdit(graphicalEditPart.resolveSemanticElement());
- String fileExtension = "" + ".constraintwithvsl";
-
- // builds a new IXtextEMFReconciler.
- // Its purpose is to extract any relevant information from the textual specification,
- // and then merge it in the context UML model if necessary
- IXtextEMFReconciler reconciler = new IXtextEMFReconciler() {
-
- public void reconcile(EObject modelObject, EObject xtextObject) {
-
- ConstraintSpecification newSpecification = null;
-
- ConstraintRule rule = (ConstraintRule)xtextObject;
- newSpecification = rule.getSpecification();
- if(newSpecification != null) {
- newBody = VSLSerializationUtil.printExpression(newSpecification.getExpression());
- }
-
- // Creates and executes the update command
- // org.eclipse.gmf.runtime.common.core.command.CompositeCommand updateCommand = getUpdateCommand(constraint) ;
- // List<Constraint> editedObjects = new ArrayList<Constraint>() ; editedObjects.add(constraint) ;
- // TransactionalEditingDomain editingDomain = EMFUtils.getTransactionalEditingDomain(editedObjects);
- //
- // if(updateCommand.canExecute() && !(TransactionUtil.isReadTransactionInProgress(editingDomain, true, true))) {
- // try {
- // OperationHistoryFactory.getOperationHistory().execute(updateCommand, new NullProgressMonitor(), null);
- // } catch (ExecutionException e) {
- // log.error(e);
- // }
- // return;
- // }
-
- UpdateConstraintWithVSLCommand updateCommand = new UpdateConstraintWithVSLCommand(constraint);
-
- try {
- OperationHistoryFactory.getOperationHistory().execute(updateCommand, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- System.out.println(e);
- }
-
- }
- };
- return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new SemanticValidator());
- }
-
- private CompositeCommand getUpdateCommand(EObject editedObject) {
- org.eclipse.gmf.runtime.common.core.command.CompositeCommand updateCommand = new CompositeCommand("Property update");
- //IElementEditService provider = ElementEditServiceUtils.getCommandProvider(editedObject);
-
- //SetRequest setIsDerivedRequest = new SetRequest(editedObject, UMLPackage.eINSTANCE.getProperty_IsDerived(), newIsDerived) ;
- //ICommand setIsDerivedCommand = provider.getEditCommand(setIsDerivedRequest) ;
- //updateCommand.add(setIsDerivedCommand) ;
-
-
- return updateCommand;
- }
-
/**
* @author CEA LIST
- *
+ *
* A command for updating the context UML model
*/
protected class UpdateConstraintWithVSLCommand extends AbstractTransactionalCommand {
private Constraint theConstraint;
+ private String newBody;
+
/*
* (non-Javadoc)
*
@@ -184,9 +97,43 @@ public class ConstraintWithVSLPopupEditorConfiguration extends PopupEditorConfig return CommandResult.newOKCommandResult(theConstraint);
}
- public UpdateConstraintWithVSLCommand(Constraint constraint) {
- super(EditorUtils.getTransactionalEditingDomain(), "Constraint Update", getWorkspaceFiles(constraint));
+ public UpdateConstraintWithVSLCommand(Constraint constraint, String newBody) {
+ super((TransactionalEditingDomain)EMFHelper.resolveEditingDomain(constraint), "Constraint Update", getWorkspaceFiles(constraint));
this.theConstraint = constraint;
+ this.newBody = newBody;
}
}
+
+ @Override
+ public Injector getInjector() {
+ return ConstraintWithVSLlActivator.getInstance().getInjector("org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ConstraintWithVSLl");
+ }
+
+
+ @Override
+ protected ICommand getParseCommand(EObject umlObject, EObject xtextObject) {
+ ConstraintSpecification newSpecification = null;
+
+ ConstraintRule rule = (ConstraintRule)xtextObject;
+ newSpecification = rule.getSpecification();
+ String newBody = null;
+ if(newSpecification != null) {
+ newBody = VSLSerializationUtil.printExpression(newSpecification.getExpression());
+ }
+
+ if(!(umlObject instanceof Constraint)) {
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ if(newBody == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ Constraint constraint = (Constraint)umlObject;
+
+ UpdateConstraintWithVSLCommand updateCommand = new UpdateConstraintWithVSLCommand(constraint, newBody);
+
+ return updateCommand;
+ }
+
}
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF index 31e644d15b8..3040748f531 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
org.eclipse.papyrus.marte.vsl;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/SemanticValidator.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/SemanticValidator.java deleted file mode 100644 index ed14da8db4a..00000000000 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/constraintwithvsl/xtext/validation/SemanticValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.validation;
-
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator;
-
-/**
- * Custom implementation for IXtextSemanticValidator in the context of the textual editor for constraints coupled with VSL
- *
- * @author CEA LIST
- *
- */
-public class SemanticValidator implements IXTextSemanticValidator {
-
- public boolean validate() {
- return ConstraintWithVSLlJavaValidator.validate();
- }
-
-}
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF index 36f70776916..0ee797995fb 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl. org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
org.eclipse.papyrus.marte.vsl;bundle-version="1.0.0",
org.eclipse.papyrus.marte.vsl.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contentassist/StereotypeApplicationWithVSLProposalProvider.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contentassist/StereotypeApplicationWithVSLProposalProvider.java index 1c3c0a4c654..f420db6ef94 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contentassist/StereotypeApplicationWithVSLProposalProvider.java +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contentassist/StereotypeApplicationWithVSLProposalProvider.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2010 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 @@ -21,11 +21,10 @@ import java.util.Map; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.contentassist.CompletionProposalUtils; import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.StereotypeApplicationRule; import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.TagSpecificationRule; -import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui.contentassist.AbstractStereotypeApplicationWithVSLProposalProvider; import org.eclipse.papyrus.marte.vsl.ui.contentassist.VSLProposalUtils; +import org.eclipse.papyrus.uml.xtext.integration.CompletionProposalUtils; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.NamedElement; @@ -34,148 +33,144 @@ import org.eclipse.uml2.uml.TypedElement; import org.eclipse.xtext.Assignment; import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext; import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor; + /** * see http://www.eclipse.org/Xtext/documentation/latest/xtext.html#contentAssist on how to customize content assistant */ public class StereotypeApplicationWithVSLProposalProvider extends AbstractStereotypeApplicationWithVSLProposalProvider { @Override - public void completeTagSpecificationRule_Property(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - List<NamedElement> visibleProperties = getVisibleProperties(model) ; - visibleProperties = this.sortByKindAndName(visibleProperties) ; - for (EObject o : visibleProperties) { - NamedElement namedElement = (NamedElement) o ; - if (namedElement.getName().toLowerCase().contains(context.getPrefix().toLowerCase())) { - String completionString = - context.getPrefix() + namedElement.getName().substring(context.getPrefix().length()) + " = "; - String displayString = namedElement.getName() ; - if (namedElement instanceof TypedElement) { - TypedElement typedElement = (TypedElement) namedElement ; - displayString += typedElement.getType() != null ? - " : " + typedElement.getType().getName(): - "" ; + public void completeTagSpecificationRule_Property(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + List<NamedElement> visibleProperties = getVisibleProperties(model); + visibleProperties = this.sortByKindAndName(visibleProperties); + for(EObject o : visibleProperties) { + NamedElement namedElement = (NamedElement)o; + if(namedElement.getName().toLowerCase().contains(context.getPrefix().toLowerCase())) { + String completionString = context.getPrefix() + namedElement.getName().substring(context.getPrefix().length()) + " = "; + String displayString = namedElement.getName(); + if(namedElement instanceof TypedElement) { + TypedElement typedElement = (TypedElement)namedElement; + displayString += typedElement.getType() != null ? " : " + typedElement.getType().getName() : ""; } - ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(namedElement, completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + ICompletionProposal completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix(namedElement, completionString, displayString, context); + acceptor.accept(completionProposal); } } } - + private List<NamedElement> getVisibleProperties(EObject rule) { - List<NamedElement> visibleProperties = new ArrayList<NamedElement>() ; + List<NamedElement> visibleProperties = new ArrayList<NamedElement>(); // first retrieves the context stereotype - EObject context = rule ; - while (context != null && !(context instanceof StereotypeApplicationRule)) { - context = context.eContainer() ; + EObject context = rule; + while(context != null && !(context instanceof StereotypeApplicationRule)) { + context = context.eContainer(); } - if (context != null) { + if(context != null) { // retrieves the stereotype which is applied - StereotypeApplicationRule stAppRule = (StereotypeApplicationRule)context ; - if (stAppRule.getStereotype() != null) { - // add all the available properties for this stereotype - visibleProperties.addAll(stAppRule.getStereotype().getAllAttributes()) ; + StereotypeApplicationRule stAppRule = (StereotypeApplicationRule)context; + if(stAppRule.getStereotype() != null) { + // add all the available properties for this stereotype + visibleProperties.addAll(stAppRule.getStereotype().getAllAttributes()); // removes derived properties or those which name starts with "base_" - List<Property> filteredList = new ArrayList<Property>(stAppRule.getStereotype().getAllAttributes()) ; - for (Property p : filteredList) { - if (p.getName() == null || - p.getName().startsWith("base_") || - p.isDerived()) - visibleProperties.remove(p) ; + List<Property> filteredList = new ArrayList<Property>(stAppRule.getStereotype().getAllAttributes()); + for(Property p : filteredList) { + if(p.getName() == null || p.getName().startsWith("base_") || p.isDerived()) { + visibleProperties.remove(p); + } } // removes the ones which have already been used - if (stAppRule.getTagSpecification() != null) { - for (TagSpecificationRule tag : stAppRule.getTagSpecification()) { - if (tag.getProperty() != null && visibleProperties.contains(tag.getProperty())) - visibleProperties.remove(tag.getProperty()) ; + if(stAppRule.getTagSpecification() != null) { + for(TagSpecificationRule tag : stAppRule.getTagSpecification()) { + if(tag.getProperty() != null && visibleProperties.contains(tag.getProperty())) { + visibleProperties.remove(tag.getProperty()); + } } } } } - return visibleProperties ; + return visibleProperties; } - + @Override - public void completeExpressionValueRule_Expression(EObject model, - Assignment assignment, ContentAssistContext context, - ICompletionProposalAcceptor acceptor) { - if (model.eContainer() == null || !(model.eContainer() instanceof TagSpecificationRule)) - return ; - TagSpecificationRule tagSpecificationRule = (TagSpecificationRule)model.eContainer() ; - - if (tagSpecificationRule.getProperty() == null || tagSpecificationRule.getProperty().getType() == null) - return ; - - Property p = tagSpecificationRule.getProperty() ; - - Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)p.getType(), p) ; - + public void completeExpressionValueRule_Expression(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { + if(model.eContainer() == null || !(model.eContainer() instanceof TagSpecificationRule)) { + return; + } + TagSpecificationRule tagSpecificationRule = (TagSpecificationRule)model.eContainer(); + + if(tagSpecificationRule.getProperty() == null || tagSpecificationRule.getProperty().getType() == null) { + return; + } + + Property p = tagSpecificationRule.getProperty(); + + Map<String, Element> allProposals = VSLProposalUtils.buildProposalForType((Classifier)p.getType(), p); + // List<String> allProposals = ProposalUtils.buildProposalForType((Classifier)p.getType()) ; - for (String s : allProposals.keySet()) { - String completionString = s.substring(context.getPrefix().length()) ; - String displayString = s ; - ICompletionProposal completionProposal = null ; - if (allProposals.get(s) == null) { - completionString = s.substring(context.getPrefix().length()) ; - displayString = s ; - completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context) ; - acceptor.accept(completionProposal) ; - } - else { - if (! s.contains("|")) { - displayString = s ; - completionString = s ; - } - else { - completionString = s.substring(0, s.indexOf("|")) ; - displayString = s.substring(s.indexOf("|") + 1) ; + for(String s : allProposals.keySet()) { + String completionString = s.substring(context.getPrefix().length()); + String displayString = s; + ICompletionProposal completionProposal = null; + if(allProposals.get(s) == null) { + completionString = s.substring(context.getPrefix().length()); + displayString = s; + completionProposal = CompletionProposalUtils.createCompletionProposal(completionString, displayString, context); + acceptor.accept(completionProposal); + } else { + if(!s.contains("|")) { + displayString = s; + completionString = s; + } else { + completionString = s.substring(0, s.indexOf("|")); + displayString = s.substring(s.indexOf("|") + 1); } - if (displayString.contains(context.getPrefix())) { - completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)allProposals.get(s), completionString, displayString, context) ; - acceptor.accept(completionProposal) ; + if(displayString.contains(context.getPrefix())) { + completionProposal = CompletionProposalUtils.createCompletionProposalWithReplacementOfPrefix((NamedElement)allProposals.get(s), completionString, displayString, context); + acceptor.accept(completionProposal); } } } //super.completeExpressionValueRule_Expression(model, assignment, context, // acceptor); } - + /* ************************************************* * * Private utility method for sorting a list of NamedElement by kind and name * - **************************************************/ + * ************************************************ + */ protected List<NamedElement> sortByKindAndName(List<NamedElement> list) { - List<NamedElement> sortedList = new ArrayList<NamedElement>() ; - HashMap<EClass, List<NamedElement>> namedElementGroups = new HashMap<EClass, List<NamedElement>>() ; - - for (NamedElement n : list) { - if (! namedElementGroups.containsKey(n.eClass())) { - List<NamedElement> group = new ArrayList<NamedElement>() ; - group.add(n) ; - namedElementGroups.put(n.eClass(), group) ; - } - else { - List<NamedElement> group = namedElementGroups.get(n.eClass()) ; - boolean inserted = false ; - for (int i = 0 ; inserted == false && i < group.size() ; i++) { - if (group.get(i).getName().compareTo(n.getName()) > 0) { - group.add(i, n) ; - inserted = true ; + List<NamedElement> sortedList = new ArrayList<NamedElement>(); + HashMap<EClass, List<NamedElement>> namedElementGroups = new HashMap<EClass, List<NamedElement>>(); + + for(NamedElement n : list) { + if(!namedElementGroups.containsKey(n.eClass())) { + List<NamedElement> group = new ArrayList<NamedElement>(); + group.add(n); + namedElementGroups.put(n.eClass(), group); + } else { + List<NamedElement> group = namedElementGroups.get(n.eClass()); + boolean inserted = false; + for(int i = 0; inserted == false && i < group.size(); i++) { + if(group.get(i).getName().compareTo(n.getName()) > 0) { + group.add(i, n); + inserted = true; } } - if (!inserted) group.add(n) ; - namedElementGroups.put(n.eClass(), group) ; + if(!inserted) { + group.add(n); + } + namedElementGroups.put(n.eClass(), group); } } - - for (EClass c : namedElementGroups.keySet()) { - List<NamedElement> group = namedElementGroups.get(c) ; - sortedList.addAll(group) ; + + for(EClass c : namedElementGroups.keySet()) { + List<NamedElement> group = namedElementGroups.get(c); + sortedList.addAll(group); } - - return sortedList ; + + return sortedList; } } diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java index c6fddadf2c0..100cf001bd2 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -22,10 +22,10 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
@@ -43,6 +43,7 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler /**
* {@inheritDoc}
*/
+ @Override
public Object execute(ExecutionEvent event) {
Display current = Display.getCurrent();
@@ -63,19 +64,17 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler /**
* Convert each selected elements from the explorator menu, or modeling view
* to an EObject and add it to a list
- *
+ *
* @return list of EObject
*/
public void updateSelectedEObject() {
Vector<EObject> currentSelectedEObjects = new Vector<EObject>();
// Retrieve selected elements
- IStructuredSelection selection = (IStructuredSelection)PlatformUI
- .getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService().getSelection();
+ IStructuredSelection selection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
- Iterator<?> eltIt = (Iterator<?>)selection.iterator();
+ Iterator<?> eltIt = selection.iterator();
while(eltIt.hasNext()) {
Object currentObject = eltIt.next();
@@ -83,12 +82,10 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler // If the object is an edit part, try to get semantic bridge
if(currentObject instanceof GraphicalEditPart) {
GraphicalEditPart editPart = (GraphicalEditPart)currentObject;
- if(editPart.getModel() instanceof View) {
- View view = (View)editPart.getModel();
- if(view.getElement() instanceof Element) {
- currentObject = (Element)view.getElement();
- new StereotypeApplicationPopupEditorConfigurationContribution().createPopupEditorHelper(editPart).showEditor();
- }
+ EObject semantic = EMFHelper.getEObject(editPart);
+ if(semantic instanceof Element) {
+ //FIXME: The new XText integration doesn't support direct dialog creation on an edit part (The TextAwareEditPart is supposed to handle this case itself)
+ //DirectEditManager manager = new StereotypeApplicationPopupEditorConfigurationContribution().createDirectEditManager(editPart);
}
}
@@ -110,7 +107,7 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler /**
* Convert each selected elements from the explorator menu, or modeling view
* to an EObject and add it to a list
- *
+ *
* @return list of EObject
*/
public EObject getSelectedEObject() {
@@ -127,16 +124,19 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler private List<EObject> selectedEObjects;
+ @Override
public void run(IAction action) {
// TODO Auto-generated method stub
this.execute(null);
}
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/StereotypeApplicationPopupEditorConfigurationContribution.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/StereotypeApplicationPopupEditorConfigurationContribution.java index e04fc28a14c..6dda059f610 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/StereotypeApplicationPopupEditorConfigurationContribution.java +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/StereotypeApplicationPopupEditorConfigurationContribution.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -17,30 +17,28 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.infra.core.utils.EditorUtils;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration;
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXtextEMFReconciler;
+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.ExpressionValueRule;
import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.StereotypeApplicationRule;
import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.StereotypeApplicationsRule;
import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.TagSpecificationRule;
import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui.internal.StereotypeApplicationWithVSLActivator;
-import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.validation.SemanticValidator;
import org.eclipse.papyrus.marte.vsl.extensions.VSLSerializationUtil;
import org.eclipse.papyrus.marte.vsl.ui.contentassist.VSLProposalUtils;
import org.eclipse.papyrus.marte.vsl.vSL.CollectionOrTuple;
import org.eclipse.papyrus.marte.vsl.vSL.Expression;
import org.eclipse.papyrus.marte.vsl.vSL.NameOrChoiceOrBehaviorCall;
import org.eclipse.papyrus.marte.vsl.validation.VSLJavaValidator;
+import org.eclipse.papyrus.uml.xtext.integration.DefaultXtextDirectEditorConfiguration;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.EnumerationLiteral;
import org.eclipse.uml2.uml.NamedElement;
@@ -54,81 +52,11 @@ import com.google.inject.Injector; /**
* @author CEA LIST
- *
- *
+ *
+ *
*/
-public class StereotypeApplicationPopupEditorConfigurationContribution extends PopupEditorConfiguration {
-
- private Element stereotypedElement = null;
-
- private StereotypeApplicationsRule stereotypeApplicationsObject = null;
-
- private Injector injector = null;
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.papyrus.infra.gmfdiag.xtext.glue.PopupEditorConfiguration#createPopupEditorHelper(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart)
- */
-
- @Override
- public IPopupEditorHelper createPopupEditorHelper(Object editPart) {
-
- // resolves the edit part, and the associated semantic element
- IGraphicalEditPart graphicalEditPart = null;
- if(!(editPart instanceof IGraphicalEditPart)) {
- return null;
- }
- graphicalEditPart = (IGraphicalEditPart)editPart;
-
- if(!(graphicalEditPart.resolveSemanticElement() instanceof Element)) {
- return null;
- }
- stereotypedElement = (Element)graphicalEditPart.resolveSemanticElement();
-
- // initializes VSL editor
- VSLJavaValidator.init(stereotypedElement);
-
- // retrieves the XText injector
- injector = StereotypeApplicationWithVSLActivator.getInstance().getInjector("org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.StereotypeApplicationWithVSL");
- //VSLJavaValidator.eInstance = injector.getInstance(VSLJavaValidator.class) ;
-
- // builds the text content and extension for a temporary file, to be edited by the xtext editor
- String textToEdit = "" + this.getTextToEdit(graphicalEditPart.resolveSemanticElement());
- String fileExtension = "" + ".StereotypeApplicationWithVSL";
-
- // builds a new IXtextEMFReconciler.
- // Its purpose is to extract any relevant information from the textual specification,
- // and then merge it in the context UML model if necessary
- IXtextEMFReconciler reconciler = new IXtextEMFReconciler() {
+public class StereotypeApplicationPopupEditorConfigurationContribution extends DefaultXtextDirectEditorConfiguration implements ICustomDirectEditorConfiguration {
- public void reconcile(EObject modelObject, EObject xtextObject) {
- // first: retrieves / determines if the xtextObject is a TransitionRule object
- EObject modifiedObject = xtextObject;
- if(!(modelObject instanceof Element)) {
- return;
- }
- while(xtextObject != null && !(xtextObject instanceof StereotypeApplicationsRule)) {
- modifiedObject = modifiedObject.eContainer();
- }
- if(modifiedObject == null) {
- return;
- }
- stereotypeApplicationsObject = (StereotypeApplicationsRule)xtextObject;
-
- // Creates and executes the update command
- UpdateStereotypeApplicationsCommand updateCommand = new UpdateStereotypeApplicationsCommand(stereotypedElement);
-
- try {
- OperationHistoryFactory.getOperationHistory().execute(updateCommand, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- System.out.println(e);
- }
- }
- };
- return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new SemanticValidator());
- }
/*
* (non-Javadoc)
@@ -234,13 +162,15 @@ public class StereotypeApplicationPopupEditorConfigurationContribution extends P /**
* @author CEA LIST
- *
+ *
* A command for updating the context UML model
*/
protected class UpdateStereotypeApplicationsCommand extends AbstractTransactionalCommand {
private Element stereotypedElement;
+ private StereotypeApplicationsRule stereotypeApplicationsObject;
+
/*
* (non-Javadoc)
*
@@ -335,9 +265,37 @@ public class StereotypeApplicationPopupEditorConfigurationContribution extends P return CommandResult.newOKCommandResult(stereotypedElement);
}
- public UpdateStereotypeApplicationsCommand(Element stereotypedElement) {
- super(EditorUtils.getTransactionalEditingDomain(), "Stereotype Applications Update", getWorkspaceFiles(stereotypedElement));
+ public UpdateStereotypeApplicationsCommand(Element stereotypedElement, StereotypeApplicationsRule stereotypeApplicationsObject) {
+ super((TransactionalEditingDomain)EMFHelper.resolveEditingDomain(stereotypedElement), "Stereotype Applications Update", getWorkspaceFiles(stereotypedElement));
this.stereotypedElement = stereotypedElement;
+ this.stereotypeApplicationsObject = stereotypeApplicationsObject;
}
}
+
+ @Override
+ public Injector getInjector() {
+ return StereotypeApplicationWithVSLActivator.getInstance().getInjector(StereotypeApplicationWithVSLActivator.ORG_ECLIPSE_PAPYRUS_MARTE_TEXTEDIT_STEREOTYPEAPPLICATIONWITHVSL_XTEXT_STEREOTYPEAPPLICATIONWITHVSL);
+ }
+
+ @Override
+ protected ICommand getParseCommand(EObject modelObject, EObject xtextObject) {
+ // first: retrieves / determines if the xtextObject is a TransitionRule object
+ EObject modifiedObject = xtextObject;
+ if(!(modelObject instanceof Element)) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ while(xtextObject != null && !(xtextObject instanceof StereotypeApplicationsRule)) {
+ modifiedObject = modifiedObject.eContainer();
+ }
+ if(modifiedObject == null) {
+ return UnexecutableCommand.INSTANCE;
+ }
+
+ Element stereotypedElement = (Element)modelObject;
+ StereotypeApplicationsRule stereotypeApplicationsObject = (StereotypeApplicationsRule)xtextObject;
+
+ // Creates and executes the update command
+ UpdateStereotypeApplicationsCommand updateCommand = new UpdateStereotypeApplicationsCommand(stereotypedElement, stereotypeApplicationsObject);
+ return updateCommand;
+ }
}
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF index 374cf1c4ad6..d42d58e67ce 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/META-INF/MANIFEST.MF @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.uml2.codegen.ecore;bundle-version="1.6.0",
org.eclipse.papyrus.marte.vsl;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.xtext.glue;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/scoping/StereotypeApplicationWithVSLScopeProvider.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/scoping/StereotypeApplicationWithVSLScopeProvider.java index ac654d9aa0e..5ff46936bee 100644 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/scoping/StereotypeApplicationWithVSLScopeProvider.java +++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/scoping/StereotypeApplicationWithVSLScopeProvider.java @@ -1,7 +1,7 @@ /***************************************************************************** * Copyright (c) 2010 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 @@ -18,11 +18,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; -import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.PopupXtextEditorHelper; import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.StereotypeApplicationRule; import org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.stereotypeApplicationWithVSL.TagSpecificationRule; import org.eclipse.papyrus.marte.vsl.scoping.VSLScopeProvider; -import org.eclipse.uml2.uml.Classifier; +import org.eclipse.papyrus.uml.xtext.integration.core.ContextElementUtil; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Property; import org.eclipse.uml2.uml.Stereotype; @@ -33,9 +32,9 @@ import org.eclipse.xtext.scoping.impl.SimpleScope; /** * This class contains custom scoping description. - * + * * see : http://www.eclipse.org/Xtext/documentation/latest/xtext.html#scoping - * on how and when to use it + * on how and when to use it * */ public class StereotypeApplicationWithVSLScopeProvider extends VSLScopeProvider { @@ -44,109 +43,113 @@ public class StereotypeApplicationWithVSLScopeProvider extends VSLScopeProvider * * Custom scoping for StereotypeApplicationRule_stereotype * - *****************************************************************/ - + * *************************************************************** + */ + public IScope scope_StereotypeApplicationRule_stereotype(StereotypeApplicationRule ctx, EReference ref) { - return create___StereotypeApplicationRule_stereotype___Scope(ctx) ; + return create___StereotypeApplicationRule_stereotype___Scope(ctx); } - + private IScope create___StereotypeApplicationRule_stereotype___Scope(StereotypeApplicationRule ctx) { - List<Stereotype> applicableStereotypes = ((Element)PopupXtextEditorHelper.context).getApplicableStereotypes() ; - Iterable<IEObjectDescription> visibleStereotypes = Scopes.scopedElementsFor(applicableStereotypes) ; - return new SimpleScope(visibleStereotypes) ; + Element element = (Element)ContextElementUtil.getContextElement(ctx.eResource()); + if(element == null) { + return null; + } + List<Stereotype> applicableStereotypes = element.getApplicableStereotypes(); + Iterable<IEObjectDescription> visibleStereotypes = Scopes.scopedElementsFor(applicableStereotypes); + return new SimpleScope(visibleStereotypes); } - + /* **************************************************************** * * Custom scoping for StereotypeApplicationRule_stereotype * - *****************************************************************/ - + * *************************************************************** + */ + public IScope scope_TagSpecificationRule_property(TagSpecificationRule ctx, EReference ref) { - EObject context = ctx ; - while (context != null && !(context instanceof StereotypeApplicationRule)) - context = context.eContainer() ; - if (context == null || - ! (context instanceof StereotypeApplicationRule) || - ((StereotypeApplicationRule)context).getStereotype() == null) - return null ; - - return create___TagSpecificationRule_property___Scope((((StereotypeApplicationRule)context).getStereotype())) ; + EObject context = ctx; + while(context != null && !(context instanceof StereotypeApplicationRule)) { + context = context.eContainer(); + } + if(context == null || !(context instanceof StereotypeApplicationRule) || ((StereotypeApplicationRule)context).getStereotype() == null) { + return null; + } + + return create___TagSpecificationRule_property___Scope((((StereotypeApplicationRule)context).getStereotype())); } - + private IScope create___TagSpecificationRule_property___Scope(Stereotype stereotype) { - IScope result = null ; - + IScope result = null; + // build the stereotype inheritance hierarchy - - List<Property> visibleProperties = new ArrayList<Property>() ; - visibleProperties.addAll(stereotype.getAllAttributes()) ; - + + List<Property> visibleProperties = new ArrayList<Property>(); + visibleProperties.addAll(stereotype.getAllAttributes()); + // removes derived properties or those which name starts with "base_" - List<Property> filteredList = new ArrayList<Property>(stereotype.getAllAttributes()) ; - for (Property p : filteredList) { - if (p.getName() == null || - p.getName().startsWith("base_") || - p.isDerived()) - visibleProperties.remove(p) ; + List<Property> filteredList = new ArrayList<Property>(stereotype.getAllAttributes()); + for(Property p : filteredList) { + if(p.getName() == null || p.getName().startsWith("base_") || p.isDerived()) { + visibleProperties.remove(p); + } } - -// List<List<Stereotype>> inheritanceStructure = new ArrayList<List<Stereotype>>() ; -// List<Stereotype> tmpList = new ArrayList<Stereotype>() ; -// tmpList.add(stereotype) ; -// -// do { -// inheritanceStructure.add(tmpList) ; -// List<Stereotype> localStereotypeList = new ArrayList<Stereotype>() ; -// for (Stereotype currentStereotype : tmpList) { -// for (Classifier general : currentStereotype.getGenerals()) { -// if (general instanceof Stereotype) -// localStereotypeList.add((Stereotype)general) ; -// } -// } -// tmpList = new ArrayList<Stereotype>() ; -// tmpList.addAll(localStereotypeList) ; -// } while (!tmpList.isEmpty()); -// -// // builds the nested scope -// -// if (! inheritanceStructure.isEmpty()) { -// List<Property> visibleProperties = new ArrayList<Property>() ; -// List<Property> filteredProperties = new ArrayList<Property>() ; -// List<Stereotype> currentList = inheritanceStructure.get(inheritanceStructure.size() - 1) ; -// for (Stereotype currentStereotype : currentList) { -// visibleProperties.addAll(currentStereotype.getOwnedAttributes()) ; -// filteredProperties.addAll(currentStereotype.getOwnedAttributes()) ; -// for (Property p : filteredProperties) { -// if (p.getName() == null || -// p.getName().startsWith("base_") || -// p.isDerived()) -// visibleProperties.remove(p) ; -// } -// } - Iterable<IEObjectDescription> visiblePropertiesIterable = - Scopes.scopedElementsFor(visibleProperties) ; - result = new SimpleScope(visiblePropertiesIterable) ; -// for (int i = inheritanceStructure.size() - 2 ; i >= 0 ; i--) { -// visibleProperties = new ArrayList<Property>() ; -// currentList = inheritanceStructure.get(i) ; -// filteredProperties = new ArrayList<Property>() ; -// for (Stereotype currentStereotype : currentList) { -// visibleProperties.addAll(currentStereotype.getOwnedAttributes()) ; -// filteredProperties.addAll(currentStereotype.getOwnedAttributes()) ; -// } -// for (Property p : filteredProperties) { -// if (p.getName() == null || -// p.getName().startsWith("base_") || -// p.isDerived()) -// visibleProperties.remove(p) ; -// } -// visiblePropertiesIterable = -// Scopes.scopedElementsFor(visibleProperties) ; -// result = new SimpleScope(result, visiblePropertiesIterable) ; -// } -// } - - return result ; + + // List<List<Stereotype>> inheritanceStructure = new ArrayList<List<Stereotype>>() ; + // List<Stereotype> tmpList = new ArrayList<Stereotype>() ; + // tmpList.add(stereotype) ; + // + // do { + // inheritanceStructure.add(tmpList) ; + // List<Stereotype> localStereotypeList = new ArrayList<Stereotype>() ; + // for (Stereotype currentStereotype : tmpList) { + // for (Classifier general : currentStereotype.getGenerals()) { + // if (general instanceof Stereotype) + // localStereotypeList.add((Stereotype)general) ; + // } + // } + // tmpList = new ArrayList<Stereotype>() ; + // tmpList.addAll(localStereotypeList) ; + // } while (!tmpList.isEmpty()); + // + // // builds the nested scope + // + // if (! inheritanceStructure.isEmpty()) { + // List<Property> visibleProperties = new ArrayList<Property>() ; + // List<Property> filteredProperties = new ArrayList<Property>() ; + // List<Stereotype> currentList = inheritanceStructure.get(inheritanceStructure.size() - 1) ; + // for (Stereotype currentStereotype : currentList) { + // visibleProperties.addAll(currentStereotype.getOwnedAttributes()) ; + // filteredProperties.addAll(currentStereotype.getOwnedAttributes()) ; + // for (Property p : filteredProperties) { + // if (p.getName() == null || + // p.getName().startsWith("base_") || + // p.isDerived()) + // visibleProperties.remove(p) ; + // } + // } + Iterable<IEObjectDescription> visiblePropertiesIterable = Scopes.scopedElementsFor(visibleProperties); + result = new SimpleScope(visiblePropertiesIterable); + // for (int i = inheritanceStructure.size() - 2 ; i >= 0 ; i--) { + // visibleProperties = new ArrayList<Property>() ; + // currentList = inheritanceStructure.get(i) ; + // filteredProperties = new ArrayList<Property>() ; + // for (Stereotype currentStereotype : currentList) { + // visibleProperties.addAll(currentStereotype.getOwnedAttributes()) ; + // filteredProperties.addAll(currentStereotype.getOwnedAttributes()) ; + // } + // for (Property p : filteredProperties) { + // if (p.getName() == null || + // p.getName().startsWith("base_") || + // p.isDerived()) + // visibleProperties.remove(p) ; + // } + // visiblePropertiesIterable = + // Scopes.scopedElementsFor(visibleProperties) ; + // result = new SimpleScope(result, visiblePropertiesIterable) ; + // } + // } + + return result; } } diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/validation/SemanticValidator.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/validation/SemanticValidator.java deleted file mode 100644 index 01dea043b0f..00000000000 --- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/validation/SemanticValidator.java +++ /dev/null @@ -1,31 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.validation;
-
-import org.eclipse.papyrus.infra.gmfdiag.xtext.glue.edit.part.IXTextSemanticValidator;
-
-/**
- * Custom implementation for IXtextSemanticValidator in the context of the textual editor for stereotype applications
- *
- * @author CEA LIST
- *
- */
-public class SemanticValidator implements IXTextSemanticValidator {
-
- public boolean validate() {
- return StereotypeApplicationWithVSLJavaValidator.validate();
- }
-
-}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF index 99851fd2b52..6b679c1d713 100644 --- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF +++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common/META-INF/MANIFEST.MF @@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
org.eclipse.papyrus.uml.diagram.communication;bundle-version="1.0.0",
- org.eclipse.emf.facet.infra.browser.uicore,
org.eclipse.ui.ide;bundle-version="3.9.0",
org.eclipse.gmf.runtime.notation.edit,
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0"
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF index ac2c7899b34..df29f34e34e 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.core,
org.eclipse.papyrus.infra.gmfdiag.modelexplorer,
org.eclipse.ui.navigator;bundle-version="3.5.101",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.2",
org.eclipse.papyrus.infra.emf.readonly,
org.eclipse.core.expressions,
org.eclipse.uml2.uml;bundle-version="3.2.100",
diff --git a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java index 4926945c839..6026b1672bf 100644 --- a/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java +++ b/extraplugins/team.collaborative/org.eclipse.papyrus.team.collaborative.strategy/src/org/eclipse/papyrus/team/collaborative/strategy/ui/providers/ExtensivePartitionNameLabelProvider.java @@ -13,11 +13,11 @@ package org.eclipse.papyrus.team.collaborative.strategy.ui.providers; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ModelElementItem;
import org.eclipse.jface.viewers.IColorProvider;
import org.eclipse.jface.viewers.IFontProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -46,7 +46,7 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo /**
* Instantiates a new extensive label provider.
- *
+ *
* @param predicate
* the predicate
*/
@@ -65,7 +65,7 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo /**
* Sets the color.
- *
+ *
* @param color
* the new color
*/
@@ -76,7 +76,7 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo /**
* Sets the font.
- *
+ *
* @param font
* the new font
*/
@@ -89,19 +89,17 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo *
* @see org.eclipse.papyrus.modelexplorer.MoDiscoLabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
String superText = internal.getText(element);
- if(element instanceof ModelElementItem) {
- ModelElementItem elem = (ModelElementItem)element;
- EObject eObject = elem.getEObject();
- if(eObject != null) {
- String partitionName = getPartitionName(eObject);
- if(partitionName != null) {
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append(partitionName);
- stringBuilder.append(superText);
- superText = stringBuilder.toString();
- }
+ EObject eObject = EMFHelper.getEObject(element);
+ if(eObject != null) {
+ String partitionName = getPartitionName(eObject);
+ if(partitionName != null) {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append(partitionName);
+ stringBuilder.append(superText);
+ superText = stringBuilder.toString();
}
}
return superText;
@@ -114,7 +112,7 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo /**
* Gets the partition name.
- *
+ *
* @param eObject
* the e object
* @return the partition name
@@ -138,13 +136,13 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo *
* @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getFont(java.lang.Object)
*/
- @SuppressWarnings("restriction")
+ @Override
public Font getFont(Object element) {
if(predicate != null) {
- if(element instanceof ModelElementItem) {
- ModelElementItem eObject = (ModelElementItem)element;
+ EObject eObject = EMFHelper.getEObject(element);
+ if(eObject != null) {
if(font != null) {
- if(predicate.apply(eObject.getEObject())) {
+ if(predicate.apply(eObject)) {
return font;
}
}
@@ -161,13 +159,13 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo *
* @see org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider#getForeground(java.lang.Object)
*/
- @SuppressWarnings("restriction")
+ @Override
public Color getForeground(Object element) {
if(predicate != null) {
- if(element instanceof ModelElementItem) {
- ModelElementItem eObject = (ModelElementItem)element;
+ EObject eObject = EMFHelper.getEObject(element);
+ if(eObject != null) {
if(color != null) {
- if(predicate.apply(eObject.getEObject())) {
+ if(predicate.apply(eObject)) {
return color;
}
}
@@ -180,34 +178,40 @@ public class ExtensivePartitionNameLabelProvider implements IFontProvider, IColo }
+ @Override
public void addListener(ILabelProviderListener listener) {
internal.addListener(listener);
}
+ @Override
public void dispose() {
internal.dispose();
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return internal.isLabelProperty(element, property);
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
internal.removeListener(listener);
}
+ @Override
public Image getImage(Object element) {
return internal.getImage(element);
}
+ @Override
public Color getBackground(Object element) {
if(internal instanceof IColorProvider) {
return ((IColorProvider)internal).getBackground(element);
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java index 64403b82f2a..efd6d56b7c2 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/MoDiscoDropAdapter.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -13,27 +13,27 @@ package org.eclipse.papyrus.customization.properties.editor; import java.util.Collection;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.papyrus.customization.properties.util.ActionUtil;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.swt.widgets.Widget;
/**
* An adapter for Drag & Drop in the Context editor. The default Ecore drag & drop
* is not compatible with the EMF Facet Tree Elements
- *
+ *
* @author Camille Letavernier
*/
public class MoDiscoDropAdapter extends EditingDomainViewerDropAdapter {
/**
- *
+ *
* Constructor.
- *
+ *
* @param domain
* The Editing domain for this Drop Adapter
* @param viewer
@@ -45,19 +45,19 @@ public class MoDiscoDropAdapter extends EditingDomainViewerDropAdapter { @Override
protected Collection<?> extractDragSource(Object object) {
- if(object instanceof ISelection)
+ if(object instanceof ISelection) {
return super.extractDragSource(ActionUtil.getAdaptedSelection((ISelection)object));
- else
+ } else {
return super.extractDragSource(object);
+ }
}
@Override
protected Object extractDropTarget(Widget item) {
Object dropTarget = super.extractDropTarget(item);
- if(dropTarget instanceof IAdaptable) {
- Object adapter = ((IAdaptable)dropTarget).getAdapter(EObject.class);
- if(adapter != null)
- return adapter;
+ EObject eObject = EMFHelper.getEObject(dropTarget);
+ if(eObject != null) {
+ return eObject;
}
return dropTarget;
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java index a93321213d0..1d3e003df7d 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java +++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/util/ActionUtil.java @@ -1,6 +1,6 @@ /*****************************************************************************
* Copyright (c) 2010 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
@@ -20,12 +20,13 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
/**
* Utility class for Actions
- *
+ *
* @author Camille Letavernier
- *
+ *
*/
public class ActionUtil {
@@ -36,7 +37,7 @@ public class ActionUtil { * themselves. This method adapts a collections of such objects to their
* underlying EObjects, so that EMF can handle them.
* Objects that cannot be adapted remain as-is in the collection.
- *
+ *
* @param selection
* The collection to adapt
* @return
@@ -62,7 +63,7 @@ public class ActionUtil { * themselves. This method adapts a ISelection of such objects to their
* underlying EObjects, so that EMF can handle them.
* Objects that cannot be adapted remain as-is in the selection.
- *
+ *
* @param sourceSelection
* The selection to adapt
* @return
@@ -76,12 +77,11 @@ public class ActionUtil { Iterator<?> it = currentSelection.iterator();
while(it.hasNext()) {
Object object = it.next();
- if(object instanceof IAdaptable) {
- EObject eObject = (EObject)((IAdaptable)object).getAdapter(EObject.class);
- if(eObject != null)
- newSelection.add(eObject);
- else
- newSelection.add(object);
+ EObject eObject = EMFHelper.getEObject(object);
+ if(eObject != null) {
+ newSelection.add(eObject);
+ } else {
+ newSelection.add(object);
}
}
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml index 201411fb724..120a7ce9d7d 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.xml @@ -49,7 +49,7 @@ <adviceBinding
class="org.eclipse.papyrus.infra.emf.advice.DeletePageAdvice"
id="org.eclipse.papyrus.infra.emf.deletePageAdvice"
- inheritance="none"
+ inheritance="all"
typeId="*">
</adviceBinding>
<metamodelType
@@ -75,9 +75,6 @@ <elementType
ref="org.eclipse.papyrus.infra.emf.page">
</elementType>
- </binding>
- <binding
- context="org.eclipse.gmf.runtime.emf.type.core.defaultContext">
<elementType
ref="org.eclipse.papyrus.infra.emf.deletePageAdvice">
</elementType>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java index 21894ef9909..8137e18e621 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/advice/DeletePageAdvice.java @@ -1,6 +1,6 @@ /*****************************************************************************
* 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
@@ -14,16 +14,17 @@ package org.eclipse.papyrus.infra.emf.advice; import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
/**
* An EditHelperAdvice which applies to all Papyrus page identifiers (i.e. Tables, Diagrams, ...)
* When a page identifier object is deleted, the associated page is removed
- *
+ *
* This advice is used when an Object containing a page is deleted
- *
+ *
* @author Camille Letavernier
- *
+ *
*/
public class DeletePageAdvice extends AbstractEditHelperAdvice {
@@ -37,4 +38,13 @@ public class DeletePageAdvice extends AbstractEditHelperAdvice { return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);
}
+ @Override
+ protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+ final EObject objectToDestroy = request.getElementToDestroy();
+ if(objectToDestroy == null) {
+ return null;
+ }
+ return RemovePageHelper.getRemovePageCommand(request.getEditingDomain(), objectToDestroy);
+ }
+
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java index 96a332820f5..5a69eaa862b 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/DiagramEditHelper.java @@ -1,7 +1,7 @@ /*****************************************************************************
* 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
@@ -26,62 +26,50 @@ import org.eclipse.gmf.runtime.common.core.command.AbstractCommand; import org.eclipse.gmf.runtime.common.core.command.CommandResult;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelper;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
/**
* Represents an Edit Helper for GMF Diagrams
+ *
* @author Laurent Wouters
*/
-public class DiagramEditHelper implements IEditHelper {
-
- /* (non-Javadoc)
- * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#canEdit(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
- */
- public boolean canEdit(IEditCommandRequest req) {
- return false;
- }
+public class DiagramEditHelper extends AbstractEditHelper {
- /* (non-Javadoc)
- * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getEditCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)
- */
- public ICommand getEditCommand(final IEditCommandRequest req) {
- if (req instanceof DestroyElementRequest) {
- DestroyElementRequest r = (DestroyElementRequest)req;
- return getDestroyDiagramCommand((Diagram)r.getElementToDestroy());
- } else if (req instanceof SetRequest) {
- SetRequest r = (SetRequest)req;
- return GetSimpleSetCommand(r.getElementToEdit(), r.getFeature(), r.getValue());
- } else if (req instanceof CreateElementRequest) {
- CreateElementRequest r = (CreateElementRequest)req;
- EObject container = r.getContainer();
- if (container instanceof Diagram)
- return getCreateCommand((Diagram)container, r.getContainmentFeature(), r.getElementType());
+ @Override
+ protected ICommand getCreateCommand(CreateElementRequest req) {
+ EObject container = req.getContainer();
+ if(container instanceof Diagram) {
+ return getCreateCommand((Diagram)container, req.getContainmentFeature(), req.getElementType());
}
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getContainedValues(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EReference)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelper#getContainedValues(org.eclipse.emf.ecore.EObject,
+ * org.eclipse.emf.ecore.EReference)
*/
+ @Override
public List getContainedValues(EObject eContainer, EReference feature) {
throw new UnsupportedOperationException();
}
-
+
/**
* Gets the command for destroying the given diagram
- * @param diagram The diagram to destroy
+ *
+ * @param diagram
+ * The diagram to destroy
* @return The appropriate command
*/
private ICommand getDestroyDiagramCommand(final Diagram diagram) {
final Resource resource = diagram.eResource();
return new AbstractCommand("Destroy diagram") {
+
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
resource.getContents().remove(diagram);
@@ -101,18 +89,23 @@ public class DiagramEditHelper implements IEditHelper { }
};
}
-
+
/**
* Gets the command for setting a property of a view
- * @param object The object to modify
- * @param feature The feature to modify
- * @param newValue The new value for the feature
+ *
+ * @param object
+ * The object to modify
+ * @param feature
+ * The feature to modify
+ * @param newValue
+ * The new value for the feature
* @return The appropriate command
*/
private ICommand GetSimpleSetCommand(final EObject object, final EStructuralFeature feature, final Object newValue) {
return new AbstractCommand("Edit property") {
+
private Object oldValue;
-
+
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
oldValue = object.eGet(feature);
@@ -133,29 +126,37 @@ public class DiagramEditHelper implements IEditHelper { }
};
}
-
-
+
+
/**
* Gets the command for the creation of an element in a diagram
- * @param diagram The diagram to change
- * @param reference The containment feature
- * @param type The type of the element to be created
+ *
+ * @param diagram
+ * The diagram to change
+ * @param reference
+ * The containment feature
+ * @param type
+ * The type of the element to be created
* @return The appropriate command
*/
private ICommand getCreateCommand(final Diagram diagram, final EReference reference, final IElementType type) {
return new AbstractCommand("Create element") {
+
private EObject newElement;
+
private ModelAddData data;
-
+
@Override
protected CommandResult doExecuteWithResult(IProgressMonitor progressMonitor, IAdaptable info) throws ExecutionException {
data = PolicyChecker.getCurrent().getChildAddData(diagram, diagram.getElement().eClass(), type.getEClass());
- if (!data.isPermitted())
+ if(!data.isPermitted()) {
return CommandResult.newErrorCommandResult("The current active viewpoint policy prevents the addition of this element to the view");
+ }
newElement = type.getEClass().getEPackage().getEFactoryInstance().create(type.getEClass());
- if (data.isPathDefined()) {
- if (!data.execute(diagram.getElement(), newElement))
+ if(data.isPathDefined()) {
+ if(!data.execute(diagram.getElement(), newElement)) {
return CommandResult.newErrorCommandResult("Failed to follow the path");
+ }
} else {
diagram.getElement().eSet(reference, newElement);
}
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath index 2d1a4302f04..7441b7f8c5f 100644 --- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath +++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/.classpath @@ -2,6 +2,6 @@ <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry excluding="org/eclipse/papyrus/eclipse/project/editors/interfaces/IEMFFacetProjectEditor.java|org/eclipse/papyrus/eclipse/project/editors/project/EMFFacetProjectEditor.java" kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF index 9e17e261a52..986aa259168 100644 --- a/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF +++ b/plugins/infra/org.eclipse.papyrus.eclipse.project.editors/META-INF/MANIFEST.MF @@ -8,8 +8,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.resources,
org.eclipse.jdt.core,
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- org.eclipse.emf.facet.infra.facet,
- org.eclipse.pde.ui;bundle-version="3.6.100"
+ org.eclipse.pde.ui;bundle-version="3.6.100",
+ org.eclipse.emf.ecore;bundle-version="2.10.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF index b8f138e9477..a732bcc8b92 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.preferences/META-INF/MANIFEST.MF @@ -3,11 +3,11 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime,
org.eclipse.emf.common,
org.eclipse.emf.ecore,
- org.eclipse.emf.facet.infra.common.core,
org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="1.0.0",
org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.0",
org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",
+ org.eclipse.core.resources;bundle-version="3.9.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.0.0.qualifier
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap index 94444d19846..9a534ed9b5b 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap @@ -185,7 +185,15 @@ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
+ </rm:provider>
+
+ <!-- EMF Facet -->
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
+ <!-- updateFrom("EMF Facet",0) -->
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
<!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap index ef343ade1e5..9799a4faa3b 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap @@ -306,7 +306,15 @@ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
+ </rm:provider>
+
+ <!-- EMF Facet -->
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
+ <!-- updateFrom("EMF Facet",0) -->
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
<!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap index 5d6f13dc58a..a6884d42650 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap @@ -257,7 +257,15 @@ <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
- </rm:provider>
+ </rm:provider>
+
+ <!-- EMF Facet -->
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
+ <!-- updateFrom("EMF Facet",0) -->
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
<!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap index b3a7c55c245..d10f3280aaf 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap @@ -306,7 +306,7 @@ </rm:uri>
</rm:provider>
- <!-- PAYURYS EMF FACET-->
+ <!-- PAPYRUS EMF FACET-->
<rm:provider componentTypes="osgi.bundle" readerType="local">
<rm:uri format="{0}/plugins/facet/{1}">
<bc:propertyRef key="local.repository"/>
@@ -462,6 +462,14 @@ </rm:uri>
</rm:provider>
+ <!-- EMF Facet -->
+ <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
+ <!-- updateFrom("EMF Facet",0) -->
+ <rm:uri format="{0}/facet/updates/integration/0.4.0/I201402271523/">
+ <bc:propertyRef key="eclipse.downloads"/>
+ </rm:uri>
+ </rm:provider>
+
<!-- MoDisco -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MoDisco",0) -->
|