diff options
author | cbrun | 2017-02-02 14:25:27 +0000 |
---|---|---|
committer | cbrun | 2017-02-02 15:06:42 +0000 |
commit | 09ba3da44b97561ba24edc3f817c6c0acdc683ee (patch) | |
tree | fb590693d842702defc51ffe9589c6472bb571b7 /plugins | |
parent | 846556feb64fbd6ea2578562480f9cc60a499ecb (diff) | |
download | org.eclipse.sirius-09ba3da44b97561ba24edc3f817c6c0acdc683ee.tar.gz org.eclipse.sirius-09ba3da44b97561ba24edc3f817c6c0acdc683ee.tar.xz org.eclipse.sirius-09ba3da44b97561ba24edc3f817c6c0acdc683ee.zip |
[510692] Update existing tests in regard to the new validation rules
Bug: 510692
Change-Id: Ibf1dee862b5273a5d8a4b15706159796249eed0e
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>
Diffstat (limited to 'plugins')
16 files changed, 191 insertions, 174 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/compartments.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/compartments.odesign index b97f6db860..86f6deac1c 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/compartments.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/compartments/compartments.odesign @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="compartments" version="11.0.0.201601261200"> <ownedViewpoints name="Compartments"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with VStack" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with VStack" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="VStack" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="VerticalStack"> - <subContainerMappings name="ListRegions" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="Attributes" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> + <containerMappings name="VStack" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="VerticalStack"> + <subContainerMappings name="ListRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="Attributes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription" labelAlignment="RIGHT" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -45,8 +45,8 @@ </style> </conditionnalStyles> </subContainerMappings> - <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> - <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> + <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -106,7 +106,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EAttribute" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'attr' + container.eContents()->size()"/> </subModelOperations> </firstModelOperations> @@ -117,7 +117,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -128,7 +128,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'class' + container.eClassifiers->size()"/> </subModelOperations> </firstModelOperations> @@ -139,7 +139,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'class' + container.eClassifiers->size()"/> </subModelOperations> </firstModelOperations> @@ -161,9 +161,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Left_C' + container.eClassifiers->size()"/> </subModelOperations> </subModelOperations> @@ -175,12 +175,12 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C0"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C1"/> </subModelOperations> </subModelOperations> @@ -192,7 +192,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Hide' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -203,7 +203,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -214,9 +214,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Left_C' + container.eClassifiers->size()"/> </subModelOperations> </subModelOperations> @@ -228,12 +228,12 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C0"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C1"/> </subModelOperations> </subModelOperations> @@ -243,12 +243,12 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with HStack" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with HStack" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="HStack" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="HorizontalStack"> - <subContainerMappings name="HListRegions" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="HAttributes" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> + <containerMappings name="HStack" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="HorizontalStack"> + <subContainerMappings name="HListRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="HAttributes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription" labelAlignment="RIGHT" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -287,8 +287,8 @@ </style> </conditionnalStyles> </subContainerMappings> - <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> - <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> + <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -342,7 +342,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EAttribute" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'attr'+ container.eContents()->size()"/> </subModelOperations> </firstModelOperations> @@ -353,7 +353,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -364,7 +364,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'class' + container.eClassifiers->size()"/> </subModelOperations> </firstModelOperations> @@ -375,7 +375,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'class' + container.eClassifiers->size()"/> </subModelOperations> </firstModelOperations> @@ -397,9 +397,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Left_C' + container.eClassifiers->size()"/> </subModelOperations> </subModelOperations> @@ -411,12 +411,12 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C0"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C1"/> </subModelOperations> </subModelOperations> @@ -428,7 +428,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Hide' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -439,7 +439,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> </subModelOperations> </firstModelOperations> @@ -450,9 +450,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Left_C' + container.eClassifiers->size()"/> </subModelOperations> </subModelOperations> @@ -464,12 +464,12 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Init_p' + container.eSubpackages->size()"/> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C0"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="newClass"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers" variableName="newClass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Left_C1"/> </subModelOperations> </subModelOperations> @@ -479,12 +479,12 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="RecurDiag" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="RecurDiag" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="EPackageHStack1" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="HorizontalStack"> - <subContainerMappings name="LeftPane" semanticCandidatesExpression="var:self" domainClass="EPackage"> - <subNodeMappings name="ListElt" semanticCandidatesExpression="feature:eContents" synchronizationLock="true" domainClass="EPackage"> + <containerMappings name="EPackageHStack1" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="HorizontalStack"> + <subContainerMappings name="LeftPane" semanticCandidatesExpression="var:self" domainClass="ecore.EPackage"> + <subNodeMappings name="ListElt" semanticCandidatesExpression="feature:eContents" synchronizationLock="true" domainClass="ecore.EPackage"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -499,9 +499,9 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subContainerMappings> - <subContainerMappings name="EPackageVStack2" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="VerticalStack"> - <subContainerMappings name="EPackageCont" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='RecurDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='drop']" childrenPresentation="List"> - <subNodeMappings name="cl" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <subContainerMappings name="EPackageVStack2" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="VerticalStack"> + <subContainerMappings name="EPackageCont" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='RecurDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='drop']" childrenPresentation="List"> + <subNodeMappings name="cl" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:BundledImageDescription" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -547,12 +547,12 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with Image" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag with Image" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="RCWithImage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="VerticalStack"> - <subContainerMappings name="RegionsWithImage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> - <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <containerMappings name="RCWithImage" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="VerticalStack"> + <subContainerMappings name="RegionsWithImage" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage"> + <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -571,11 +571,11 @@ </containerMappings> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" name="Diag with VStack and DnD" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" name="Diag with VStack and DnD" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="VStackWithDnd" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="VerticalStack"> - <subContainerMappings name="FreeFormRegionsWithDnD" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@containerMappings[name='VStackWithDnd']"> + <containerMappings name="VStackWithDnd" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="VerticalStack"> + <subContainerMappings name="FreeFormRegionsWithDnD" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20VStack%20and%20DnD']/@defaultLayer/@containerMappings[name='VStackWithDnd']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="20" arcHeight="20" borderSizeComputationExpression="2" labelAlignment="RIGHT" backgroundColor="//@userColorsPalettes[name='Colors']/@entries[name='regionInterpolatedColor']" foregroundColor="//@userColorsPalettes[name='Colors']/@entries[name='regionInterpolatedColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> @@ -603,11 +603,11 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" name="Diag with HStack and DnD" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" name="Diag with HStack and DnD" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="HStackWithDnd" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="HorizontalStack"> - <subContainerMappings name="FreeFormRegionsWithDnD" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@containerMappings[name='HStackWithDnd']"> + <containerMappings name="HStackWithDnd" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" childrenPresentation="HorizontalStack"> + <subContainerMappings name="FreeFormRegionsWithDnD" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20packages']" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='Diag%20with%20HStack%20and%20DnD']/@defaultLayer/@containerMappings[name='HStackWithDnd']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="20" arcHeight="20" borderSizeComputationExpression="2" labelAlignment="RIGHT" backgroundColor="//@userColorsPalettes[name='Colors']/@entries[name='regionInterpolatedColor']" foregroundColor="//@userColorsPalettes[name='Colors']/@entries[name='regionInterpolatedColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign index c6f242cc95..900180b002 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign @@ -4,11 +4,11 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" domainClass=""> <defaultLayer name="Default"/> <additionalLayers name="Acceleo2"> - <nodeMappings name="AC2_InvalidExpressions" semanticCandidatesExpression="aql:invalidExpression" semanticElements="aql:anotherInvalid" domainClass="EClass"/> + <nodeMappings name="AC2_InvalidExpressions" semanticCandidatesExpression="aql:invalidExpression" semanticElements="aql:anotherInvalid" domainClass="ecore.EClass"/> </additionalLayers> <additionalLayers name="OCL"/> <additionalLayers name="Acceleo3"> - <nodeMappings name="AC3_NodeMapping_EClass" label="AC3_NodeMapping_EClass" semanticCandidatesExpression="[self.eStructuralFeatures/]" semanticElements="[self.eAttributes/]" domainClass="EClass"> + <nodeMappings name="AC3_NodeMapping_EClass" label="AC3_NodeMapping_EClass" semanticCandidatesExpression="[self.eStructuralFeatures/]" semanticElements="[self.eAttributes/]" domainClass="ecore.EClass"> <style xsi:type="style:CustomStyleDescription" labelExpression="[self.eAttributes->size()/]" tooltipExpression="[self.eAttributes->size()/]"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -27,7 +27,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <nodeMappings name="AC3_InvalidNode" label="AC3_InvalidNode" semanticCandidatesExpression="[self/]" domainClass="Nothing"/> + <nodeMappings name="AC3_InvalidNode" label="AC3_InvalidNode" semanticCandidatesExpression="[self/]" domainClass="ecore.Nothing"/> <edgeMappings name="AC3_relationBaseEdge" sourceMapping="//@ownedViewpoints[name='']/@ownedRepresentations[name='']/@additionalLayers[name='Acceleo3']/@nodeMappings[name='AC3_NodeMapping_EClass']" targetMapping="//@ownedViewpoints[name='']/@ownedRepresentations[name='']/@additionalLayers[name='Acceleo3']/@nodeMappings[name='AC3_NodeMapping_DNode']" targetFinderExpression="[self.eAttributes/]"/> <edgeMappings name="AC3_InvalidEdge" sourceMapping="//@ownedViewpoints[name='']/@ownedRepresentations[name='']/@additionalLayers[name='Acceleo3']/@nodeMappings[name='AC3_InvalidNode']" targetMapping="//@ownedViewpoints[name='']/@ownedRepresentations[name='']/@additionalLayers[name='Acceleo3']/@nodeMappings[name='AC3_NodeMapping_EClass']" targetFinderExpression="[self.titi/]"/> <toolSections name="AC3_Section"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign index 5f824ac325..bcaa3cd312 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:description_4="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="Provides graphical and tabular modelers to design an Ecore model." name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo2" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo2" titleExpression="aql:self.name + ' package entities'" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> @@ -34,7 +34,7 @@ </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="ecore.EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> @@ -84,7 +84,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eAllContents(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eAllContents(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="ecore.EReference" useDomainElement="true"> <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> @@ -92,8 +92,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> - <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="ecore.EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.render()" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -146,7 +146,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="ecore.EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -160,7 +160,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> @@ -169,7 +169,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> @@ -179,7 +179,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Interface ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool:SetValue" featureName="interface" valueExpression="true"/> </firstModelOperations> @@ -231,7 +231,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EAttribute" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Attribute"/> </firstModelOperations> </initialOperation> @@ -283,7 +283,7 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> @@ -297,12 +297,12 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> @@ -321,7 +321,7 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/> <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> @@ -463,7 +463,7 @@ </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -471,7 +471,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> + <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -484,7 +484,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> @@ -538,7 +538,7 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo3" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo3" titleExpression="aql:self.name + ' package entities'" domainClass="ecore.EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> @@ -574,7 +574,7 @@ </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="[self/]" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[self.eType/]" sourceFinderExpression="[eContainer(OclAny)/]" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="[self/]" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[self.eType/]" sourceFinderExpression="[eContainer(OclAny)/]" domainClass="ecore.EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="[name/]"> @@ -624,7 +624,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eAllContents(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[eType/]" sourceFinderExpression="[eContainer(OclAny)/]" targetExpression="" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eAllContents(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[eType/]" sourceFinderExpression="[eContainer(OclAny)/]" targetExpression="" domainClass="ecore.EReference" useDomainElement="true"> <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> @@ -632,8 +632,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="[eClassifiers/]" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> - <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="[eAttributes/]" domainClass="EAttribute"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="[eAttributes/]" domainClass="ecore.EAttribute"> <style xsi:type="style:BundledImageDescription" labelExpression="[name/]" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -686,7 +686,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="ecore.EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -700,7 +700,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="['new EClass '.concat(self.eContainer(EPackage).eClassifiers->size().oclAsType(String))/]"/> </firstModelOperations> </initialOperation> @@ -709,7 +709,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> @@ -719,7 +719,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Interface ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool:SetValue" featureName="interface" valueExpression="true"/> </firstModelOperations> @@ -771,7 +771,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EAttribute" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Attribute"/> </firstModelOperations> </initialOperation> @@ -823,7 +823,7 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> @@ -837,12 +837,12 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> @@ -861,7 +861,7 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EReference"/> <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> @@ -1003,7 +1003,7 @@ </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1011,7 +1011,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> + <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1024,7 +1024,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> @@ -1078,9 +1078,9 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes Acceleo3" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes Acceleo3" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="[eClassifiers/]"> + <ownedLineMappings name="Classes lines" domainClass="ecore.EClass" semanticCandidatesExpression="[eClassifiers/]"> <foregroundConditionalStyle predicateExpression="[abstract/]"> <style labelSize="10"> <labelFormat>italic</labelFormat> @@ -1089,11 +1089,11 @@ </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature" semanticCandidatesExpression="[eStructuralFeatures/]"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> + <ownedLineMappings name="Package" domainClass="ecore.EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="[eClassifiers/]"> + <ownedSubLines name="Classes lines" domainClass="ecore.EClass" semanticCandidatesExpression="[eClassifiers/]"> <ownedSubLines name="Feature" domainClass="EStructuralFeature" semanticCandidatesExpression="[eStructuralFeatures/]"/> </ownedSubLines> </ownedLineMappings> @@ -1102,16 +1102,16 @@ <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="[container/]"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> </subModelOperations> </firstModelOperation> </ownedCreateLine> <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> - <ownedRepresentations xsi:type="description_3:TreeDescription" name="Classes Acceleo3 (Tree)" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_3:TreeDescription" name="Classes Acceleo3 (Tree)" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <subItemMappings name="Class (TreeItem)" domainClass="EClass" semanticCandidatesExpression="[self.eClassifiers/]"> + <subItemMappings name="Class (TreeItem)" domainClass="ecore.EClass" semanticCandidatesExpression="[self.eClassifiers/]"> <defaultStyle labelExpression="[name/]"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/childrenPresentationChanges/compartments.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/childrenPresentationChanges/compartments.odesign index 84dcc317dc..dc8a54b69e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/childrenPresentationChanges/compartments.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/childrenPresentationChanges/compartments.odesign @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Compartments" version="10.1.0.201507271600"> <ownedViewpoints name="Compartments"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="ChildrenPresentationChangeDiagram" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="ChildrenPresentationChangeDiagram" domainClass="ecore.EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Compartment_1" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> - <subContainerMappings name="ListRegions" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="Attributes" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> + <containerMappings name="Compartment_1" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage"> + <subContainerMappings name="ListRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="Attributes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription" labelAlignment="RIGHT" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -43,8 +43,8 @@ </style> </conditionnalStyles> </subContainerMappings> - <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> - <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <subContainerMappings name="FreeFormRegions" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" dropDescriptions="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20class']"> + <subNodeMappings name="nodes" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -122,13 +122,13 @@ </toolSections> </defaultLayer> <additionalLayers name="VStackByImport"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="VStackByImport" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="VerticalStack" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']"/> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="VStackByImport" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="VerticalStack" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']"/> </additionalLayers> <additionalLayers name="ListByImport"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="ListByImport" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="List" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@additionalLayers[name='VStackByImport']/@containerMappings[name='VStackByImport']"/> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="ListByImport" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="List" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@additionalLayers[name='VStackByImport']/@containerMappings[name='VStackByImport']"/> </additionalLayers> <additionalLayers name="HStackByImport"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="hstack" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="HorizontalStack" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@additionalLayers[name='ListByImport']/@containerMappings[name='ListByImport']"/> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="hstack" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EPackage" reusedContainerMappings="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='FreeFormRegions'] //@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@defaultLayer/@containerMappings[name='Compartment_1']/@subContainerMappings[name='ListRegions']" childrenPresentation="HorizontalStack" inheritsAncestorFilters="false" importedMapping="//@ownedViewpoints[name='Compartments']/@ownedRepresentations[name='ChildrenPresentationChangeDiagram']/@additionalLayers[name='ListByImport']/@containerMappings[name='ListByImport']"/> </additionalLayers> </ownedRepresentations> </ownedViewpoints> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/invalidVariableNameVSM.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/invalidVariableNameVSM.odesign index 28421997d0..57e7d43ef7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/invalidVariableNameVSM.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/invalidVariableNameVSM.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="invalidVariableNameVSM" version="11.0.0.201601261200"> <ownedViewpoints name="invalidVariableNameVSM"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <edgeMappings name="Edge" sourceMapping="//@ownedViewpoints[name='invalidVariableNameVSM']/@ownedRepresentations[name='diagram']/@defaultLayer/@containerMappings[name='class']" targetMapping="//@ownedViewpoints[name='invalidVariableNameVSM']/@ownedRepresentations[name='diagram']/@defaultLayer/@containerMappings[name='class']" targetFinderExpression="feature:eReferences"> @@ -12,8 +12,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="class" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -47,9 +47,9 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="table" domainClass="EClass"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="table" domainClass="ecore.EClass"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <ownedLineMappings name="Line" domainClass="EClass"/> + <ownedLineMappings name="Line" domainClass="ecore.EClass"/> <ownedColumnMappings name="Column" featureName="feature:eAllContents"> <directEdit> <variables documentation="The currently edited element."/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateImagePathVSM.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateImagePathVSM.odesign index 61f360a2a6..46355f35b8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateImagePathVSM.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateImagePathVSM.odesign @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="11.0.0.201601261200"> <ownedViewpoints name="V"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" domainClass="ecore.EClass"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default" icon=" /org.eclipse.sirius.tests.junit/images/logo_o.png "> - <containerMappings name="C1" domainClass="EAttribute"> + <containerMappings name="C1" domainClass="ecore.EAttribute"> <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/Actor.png"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </containerMappings> - <containerMappings name="C2" domainClass="EAttribute"> + <containerMappings name="C2" domainClass="ecore.EAttribute"> <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="1" arcWidth="1" arcHeight="1" workspacePath="/test/noimage.gif"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -35,7 +35,7 @@ </ownedTools> </toolSections> <decorationDescriptionsSet> - <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="DecorationSemantic" domainClass="EAttribute"/> + <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="DecorationSemantic" domainClass="ecore.EAttribute"/> <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="DecorationMapping" decoratorPath="/org.eclipse.sirius.tests.junit/images/notexisting.png" mappings="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@containerMappings[name='C1']"/> <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="DecoMap" decoratorPath="/Project/es.png" mappings="//@ownedViewpoints[name='V']/@ownedRepresentations[name='D']/@defaultLayer/@containerMappings[name='C2']"/> </decorationDescriptionsSet> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMProblemSeverity.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMProblemSeverity.odesign index ec007ee4d3..2a9cd82925 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMProblemSeverity.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMProblemSeverity.odesign @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="11.0.0.201601261200"> <ownedViewpoints name="2475"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="node1" semanticCandidatesExpression="aql:OrderedSet{}->concat(OrderedSet{})" domainClass="EClass"> + <nodeMappings name="node1" semanticCandidatesExpression="aql:OrderedSet{}->concat(OrderedSet{})" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" tooltipExpression="aql:self" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -18,7 +18,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <nodeMappings name="node3" domainClass="EClass"> + <nodeMappings name="node3" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription" tooltipExpression="aql:" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign index 0bfb1e2310..cae1c2b217 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" version="11.0.0.201601261200"> <ownedViewpoints name="2475"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="node" domainClass="EClass"> + <nodeMappings name="node" domainClass="ecore.EClass"> <conditionnalStyles predicateExpression="aql:OrderedSet{}"/> </nodeMappings> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="nodeImport" domainClass="EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']"/> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="nodeImport" domainClass="ecore.EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']"/> <edgeMappings name="relation" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetFinderExpression="aql:OrderedSet{}"/> - <edgeMappings name="elementEdge" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='containerImport']" domainClass="EReference" useDomainElement="true"/> + <edgeMappings name="elementEdge" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='containerImport']" domainClass="ecore.EReference" useDomainElement="true"/> <edgeMappingImports name="edgeImport" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='relation']"/> - <containerMappings name="container" domainClass="EClass"> + <containerMappings name="container" domainClass="ecore.EClass"> <conditionnalStyles predicateExpression="aql:OrderedSet{}"/> </containerMappings> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerImport" domainClass="EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']"/> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerImport" domainClass="ecore.EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']"/> </defaultLayer> </ownedRepresentations> </ownedViewpoints> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideDomainClassVSM.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideDomainClassVSM.odesign index 6c6043bf1c..493e913c48 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideDomainClassVSM.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideDomainClassVSM.odesign @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="valideDomainClassVSM" version="11.0.0.201601261200"> <ownedViewpoints name="viewpointValidDomain"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="class" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="class" domainClass="ecore.EClass"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="class1" domainClass="EClass"> - <subContainerMappings name="attr1" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class1" domainClass="ecore.EClass"> + <subContainerMappings name="attr1" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -20,8 +20,8 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="class2" domainClass="EClass"> - <subContainerMappings name="attr2" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class2" domainClass="ecore.EClass"> + <subContainerMappings name="attr2" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -36,8 +36,8 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="class3" domainClass="EClass"> - <subContainerMappings name="attr3" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class3" domainClass="ecore.EClass"> + <subContainerMappings name="attr3" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -53,16 +53,16 @@ </style> </containerMappings> <decorationDescriptionsSet> - <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="Deco" decoratorPath="" domainClass="EClass"/> + <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="Deco" decoratorPath="" domainClass="ecore.EClass"/> </decorationDescriptionsSet> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="CrossTable" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="CrossTable" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <ownedLineMappings name="Line" domainClass="EClass"/> - <ownedColumnMappings name="Column" domainClass="EClass"/> + <ownedLineMappings name="Line" domainClass="ecore.EClass"/> + <ownedColumnMappings name="Column" domainClass="ecore.EClass"/> </ownedRepresentations> - <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> </ownedRepresentations> </ownedViewpoints> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSM.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSM.odesign index 7d4dbde5f9..0bd881b619 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSM.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSM.odesign @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="11.0.0.201601261200"> <ownedViewpoints name="valideVSM"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <containerMappings name="class" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign index f0e7559e21..1d1c28efaa 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-3834" version="11.0.0.201601261200"> <ownedViewpoints name="VP-3834_Viewpoint" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() = null"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="ecore.EPackage" preconditionExpression="aql:self.eContainer() = null"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <nodeMappings name="EClassMapping" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass"> @@ -32,7 +32,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ePackage"/> <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']" containerViewExpression="[elementView/]"/> </firstModelOperations> @@ -42,7 +42,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="eClass"/> <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@nodeMappings[name='EClassMapping']" containerViewExpression="[elementView/]"/> </firstModelOperations> @@ -52,7 +52,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferenceType" valueExpression="[element/]"/> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="ref"/> <subModelOperations xsi:type="tool_1:CreateEdgeView" mapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@edgeMappings[name='EReferenceMapping']" containerViewExpression="[elementView.eContainer()/]" sourceExpression="[elementView/]" targetExpression="[elementView/]"/> @@ -63,7 +63,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <firstModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="eClass"/> </firstModelOperations> </initialOperation> @@ -129,7 +129,7 @@ </style> </conditionnalStyles> </edgeMappingImports> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="ecore.EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']"> <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVariableNameVSM.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVariableNameVSM.odesign index e30ab1051b..c2a5d421ab 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVariableNameVSM.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVariableNameVSM.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" version="11.0.0.201601261200"> <ownedViewpoints name="valideVariableNameVSM"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <edgeMappings name="Edge" sourceMapping="//@ownedViewpoints[name='valideVariableNameVSM']/@ownedRepresentations[name='diagram']/@defaultLayer/@containerMappings[name='class']" targetMapping="//@ownedViewpoints[name='valideVariableNameVSM']/@ownedRepresentations[name='diagram']/@defaultLayer/@containerMappings[name='class']" targetFinderExpression="feature:eReferences"> @@ -12,8 +12,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="class" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> + <containerMappings name="class" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="attribute" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EAttribute"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -47,9 +47,9 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="table" domainClass="EClass"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="table" domainClass="ecore.EClass"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> - <ownedLineMappings name="Line" domainClass="EClass"/> + <ownedLineMappings name="Line" domainClass="ecore.EClass"/> <ownedColumnMappings name="Column" featureName="feature:eAllContents"> <directEdit> <variables name="element" documentation="The currently edited element."/> diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java index e24532d266..dcea6f2842 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java @@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.sirius.common.tools.api.interpreter.CompoundInterpreter; +import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.diagram.description.ConditionalContainerStyleDescription; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; @@ -42,7 +43,9 @@ import org.eclipse.sirius.diagram.sequence.description.ExecutionMapping; import org.eclipse.sirius.diagram.sequence.description.InstanceRoleMapping; import org.eclipse.sirius.diagram.sequence.description.MessageMapping; import org.eclipse.sirius.diagram.sequence.description.SequenceDiagramDescription; +import org.eclipse.sirius.ecore.design.service.EcoreSamplePlugin; import org.eclipse.sirius.editor.tools.internal.marker.SiriusEditorInterpreterMarkerService; +import org.eclipse.sirius.sample.interactions.Activator; import org.eclipse.sirius.table.metamodel.table.description.EditionTableDescription; import org.eclipse.sirius.table.metamodel.table.description.FeatureColumnMapping; import org.eclipse.sirius.table.metamodel.table.description.ForegroundConditionalStyle; @@ -151,8 +154,10 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase public void testAValidationExpressionWithAQL() { Layer acceleo2Layer = getLayer(diagramEntitiesAcceleo2, "Default"); ContainerMapping nodeMapping = getContainerMapping(acceleo2Layer, "EC EClass"); - ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticCandidatesExpression", "aql:self.invalidFeatureExpression","Feature invalidFeatureExpression not found in EClass EPackage"); - ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticElements", "aql:self.invalidFeatureExpression","Feature invalidFeatureExpression not found in EClass EPackage","Feature invalidFeatureExpression not found in EClass EClass"); + ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticCandidatesExpression", "aql:self.invalidFeatureExpression", + "Feature invalidFeatureExpression not found in EClass EPackage"); + ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticElements", "aql:self.invalidFeatureExpression", "Feature invalidFeatureExpression not found in EClass EPackage", + "Feature invalidFeatureExpression not found in EClass EClass"); } /** @@ -177,12 +182,14 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase ContainerMapping nodeMapping = getContainerMapping(acceleo3Layer, "EC EClass"); // invalidFeature ECLass : a validation error should be raised, but not // InterpreterException - ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "domainClass", "Nothing", "The Class Nothing does not exist."); + ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "domainClass", "Nothing", "The Class Nothing does not exist.", + "The type name Nothing used in domainClass does not have a package prefix."); // invalidFeature ECLass : a validation error should be raised - ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticElements", "[self.invalidFeature/]", "Invalid Type: Nothing", "Unrecognized variable: (invalidFeature)", - "The Class Nothing does not exist."); + ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "semanticElements", "[self.invalidFeature/]", "Invalid Type: Nothing", + "The type name Nothing used in domainClass does not have a package prefix.", "Unrecognized variable: (invalidFeature)", "The Class Nothing does not exist."); // valid EClass : interpreter exceptions should now be raised - ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "domainClass", "EClass", "Unrecognized variable: (invalidFeature)"); + ensureExpressionValidationRaisedExpectedErrors(nodeMapping, "domainClass", "EClass", "Unrecognized variable: (invalidFeature)", + "The type name EClass used in domainClass does not have a package prefix."); } /** @@ -326,8 +333,11 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase */ public void testValidationExpressionWithAcceleo3OnSequenceDiagramInstanceRole() { InstanceRoleMapping instanceRole = (InstanceRoleMapping) sequenceDiagramAcceleo3.getDefaultLayer().getNodeMappings().iterator().next(); - ensureExpressionValidationRaisedExpectedErrors(instanceRole, "semanticCandidatesExpression", "[self/]"); - ensureExpressionValidationRaisedExpectedErrors(instanceRole, "semanticCandidatesExpression", "[self.invalidFeature/]", "Unrecognized variable: (invalidFeature)"); + ensureExpressionValidationRaisedExpectedErrors(instanceRole, "semanticCandidatesExpression", "[self/]", + "The EClass interactions.Participant used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin."); + ensureExpressionValidationRaisedExpectedErrors(instanceRole, "semanticCandidatesExpression", "[self.invalidFeature/]", + "The EClass interactions.Participant used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin.", + "Unrecognized variable: (invalidFeature)"); } /** @@ -336,8 +346,11 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase public void testValidationExpressionWithAcceleo3OnSequenceDiagramExecution() { InstanceRoleMapping instanceRole = (InstanceRoleMapping) sequenceDiagramAcceleo3.getDefaultLayer().getNodeMappings().iterator().next(); ExecutionMapping executionMapping = (ExecutionMapping) instanceRole.getAllMappings().iterator().next(); - ensureExpressionValidationRaisedExpectedErrors(executionMapping, "startingEndFinderExpression", "[self/]"); - ensureExpressionValidationRaisedExpectedErrors(executionMapping, "startingEndFinderExpression", "[self.invalidFeature/]", "Unrecognized variable: (invalidFeature)"); + ensureExpressionValidationRaisedExpectedErrors(executionMapping, "startingEndFinderExpression", "[self/]", + "The EClass interactions.Participant used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin."); + ensureExpressionValidationRaisedExpectedErrors(executionMapping, "startingEndFinderExpression", "[self.invalidFeature/]", + "The EClass interactions.Participant used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin.", + "Unrecognized variable: (invalidFeature)"); } /** @@ -345,8 +358,11 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase */ public void testValidationExpressionWithAcceleo3OnSequenceDiagramMessageEnd() { MessageMapping messageMapping = (MessageMapping) sequenceDiagramAcceleo3.getDefaultLayer().getEdgeMappings().iterator().next(); - ensureExpressionValidationRaisedExpectedErrors(messageMapping, "sendingEndFinderExpression", "[self.sendingEnd/]"); - ensureExpressionValidationRaisedExpectedErrors(messageMapping, "sendingEndFinderExpression", "[self.invalidFeature/]", "Unrecognized variable: (invalidFeature)"); + ensureExpressionValidationRaisedExpectedErrors(messageMapping, "sendingEndFinderExpression", "[self.sendingEnd/]", + "The EClass interactions.FeatureAccessMessage used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin."); + ensureExpressionValidationRaisedExpectedErrors(messageMapping, "sendingEndFinderExpression", "[self.invalidFeature/]", + "The EClass interactions.FeatureAccessMessage used in domainClass is not accessible. You are most likely trying to use an EClass without having a dependency to its plugin.", + "Unrecognized variable: (invalidFeature)"); } protected void ensureExpressionValidationRaisedExpectedErrors(EObject target, String featureName, Object newValue, String... message) { @@ -418,6 +434,7 @@ public class IInterpreterValidationExpressionTest extends SiriusDiagramTestCase private Layer getLayer(DiagramDescription diagramDescription, final String expectedLayerName) { Iterable<Layer> layers = Iterables.filter(diagramDescription.getAllLayers(), new Predicate<Layer>() { + @Override public boolean apply(Layer input) { return input.getName().equals(expectedLayerName); } diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/a.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/a.odesign index 25cacda508..503f8c6d6a 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/a.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/a.odesign @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="ASCII"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="A" version="11.0.0.201601261200"> <ownedViewpoints name="ViewpointA" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="FirstDiagram" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="FirstDiagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <nodeMappings name="Class" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/b.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/b.odesign index 78d1b1ac5f..9741bbe8c2 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/b.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/b.odesign @@ -4,7 +4,7 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="ExtendsA" viewpointURI="viewpoint:/DesignerTestProject/ViewpointA" representationName="FirstDiagram"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <layers name="Extension B"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="ImportClass" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="ImportClass" semanticCandidatesExpression="feature:eAllContents" domainClass="ecore.EClass"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/c.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/c.odesign index 456e9d2f73..892fa4cdfd 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/c.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/viewpoint_uri/ticket_2152/c.odesign @@ -4,7 +4,7 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Extension C" viewpointURI="viewpoint:/DesignerTestProject/ViewpointA" representationName="FirstDiagram"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <layers name="additionnalLayer"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="TheMegaExtension" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="TheMegaExtension" semanticCandidatesExpression="feature:eContents" domainClass="ecore.EClass"> <style xsi:type="style:DotDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> |