diff options
| author | cbrun | 2016-01-26 14:34:58 +0000 |
|---|---|---|
| committer | Cedric Brun | 2016-01-28 17:15:55 +0000 |
| commit | 9bf570e3bbe2176e774f219c0fb28c5b44155d64 (patch) | |
| tree | a3ed302fbba16b5243ca3b3a9ea363cafe620c24 | |
| parent | 88cac8ac10b0d88b0fccd785b49be8152be64ac2 (diff) | |
| download | org.eclipse.sirius-9bf570e3bbe2176e774f219c0fb28c5b44155d64.tar.gz org.eclipse.sirius-9bf570e3bbe2176e774f219c0fb28c5b44155d64.tar.xz org.eclipse.sirius-9bf570e3bbe2176e774f219c0fb28c5b44155d64.zip | |
[478878] Migrate swtbot tests from Legacy to AQL
Translate all the Acceleo legacy expression to their AQL equivalent in
the .odesign files
Remove the dependency to query legacy.
Only 2 matches are remaining for %> in the project. One is a label
expression : [<%name%>] and another one is a comment in the vp-3009.aird
model.
Bug: 478878
Change-Id: Id913bdee2a113dcf5d43a1bb2bf01c492d7ce2f0
125 files changed, 3601 insertions, 3393 deletions
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 c1c8355a7e..5f824ac325 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 @@ -138,7 +138,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> @@ -678,7 +678,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign index da90c2544f..c8f5e294d8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/ecore_with_blank.odesign @@ -137,7 +137,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign index 1c6633c82a..3c95780d58 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign @@ -8,7 +8,7 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.isAbstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> + <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.abstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> <defaultStyle labelExpression="*aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old index b175358b58..fbe8b3c61e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old @@ -8,7 +8,7 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.isAbstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> + <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.abstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> <defaultStyle labelExpression="*aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/reconciler/uml2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/reconciler/uml2.odesign index 3ea775b607..add190baa2 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/reconciler/uml2.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/reconciler/uml2.odesign @@ -825,7 +825,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> + <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign index a6180aa260..47cff14db7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/compartmentListEltsReorderingOnDirectEdit/vp1753.odesign @@ -99,7 +99,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='DesignModifItemList']/@ownedRepresentations[name='EntitiesModif']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign index f68b030d5d..58f115dc20 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/full/uml2.odesign @@ -830,7 +830,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> + <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign index 1826976f8c..fdc50f88a8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/ecore.odesign @@ -104,7 +104,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign index 68eab2a680..91a9bbbbd7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/idAndLabels/ecore.odesign @@ -110,7 +110,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign index 2d0d16d3f2..f012a3de1a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/style/layers/ecore.odesign @@ -109,7 +109,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design861']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/1457/diagram.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/1457/diagram.odesign index 1d3577372a..1482f8cd46 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/1457/diagram.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/1457/diagram.odesign @@ -100,7 +100,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/noDiagram_noViewpoint/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/noDiagram_noViewpoint/ecore.odesign index c3f44c3622..d3e985c80a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/noDiagram_noViewpoint/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/noDiagram_noViewpoint/ecore.odesign @@ -137,7 +137,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/1907/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/1907/ecore.odesign index afa812cf9f..dc33b6877c 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/1907/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/1907/ecore.odesign @@ -103,7 +103,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/ecore.odesign index 94d75ee640..eeb9d5dc08 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/ecore.odesign @@ -127,7 +127,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.self.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF index 55174084b9..d69f182b18 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.tests.swtbot/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.gef, org.eclipse.sirius.tests.junit.support, org.eclipse.sirius.tests.junit, - org.eclipse.sirius.query.legacy, + org.eclipse.sirius.common.acceleo.aql;bundle-version="3.1.0", org.eclipse.gmf.runtime.draw2d.ui, org.eclipse.sirius.diagram, org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.2.1", diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/TreeFolding/tc1852.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/TreeFolding/tc1852.odesign index 277a4c3419..6013bbdca9 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/TreeFolding/tc1852.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/TreeFolding/tc1852.odesign @@ -1,5 +1,5 @@ <?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="TC1852" version="8.0.0"> +<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="TC1852" version="10.1.3.201511131800"> <ownedViewpoints name="Design TC1852" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Nodes Target" domainClass="EPackage"> <defaultLayer name="Default"> @@ -11,7 +11,7 @@ </style> </nodeMappings> <edgeMappings name="NT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetFinderExpression="feature:eContainer" targetExpression=""> - <style sourceArrow="OutputArrow" targetArrow="Diamond" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style sourceArrow="OutputArrow" targetArrow="Diamond" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -23,7 +23,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Target" domainClass="EPackage"> <defaultLayer name="Default"> <edgeMappings name="CT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetFinderExpression="feature:eContainer" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -31,7 +31,7 @@ </style> </edgeMappings> <containerMappings name="CT Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -49,8 +49,8 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </nodeMappings> - <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="<%eContents.filter("EPackage")%>" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression=""> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -61,8 +61,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Source" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="<%eContents.filter("EPackage")%>" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression=""> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -70,7 +70,7 @@ </style> </edgeMappings> <containerMappings name="CS Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -89,8 +89,8 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </nodeMappings> - <edgeMappings name="NS OTL subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source%20And%20Ordered%20Tree%20Layout']/@defaultLayer/@nodeMappings[name='NS%20OTL%20Package%20']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source%20And%20Ordered%20Tree%20Layout']/@defaultLayer/@nodeMappings[name='NS%20OTL%20Package%20']" targetFinderExpression="<%eContents.filter("EPackage")%>" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <edgeMappings name="NS OTL subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source%20And%20Ordered%20Tree%20Layout']/@defaultLayer/@nodeMappings[name='NS%20OTL%20Package%20']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source%20And%20Ordered%20Tree%20Layout']/@defaultLayer/@nodeMappings[name='NS%20OTL%20Package%20']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression=""> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bendpointsStability/bendpointsStability.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bendpointsStability/bendpointsStability.odesign index 3114c11b4b..7d70059106 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bendpointsStability/bendpointsStability.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bendpointsStability/bendpointsStability.odesign @@ -1,5 +1,5 @@ <?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" 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" version="8.1.0"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="bendpointsStabilityViewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="bendpointsStabilityDiag" domainClass="EPackage"> <defaultLayer name="Default"> @@ -18,8 +18,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageContainer" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']" reusedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="PackageContainer" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']" reusedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -41,7 +41,7 @@ </toolSections> </defaultLayer> <additionalLayers name="Manhattan Edges"> - <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="feature:name"> @@ -51,7 +51,7 @@ </edgeMappings> </additionalLayers> <additionalLayers name="Straight Edges"> - <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="feature:name"> @@ -61,7 +61,7 @@ </edgeMappings> </additionalLayers> <additionalLayers name="Bracket Edges"> - <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" targetFinderExpression="aql:self.eSuperTypes"> <style xsi:type="style:BracketEdgeStyleDescription" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -74,7 +74,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="bendpointsStabilityBorderedDiag" domainClass="EPackage"> <defaultLayer name="Default"> <containerMappings name="SuperContainer" semanticCandidatesExpression="[eSubpackages.eSuperPackage/]" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']" reusedContainerMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@containerMappings[name='PackageContainer']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bracketEdge/VP-3092.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bracketEdge/VP-3092.odesign index 20d5557e09..0191a67c2c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bracketEdge/VP-3092.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/bracketEdge/VP-3092.odesign @@ -1,31 +1,31 @@ <?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="VP-3092" version="8.0.0"> +<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="VP-3092" version="10.1.3.201511131800"> <ownedViewpoints name="VP-3092_Viewpoint" label="VP-3092_Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3092_DiagramDescription" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="EAnnotationMapping" semanticCandidatesExpression="<%eAnnotations%>" domainClass="ecore.EAnnotation"> - <style xsi:type="style:DotDescription" labelExpression="<%source%>"> + <nodeMappings name="EAnnotationMapping" semanticCandidatesExpression="aql:self.eAnnotations" domainClass="ecore.EAnnotation"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.source"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EReferenceMapping" preconditionExpression="<%!eOpposite%>" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReferenceTool']"> + <edgeMappings name="EReferenceMapping" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReferenceTool']"> <style xsi:type="style:BracketEdgeStyleDescription" sourceArrow="InputArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelExpression="<%name%>"> + <beginLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%>"> + <endLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </endLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="EAnnotation2EReferenceMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@nodeMappings[name='EAnnotationMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='EReferenceMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='ESupertypeMapping']" targetFinderExpression="<%references%>" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEAnnotation2EReferenceTool']"> + <edgeMappings name="EAnnotation2EReferenceMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@nodeMappings[name='EAnnotationMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='EReferenceMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='ESupertypeMapping']" targetFinderExpression="aql:self.references" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEAnnotation2EReferenceTool']"> <style xsi:type="style:BracketEdgeStyleDescription" sourceArrow="InputArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription labelExpression="eAnnotationToBracket"> @@ -33,52 +33,52 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="EReference2EAnnotationMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='EReferenceMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='ESupertypeMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@nodeMappings[name='EAnnotationMapping']" targetFinderExpression="<%eAnnotations%>" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReference2EAnnotationTool']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EReference2EAnnotationMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='EReferenceMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@edgeMappings[name='ESupertypeMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@nodeMappings[name='EAnnotationMapping']" targetFinderExpression="aql:self.eAnnotations" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReference2EAnnotationTool']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <centerLabelStyleDescription labelExpression="RefToEAnnot"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="ESupertypeMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectESupertypeTool']"> + <edgeMappings name="ESupertypeMapping" sourceMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectESupertypeTool']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelExpression="<%name%>"> + <beginLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </beginLabelStyleDescription> <centerLabelStyleDescription labelExpression="Extend"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%>"> + <endLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </endLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EPackageMapping" semanticCandidatesExpression="<%eSubpackages%>" domainClass="ecore.EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EPackageMapping']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EPackageMapping" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="ecore.EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EClassMapping'] //@ownedViewpoints[name='VP-3092_Viewpoint']/@ownedRepresentations[name='VP-3092_DiagramDescription']/@defaultLayer/@containerMappings[name='EPackageMapping']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EClassMapping" semanticCandidatesExpression="<%eClassifiers%>" domainClass="ecore.EClass" childrenPresentation="List"> - <subNodeMappings name="EAttributeMapping" semanticCandidatesExpression="<%eAllAttributes%>" domainClass="ecore.EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <containerMappings name="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="ecore.EClass" childrenPresentation="List"> + <subNodeMappings name="EAttributeMapping" semanticCandidatesExpression="aql:self.eAllAttributes" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="EOperationMapping" semanticCandidatesExpression="<%eOperations%>" semanticElements="<%self + eParameters%>" domainClass="ecore.EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="ecore.EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -91,7 +91,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -101,7 +101,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -115,7 +115,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -125,7 +125,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="ecore.EAnnotation" referenceName="eAnnotations"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="A<%getRootContainer().eAllContents.filter("EAnnotation").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="aql:'A' + self.eResource().getContent()->first().eAllContents()->filter(ecore::EAnnotation)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -170,28 +170,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -209,35 +209,35 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source==$element%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -267,7 +267,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eAnnotations" valueExpression="aql:edgeView.targetNode.target"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/canonicalrefresh/test01/canonical_refresh01.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/canonicalrefresh/test01/canonical_refresh01.odesign index d46a4f8327..7020d95184 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/canonicalrefresh/test01/canonical_refresh01.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/canonicalrefresh/test01/canonical_refresh01.odesign @@ -1,33 +1,33 @@ <?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" 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" documentation="Ticket #2026 et #2253
" name="EdgeRefreshAfterViewCreation" version="8.0.0"> +<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" documentation="Ticket #2026 et #2253
" name="EdgeRefreshAfterViewCreation" version="10.1.3.201511131800"> <ownedViewpoints documentation="Ticket #2026" name="Test case for ticket #2026" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2026_Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="ContainerPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> - <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="ContainerPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> + <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <subContainerMappings name="Child Container" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="Child Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -35,7 +35,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@edgeMappings[name='Reference']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@edgeMappings[name='Reference']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -49,7 +49,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -76,7 +76,7 @@ </ownedTools> <ownedTools xsi:type="tool:ContainerCreationDescription" name="Create Packages" forceRefresh="true" containerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> <variable name="container"> - <subVariables xsi:type="tool_1:SelectModelElementVariable" name="elements" candidatesExpression="<%eAllContents("EPackage")%>" multiple="true" message="Pick the good one..."/> + <subVariables xsi:type="tool_1:SelectModelElementVariable" name="elements" candidatesExpression="aql:self.eAllContents(ecore::EPackage)" multiple="true" message="Pick the good one..."/> </variable> <viewVariable name="containerView"/> <initialOperation> @@ -110,16 +110,16 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -131,7 +131,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -146,10 +146,10 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnNodeInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -169,7 +169,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -177,7 +177,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this container"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this container"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -189,7 +189,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -211,16 +211,16 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -235,23 +235,23 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-NodeInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="EPackage4" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20class']"> - <subNodeMappings name="EClass4" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EClass"> + <subNodeMappings name="EClass4" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -259,7 +259,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -271,7 +271,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -281,7 +281,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="<%eAllContents.filter("EClass")%>" selectedValuesMessage="Selected classes to add in this package"> + <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" selectedValuesMessage="Selected classes to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -291,7 +291,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop class" label="Drop class" mappings="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop class" label="Drop class" mappings="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -303,16 +303,16 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="EClassContainer" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_chocolate']"/> @@ -320,7 +320,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -335,24 +335,24 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="EPackage5" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20class']"> - <subContainerMappings name="EClass5" semanticCandidatesExpression="<%eAllContents()%>" createElements="false" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="EClass5" semanticCandidatesExpression="aql:self.eAllContents()" createElements="false" domainClass="EClass"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -360,7 +360,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -372,7 +372,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -382,7 +382,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="<%eAllContents.filter("EClass")%>" selectedValuesMessage="Selected classes to add in this package"> + <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" selectedValuesMessage="Selected classes to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -392,7 +392,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop class" label="Drop class" mappings="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop class" label="Drop class" mappings="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -404,16 +404,16 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerList" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="EClassContainerList" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_chocolate']"/> @@ -421,7 +421,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -436,24 +436,24 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerListInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="EPackage6" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> - <subContainerMappings name="EClass6List" semanticCandidatesExpression="<%eAllContents()%>" createElements="false" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="EClass6List" semanticCandidatesExpression="aql:self.eAllContents()" createElements="false" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -461,7 +461,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -473,7 +473,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -488,10 +488,10 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -504,7 +504,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -512,7 +512,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -524,7 +524,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -539,10 +539,10 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnContainerInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -556,14 +556,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -571,7 +571,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this container"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this container"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -583,7 +583,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/changeColorMenu/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/changeColorMenu/My.odesign index e43e9748dc..5bd40c326d 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/changeColorMenu/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/changeColorMenu/My.odesign @@ -1,5 +1,5 @@ <?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" name="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="vp"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> <defaultLayer name="Default"> @@ -17,13 +17,13 @@ <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> - <conditionnalStyles predicateExpression="<%name == "E2"%>"> + <conditionnalStyles predicateExpression="aql:self.name = 'E2'"> <style xsi:type="style:CustomStyleDescription" 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']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name == "EP1"%>"> + <conditionnalStyles predicateExpression="aql:self.name = 'EP1'"> <style xsi:type="style:DotDescription" 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']"/> @@ -31,14 +31,14 @@ </style> </conditionnalStyles> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> </style> - <conditionnalStyles predicateExpression="<%name == "p2"%>"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.name = 'p2'"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/My.odesign index c6d7c290c2..ac524f1721 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/My.odesign @@ -1,5 +1,5 @@ <?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: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="My" version="8.1.0"> +<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" 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="My" version="10.1.3.201511131800"> <ownedViewpoints name="testclosingotherrepresentation"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diag1" domainClass="EPackage"> <defaultLayer name="Default"> @@ -10,7 +10,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="inheritance" deletionDescription="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@toolSections.0/@ownedTools[name='']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="inheritance" deletionDescription="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@toolSections.0/@ownedTools[name='']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='testclosingotherrepresentation']/@ownedRepresentations[name='diag1']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -24,8 +24,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/vp-1854.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/vp-1854.odesign index f3a2a388c6..9024759a4a 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/vp-1854.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/closeEditorSpecificTest/vp-1854.odesign @@ -1,17 +1,17 @@ <?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="VP-1854" version="8.0.0"> +<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="VP-1854" version="10.1.3.201511131800"> <ownedViewpoints name="VP-1854" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1854" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <containerMappings name="EPackage" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="LEFT"> + <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -25,8 +25,8 @@ <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:For" expression="<%eClassifiers%>"> - <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="<%eContainer.eContainer%>" featureName="eClassifiers"/> + <subModelOperations xsi:type="tool:For" expression="aql:self.eClassifiers"> + <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="aql:self.eContainer().eContainer()" featureName="eClassifiers"/> </subModelOperations> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.a/ext_a.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.a/ext_a.odesign index 0020ce27b9..5a49637eb2 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.a/ext_a.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.a/ext_a.odesign @@ -1,9 +1,9 @@ <?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" name="Extension_A" version="8.0.0"> +<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="Extension_A" version="10.1.3.201511131800"> <ownedViewpoints name="Extension_A" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Extension_A" viewpointURI="viewpoint:/vp2529.design/Base" representationName="Base Diagram"> <layers name="Extension_A_Layer" activeByDefault="true"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Customized_Class" preconditionExpression="<%isAbstract%>"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Customized_Class" preconditionExpression="aql:self.isAbstract"> <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/componentization/vp2529.design.ext.b/ext_b.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.b/ext_b.odesign index ba435e984f..2ac4aecce2 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.b/ext_b.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/componentization/vp2529.design.ext.b/ext_b.odesign @@ -1,9 +1,9 @@ <?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" name="Extension_B" version="8.0.0"> +<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="Extension_B" version="10.1.3.201511131800"> <ownedViewpoints name="Extension_B" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Extension_B" viewpointURI="viewpoint:/vp2529.design/Base" representationName="Base Diagram"> <layers name="Extension_B_Layer" activeByDefault="true"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Customized_Class_B" preconditionExpression="<%interface%>"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Customized_Class_B" preconditionExpression="aql:self.interface"> <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/contentAssist/tc_viewpoint_742.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/contentAssist/tc_viewpoint_742.odesign index 5ed9b9b51c..8fab53f929 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/contentAssist/tc_viewpoint_742.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/contentAssist/tc_viewpoint_742.odesign @@ -1,23 +1,23 @@ <?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="tc_viewpoint_742" version="8.0.0"> +<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="tc_viewpoint_742" version="10.1.3.201511131800"> <ownedViewpoints name="tc_viewpoint_742"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc_viewpoint_742" domainClass="EPackage"> - <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="<%" domainClass="EPackage"> + <nodeMappings name="EPackage" semanticCandidatesExpression="feature:eContents" semanticElements="aql:OrderedSet{}" domainClass="EPackage"> <borderedNodeMappings name="EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_on_DN2EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_on_DN2EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_on_DNEP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_on_DNEP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DNEP_<%name%>" resizeKind="NSEW" width="25" height="25"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DNEP_' + self.name" resizeKind="NSEW" width="25" height="25"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign index 626e48707f..065a6f47aa 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/copyPaste/vp-1894.odesign @@ -1,19 +1,19 @@ <?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" 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" version="8.0.0"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="vp-1894" modelFileExtension="*.ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="diagramWithCustomClipboard" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" domainClass="EPackage"> - <edgeMappings name="Reference" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <edgeMappings name="Reference" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="SuperType" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="<%eSuperTypes%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1"> + <edgeMappings name="SuperType" pasteDescriptions="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='NoPaste'] //@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@toolSection/@ownedTools[name='PasteClass2InParentPackage']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetMapping="//@ownedViewpoints[name='vp-1894']/@ownedRepresentations[name='diagramWithCustomClipboard']/@containerMappings[name='Class']" targetFinderExpression="aql:self.eSuperTypes"> + <style lineStyle="dash" targetArrow="InputClosedArrow"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="super type of <%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'super type of ' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -26,7 +26,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -34,7 +34,7 @@ </style> </containerMappings> <toolSection> - <ownedTools xsi:type="tool:DeleteElementDescription" name="No delete " precondition="<%!$element.name.startsWith("nodelete_")%>"> + <ownedTools xsi:type="tool:DeleteElementDescription" name="No delete " precondition="aql:not element.name.startsWith('nodelete_')"> <element name="element"/> <elementView name="elementView"/> <containerView name="containerView"/> @@ -42,25 +42,25 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PasteDescription" name="NoPaste" precondition="<%false%>" forceRefresh="true"> + <ownedTools xsi:type="tool_1:PasteDescription" name="NoPaste" precondition="aql:false" forceRefresh="true"> <container name="container"/> <containerView name="containerView"/> <copiedView name="copiedView"/> <copiedElement name="copiedElement"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%container%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PasteDescription" documentation="Dummy paste tool." name="PasteClass2InParentPackage" precondition="<%$copiedElement.name.startsWith("pastable_")%>" forceRefresh="true"> + <ownedTools xsi:type="tool_1:PasteDescription" documentation="Dummy paste tool." name="PasteClass2InParentPackage" precondition="aql:copiedElement.name.startsWith('pastable_')" forceRefresh="true"> <container name="container"/> <containerView name="containerView"/> <copiedView name="copiedView"/> <copiedElement name="copiedElement"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("EPackage")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eClassifiers" valueExpression="var:copiedElement"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:copiedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="pasted_<%name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'pasted_' + self.name"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/defaultColorMenuRemoved/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/defaultColorMenuRemoved/ecore.odesign index 1a3c96622f..59c48fd832 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/defaultColorMenuRemoved/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/defaultColorMenuRemoved/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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: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']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,37 +12,37 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name + ' class has more than 3 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <nodeMappings name="attribut" semanticCandidatesExpression="<%eAllContents("EAttribute")%>" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="<%name%>Node"> + <nodeMappings name="attribut" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAttribute)" domainClass="EAttribute"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.name + 'Node'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> <nodeMappings name="class" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="attribute" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EAttribute"> - <style xsi:type="style:EllipseNodeDescription" labelExpression="<%name%>Node2"> + <borderedNodeMappings name="attribute" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EAttribute"> + <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:self.name + 'Node2'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -54,47 +54,49 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -102,44 +104,45 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']"> <borderedNodeMappings name="borderedAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>BorderedNode"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + 'BorderedNode'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </borderedNodeMappings> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>1" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + '1'" sizeComputationExpression="1" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -147,22 +150,22 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="package" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> + <containerMappings name="package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <subContainerMappings name="Class" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"/> </containerMappings> <toolSections name="Classifier"> @@ -172,7 +175,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -181,7 +184,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -191,7 +194,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -238,7 +241,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -249,7 +252,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -262,7 +265,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -287,7 +290,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -302,7 +305,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -312,8 +315,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -327,28 +330,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -366,35 +369,35 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -413,19 +416,19 @@ <ownedTools xsi:type="tool_1:DirectEditLabel" name="Edit EAttribute Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" name="EReference Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" documentation="- "name" : change the name of the operation" name="Operation Name" forceRefresh="true"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> </toolSections> @@ -441,8 +444,8 @@ </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -450,7 +453,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -464,12 +467,12 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -480,7 +483,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -489,7 +492,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -504,7 +507,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -516,24 +519,25 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="Classes in <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="10"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="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="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -543,45 +547,46 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EReferenceServices"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Add support for archeypes-based modeling to the Entities modeler." name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -595,15 +600,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -613,15 +618,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -631,15 +636,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -649,15 +654,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -668,9 +673,9 @@ <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.ArchetypeServices"/> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representations to assess the quality of an Ecore model." name="Quality" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="Dependencies of package <%name%>" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="aql:'Dependencies of package ' + self.name" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -678,15 +683,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> <containerMappings name="Analyzed Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -705,22 +710,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -731,23 +736,25 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="Relations for class <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="aql:'Relations for class ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -766,15 +773,15 @@ </toolSections> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -782,7 +789,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -790,15 +797,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -808,15 +815,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="<%eAllStructuralFeatures.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eType%>" sourceFinderExpression="<%eContainer("EClass")%>" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eType" sourceFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -824,7 +831,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -832,15 +839,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -850,9 +857,9 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="Type hierarchy of <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="aql:'Type hierarchy of ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -860,7 +867,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -870,36 +877,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -922,8 +931,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -932,19 +942,19 @@ </ownedRepresentationExtensions> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representation to document and review Ecore models." name="Review" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="Documentation for <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="aql:'Documentation for ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -961,19 +971,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -984,21 +994,21 @@ </ownedViewpoints> <ownedViewpoints endUserDocumentation="Adds support for EMF GenModel configuration." name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </backgroundConditionalStyle> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Category" headerLabelExpression="Category" canEdit="<%self.filter("GenFeature")%>" featureName="propertyCategory" labelExpression="<%if (self.filter("GenFeature")){%><%self.propertyCategory%><%}else{%><%""%><%}%>"/> - <ownedColumnMappings name="Decription" headerLabelExpression="Description" canEdit="<%self.filter("GenFeature")%>" featureName="propertyDescription" labelExpression="<%if (self.filter("GenFeature")){%><%self.propertyDescription%><%}else{%><%""%><%}%>"/> + <ownedColumnMappings name="Category" headerLabelExpression="Category" canEdit="aql:self->filter(genmodel::GenFeature)" featureName="propertyCategory" labelExpression="aql:if self.oclIsKindOf(genmodel::GenFeature) then self.propertyCategory else '' endif"/> + <ownedColumnMappings name="Decription" headerLabelExpression="Description" canEdit="aql:self->filter(genmodel::GenFeature)" featureName="propertyDescription" labelExpression="aql:if self.oclIsKindOf(genmodel::GenFeature) then self.propertyDescription else '' endif"/> </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-2091/VP-2091.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-2091/VP-2091.odesign index df3fe0ed11..f40cfb6bb0 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-2091/VP-2091.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-2091/VP-2091.odesign @@ -1,72 +1,75 @@ <?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" 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="VP-2091" version="8.0.0"> +<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="VP-2091" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="<html>
<head>
</head>
<body>
<p>Provides graphical and tabular representation to design an Ecore model.</p>
<br>
<img src="/doc/screenshots/entities.png"/>
<img src="/doc/screenshots/classes.png"/>
</body>
</html>


" name="VP-2091_Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="VP-2091_Diagram" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" deletionDescription="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EClass']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" deletionDescription="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EClass']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Design Package" deletionDescription="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EPackage']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" deletionDescription="//@ownedViewpoints[name='VP-2091_Viewpoint']/@ownedRepresentations[name='VP-2091_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EPackage']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-4380/VP-4380.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-4380/VP-4380.odesign index c9b1b9fa0b..298652d7fb 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-4380/VP-4380.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/VP-4380/VP-4380.odesign @@ -1,5 +1,5 @@ <?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" name="VP-4380" version="8.0.0"> +<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="VP-4380" version="10.1.3.201511131800"> <ownedViewpoints name="deleteFromDiagram"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="deleteFromDiagram" domainClass="EPackage"> <defaultLayer name="Default"> @@ -11,8 +11,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="eClass" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="eClass" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/bugzilla-444728/toolFilterNPE.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/bugzilla-444728/toolFilterNPE.odesign index c80852ad10..c2defeaebf 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/bugzilla-444728/toolFilterNPE.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/delete/bugzilla-444728/toolFilterNPE.odesign @@ -1,9 +1,9 @@ <?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" 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="toolFilterNPE" version="8.1.0"> +<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="toolFilterNPE" version="10.1.3.201511131800"> <ownedViewpoints name="toolFilterNPE" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="toolFilterNPE_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> - <nodeMappings name="Nodes" semanticCandidatesExpression="<%eContents%>" domainClass="EClass"> + <nodeMappings name="Nodes" semanticCandidatesExpression="aql:self.eContents()" domainClass="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']"/> @@ -12,7 +12,7 @@ </nodeMappings> <toolSections> <ownedTools xsi:type="tool:NodeCreationDescription" name="cl" forceRefresh="true" nodeMappings="//@ownedViewpoints[name='toolFilterNPE']/@ownedRepresentations[name='toolFilterNPE_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']"> - <filters precondition="<%target.eContents.nSize > 5%>" elementsToListen="<%current%>"> + <filters precondition="aql:self.target.eContents()->size() > 5" elementsToListen="aql:self"> <listeners domainClass="DDiagram" featureName="ownedDiagramElements"/> </filters> <variable name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/directEdit/inputLabel/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/directEdit/inputLabel/My.odesign index c459215eac..bcd85561ae 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/directEdit/inputLabel/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/directEdit/inputLabel/My.odesign @@ -1,5 +1,5 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="NewInputLabelForDirectEdit" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="ClassDiag" domainClass="EPackage"> <defaultLayer name="Default"> @@ -11,14 +11,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="['<<node>> ' + name/]" tooltipExpression="<%name%>" labelPosition="node" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="['<<node>> ' + name/]" tooltipExpression="aql:self.name" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> <containerMappings name="ClassList" labelDirectEdit="//@ownedViewpoints[name='NewInputLabelForDirectEdit']/@ownedRepresentations[name='ClassDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='DirectEditClass']" semanticCandidatesExpression="[eClassifiers/]" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="['<<list>> ' + name/]"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="['<<list>> ' + name/]"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -27,13 +27,13 @@ </containerMappings> <containerMappings name="ClassContainer" labelDirectEdit="//@ownedViewpoints[name='NewInputLabelForDirectEdit']/@ownedRepresentations[name='ClassDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='DirectEditClass']" semanticCandidatesExpression="[eClassifiers/]" domainClass="EClass"> <subNodeMappings name="ClassNodeInContainer" labelDirectEdit="//@ownedViewpoints[name='NewInputLabelForDirectEdit']/@ownedRepresentations[name='ClassDiag']/@defaultLayer/@toolSections.0/@ownedTools[name='DirectEditClass']" semanticCandidatesExpression="[self/]" domainClass="EClass"> - <style xsi:type="style:SquareDescription" labelExpression="['<<nodeInContainer>> ' + name/]" tooltipExpression="<%name%>" labelPosition="node" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="['<<nodeInContainer>> ' + name/]" tooltipExpression="aql:self.name" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="['<<container>> ' + name/]"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="['<<container>> ' + name/]"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <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.swtbot/data/unit/dragAndDrop/extra_mapping/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/extra_mapping/My.odesign index df205b7589..cbff567fdb 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/extra_mapping/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/extra_mapping/My.odesign @@ -1,17 +1,17 @@ <?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" 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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="bugReconnectAndDisappear" modelFileExtension="*.ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="package" domainClass="EPackage"> <defaultLayer name="Default"> <edgeMappings name="ereference edge" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='bugReconnectAndDisappear']/@ownedRepresentations[name='package']/@defaultLayer/@containerMappings[name='eclass']/@borderedNodeMappings[name='ereference']" targetMapping="//@ownedViewpoints[name='bugReconnectAndDisappear']/@ownedRepresentations[name='package']/@defaultLayer/@containerMappings[name='eclass']/@borderedNodeMappings[name='pointing%20ereference'] //@ownedViewpoints[name='bugReconnectAndDisappear']/@ownedRepresentations[name='package']/@defaultLayer/@containerMappings[name='eclass']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='bugReconnectAndDisappear']/@ownedRepresentations[name='package']/@defaultLayer/@toolSections.0/@ownedTools[name='REC%20ereference%20edge']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="edge <%name%>"> + <centerLabelStyleDescription labelExpression="aql:'edge ' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="eclass" preconditionExpression="<%eContents().filter("EReference").nSize > 0 || eContainer("EPackage").eAllContents("EReference")[eType == current(1)].nSize > 0%>" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="eclass" preconditionExpression="aql:self.eContents()->filter(ecore::EReference)->size() > 0 or self.eContainerOrSelf(ecore::EPackage).eAllContents(ecore::EReference)->select( e | e.eType = self)->size() > 0" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> <borderedNodeMappings name="ereference" semanticCandidatesExpression="feature:eContents" domainClass="EReference"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -19,14 +19,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="pointing ereference" semanticCandidatesExpression="<%eContainer("EPackage").eAllContents("EReference")[eType == current(1)]%>" domainClass="EReference"> - <style xsi:type="style:SquareDescription" labelExpression="<%name%>target"> + <borderedNodeMappings name="pointing ereference" semanticCandidatesExpression="aql:self.eContainerOrSelf(ecore::EPackage).eAllContents(ecore::EReference)->select( e | e.eType = self)" domainClass="EReference"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.name + 'target'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -42,7 +42,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="<%$target%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:target"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign index a19182f152..8e219159cf 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1041/tc1041.odesign @@ -1,17 +1,17 @@ <?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" 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="Ticket #1041" version="8.0.0"> +<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="Ticket #1041" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1041" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']" name="TC1041 representation 1" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Container EPackage R1" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name%20EPackage%20R1']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']"> - <subNodeMappings name="Node EPackage R1" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> + <containerMappings name="Container EPackage R1" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name%20EPackage%20R1']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']"> + <subNodeMappings name="Node EPackage R1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -25,7 +25,7 @@ <firstModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop R1" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop R1" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -41,15 +41,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R2']" name="TC1041 representation 2 Blank" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Container EPackage R2" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R2']"> - <subNodeMappings name="Node EPackage R2" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" createElements="false" domainClass="EPackage"> + <containerMappings name="Container EPackage R2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R2']"> + <subNodeMappings name="Node EPackage R2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage"> <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -57,7 +57,7 @@ </style> </containerMappings> <toolSections name="tools"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop R2" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R2']/@subNodeMappings[name='Node%20EPackage%20R2'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R2']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop R2" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R2']/@subNodeMappings[name='Node%20EPackage%20R2'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%202%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R2']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -73,8 +73,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1041 representation 3" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <nodeMappings name="Node EPackage R3" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%203']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R3']"> - <borderedNodeMappings name="EClass as ports" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="Node EPackage R3" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%203']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R3']"> + <borderedNodeMappings name="EClass as ports" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="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']"/> @@ -94,7 +94,7 @@ <firstModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop R3" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%203']/@defaultLayer/@nodeMappings[name='Node%20EPackage%20R3']/@borderedNodeMappings[name='EClass%20as%20ports']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop R3" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%203']/@defaultLayer/@nodeMappings[name='Node%20EPackage%20R3']/@borderedNodeMappings[name='EClass%20as%20ports']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -110,15 +110,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1041 representation 4" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Container EPackage R4" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%204']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R4']"> - <subNodeMappings name="Node EClass R4" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <containerMappings name="Container EPackage R4" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%204']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R4']"> + <subNodeMappings name="Node EClass R4" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -126,7 +126,7 @@ </style> </containerMappings> <toolSections name="tools"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop R4" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%204']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R4']/@subNodeMappings[name='Node%20EClass%20R4']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop R4" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%204']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R4']/@subNodeMappings[name='Node%20EClass%20R4']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -142,15 +142,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EPackage%20R5']" name="TC1041 representation 5 Blank" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Container EPackage R5" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EClass%20R5']"> - <subNodeMappings name="Node EClass R5" semanticCandidatesExpression="<%eContents().filter("EClass")%>" createElements="false" domainClass="EClass"> + <containerMappings name="Container EPackage R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20EClass%20R5']"> + <subNodeMappings name="Node EClass R5" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -158,7 +158,7 @@ </style> </containerMappings> <toolSections name="tools"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop EPackage R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R5']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop EPackage R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R5']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -169,7 +169,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drag & Drop EClass R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R5']/@subNodeMappings[name='Node%20EClass%20R5']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drag & Drop EClass R5" forceRefresh="true" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231041']/@ownedRepresentations[name='TC1041%20representation%205%20Blank']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R5']/@subNodeMappings[name='Node%20EClass%20R5']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1837/tc1837.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1837/tc1837.odesign index aa09854457..8c0c5b932d 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1837/tc1837.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-1837/tc1837.odesign @@ -1,24 +1,24 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ticket_1837" version="8.0.0"> +<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="Ticket_1837" version="10.1.3.201511131800"> <ownedViewpoints name="TC1837" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass_Blue'] //@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@additionalLayers[name='Optional']/@toolSections.0/@ownedTools[name='Drop%20EClass%20Green']" name="Main_Diagram" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="NM_EClass_Blue" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="NM_EClass_Blue" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <nodeMappings name="NM_EClass_Green" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="NM_EClass_Green" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass_Blue'] //@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@additionalLayers[name='Optional']/@toolSections.0/@ownedTools[name='Drop%20EClass%20Green']" reusedNodeMappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Blue'] //@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Green']" reusedContainerMappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass_Blue'] //@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@additionalLayers[name='Optional']/@toolSections.0/@ownedTools[name='Drop%20EClass%20Green']" reusedNodeMappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Blue'] //@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Green']" reusedContainerMappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -26,15 +26,15 @@ </style> </containerMappings> <toolSections name="Drop"> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass_Blue" precondition="<%true%>" forceRefresh="true" mappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Blue']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass_Blue" precondition="aql:true" forceRefresh="true" mappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Blue']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%name%> [droped using 'Drop EClass Blue' tool]"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.name + ' [droped using \'Drop EClass Blue\' tool]'"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -42,15 +42,15 @@ </defaultLayer> <additionalLayers name="Optional"> <toolSections name="Drop"> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass Green" precondition="<%true%>" forceRefresh="true" mappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Green']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass Green" precondition="aql:true" forceRefresh="true" mappings="//@ownedViewpoints[name='TC1837']/@ownedRepresentations[name='Main_Diagram']/@defaultLayer/@nodeMappings[name='NM_EClass_Green']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%name%> [droped using 'Drop EClass Green' tool]"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.name + ' [droped using \'Drop EClass Green\' tool]'"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-436/436.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-436/436.odesign index 49cb2e8cdc..1f7d8e75bd 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-436/436.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/tc-436/436.odesign @@ -1,5 +1,5 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="base" version="8.0.0"> +<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="base" version="10.1.3.201511131800"> <ownedViewpoints documentation="ddd" name="DragAndDropTests" label="DragAndDropTests" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='DragAndDropTests']/@ownedRepresentations[name='Class%20diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20tool']" name="Class diagram" label="Class diagram" domainClass="EPackage"> <defaultLayer name="Default"> @@ -18,9 +18,9 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%newSemanticContainer%>"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$element.name%> <%$element.path%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:newSemanticContainer"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:element.name + ' ' + element.path"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.odesign index 151a43cd21..ff9bd0c745 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/dragAndDrop/uml2.odesign @@ -1,7 +1,8 @@ <?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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="8.1.0"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="10.1.3.201511131800"> <ownedViewpoints documentation="Initialize an UML Analysis" name="UML Analysis workspace" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Fake ViewPointDescription - factorize elements" name="Reused Description" domainClass="Model"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <toolSection documentation="reused tools" name="reused tools"> <ownedTools xsi:type="tool:DirectEditLabel" documentation="A basic Direct Edit tool for NamedElement" name="NamedElementDirectEdit"> <mask mask="{0}"/> @@ -25,11 +26,11 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="<%current.ownedBehavior.filter("Interaction").nLast%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="aql:self.ownedBehavior->filter(interactions::Interaction)->last()" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interaction" referenceName="ownedBehavior"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer.name%> Interaction <%eContainer.ownedBehavior.filter("Interaction").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + ' Interaction ' +self.eContainer().ownedBehavior->filter(interactions::Interaction)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -40,8 +41,9 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" documentation="Diagram for Packages" name="Package Diagram" domainClass="Model" preconditionExpression=""> - <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Package")%>" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Package)" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -56,7 +58,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -78,6 +80,7 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy" domainClass="Model" defaultConcern="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@concerns/@ownedConcernDescriptions.0" init="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@toolSection/@ownedTools[name='InitHierarchy']"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Hide containment"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@edgeMappings[name='PH_Containment']"/> </filters> @@ -85,14 +88,14 @@ <ownedConcernDescriptions name="Default"/> <ownedConcernDescriptions name="Show Imports" filters="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@filters[name='Hide%20containment']"/> </concerns> - <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="<%eContents().filter("Package")%>" nodeMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']"/> + <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eContents()->filter(uml::Package)" nodeMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']"/> <nodeMappings name="PH_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@toolSection/@ownedTools[name='StateMachine'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Package"> <style xsi:type="style:BundledImageDescription" labelSize="10" sizeComputationExpression="4"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%eContents.filter("Classifier").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.eContents()->filter(uml::Classifier)->size() > 0"> <style xsi:type="style:BundledImageDescription" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -101,14 +104,15 @@ </conditionnalStyles> </nodeMappings> <edgeMappings name="PH_Containment" deletionDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@toolSection/@ownedTools[name='Delete%20a%20contained%20in%20edge']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:eContainer"> - <style lineStyle="dash" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style lineStyle="dash" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="<%importedPackage%>" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="aql:self.importedPackage" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelFormat="bold" showIcon="false"> + <centerLabelStyleDescription showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -119,7 +123,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New package <%eContainer.eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New package ' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -140,7 +144,7 @@ <containerView/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%eContainer("Model")%>" featureName="packagedElement"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:self.eContainerOrSelf(uml::Model)" featureName="packagedElement"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -157,7 +161,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="<%eContainer == null%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="aql:self.eContainer() = null" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -165,47 +169,48 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_Actor']" documentation="Diagram for Use Cases" name="Use Case Diagram" initialisation="true" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <nodeMappings name="UCD_Actor" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" documentation="Mapping to create actors" domainClass="Actor"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/Actor.png"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/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> </nodeMappings> - <edgeMappings name="UCD_Association" semanticCandidatesExpression="<%getRootContainer().eAllContents("Association")%>" semanticElements="<%memberEnd + current%>" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%memberEnd.type%>" sourceFinderExpression="<%memberEnd.type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Association" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Association)" semanticElements="aql:OrderedSet{self.memberEnd,self}" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.memberEnd.type" sourceFinderExpression="aql:self.memberEnd.type" targetExpression="var:self" domainClass="Association" useDomainElement="true"> + <style targetArrow="NoDecoration" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Extend" semanticCandidatesExpression="<%getRootContainer().eAllContents("Extend")%>" semanticElements="<%current + extension + extendedCase%>" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%extendedCase%>" sourceFinderExpression="<%extension%>" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Extend" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Extend)" semanticElements="aql:OrderedSet{self,self.extension,self.extendedCase}" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.extendedCase" sourceFinderExpression="aql:self.extension" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« extend »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="aql:'« extend »'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Include" semanticCandidatesExpression="<%getRootContainer().eAllContents("Include")%>" semanticElements="<%current + includingCase + addition%>" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%addition%>" sourceFinderExpression="<%includingCase%>" targetExpression="var:self" domainClass="Include" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Include" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Include)" semanticElements="aql:OrderedSet{self ,self.includingCase ,self.addition}" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.addition" sourceFinderExpression="aql:self.includingCase" targetExpression="var:self" domainClass="Include" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« include »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="« include »"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="<%getRootContainer().eAllContents("Actor").generalization%>" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Actor).generalization" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="UCD_Subject" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> - <subNodeMappings name="UCD_UseCase" preconditionExpression="<%subject.nContains($container)%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%nPut("e").nGet("e").getRootContainer().eAllContents("UseCase")[subject.nContains(current(1))]%>" documentation="Mapping to create Use Cases" domainClass="UseCase"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.png"> + <containerMappings name="UCD_Subject" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> + <subNodeMappings name="UCD_UseCase" preconditionExpression="aql:self.subject->includes(container)" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::UseCase)->select( e | e.subject->includes(self))" documentation="Mapping to create Use Cases" domainClass="UseCase"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.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> @@ -229,7 +234,7 @@ <newViewContainer name="newContainerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:For" expression="<%current.filter("UseCase")[!subject.nContains($newSemanticContainer)]%>"> + <subModelOperations xsi:type="tool_1:For" expression="aql:current->filter(uml::UseCase)->select( e | not e.subject->includes(newSemanticContainer))"> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:newSemanticContainer"/> </subModelOperations> </firstModelOperations> @@ -243,7 +248,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Actor" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Actor<%eContainer.eContents.filter("Actor").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Actor' + self.eContainer().eContents()->filter(uml::Actor)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -252,9 +257,9 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="UseCase" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="UseCase<%eContainer("Package").name%><%eContainer("Package").eContents().filter("UseCase").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'UseCase' + self.eContainerOrSelf(uml::Package).name + self.eContainerOrSelf(uml::Package).eContents()->filter(uml::UseCase)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:container"/> </subModelOperations> </firstModelOperations> @@ -266,18 +271,18 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Component" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer("Package").name%> Subject"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainerOrSelf(Package).name + ' Subject'"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="<%$preSource.filter("Actor").nSize() > 0 && $preTarget.filter("UseCase").nSize() > 0%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Association']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Association']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> @@ -285,12 +290,12 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Association_<%$source.name%>_to_<%$target.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Association_' + source.name + '_to_' + target.name"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Extend']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Extend']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -304,7 +309,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Include']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Include']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -318,7 +323,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="<%($preSource + $preTarget).filter("Actor").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Generalization']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::Actor)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Generalization']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -334,129 +339,133 @@ </subSections> </toolSection> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package']" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="<%filter("Model").nSize() > 0%>"> - <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package']" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="aql:self.oclIsKindOf(uml::Model)"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).generalization" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> + <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).generalization" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").interfaceRealization%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%contract%>" sourceFinderExpression="<%implementingClassifier%>" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).interfaceRealization" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.contract" sourceFinderExpression="aql:self.implementingClassifier" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%(eContents.filter("Package") + packageImport.importedPackage)[!name.startsWith("AA")].nMinimize%>" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:(self.eContents()->filter(uml::Package) + self.packageImport.importedPackage)->select( e | not e.name.startsWith('AA'))->asSet()" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="<%(filter("Class") + filter("DataType")).nSize() > 0%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType - ownedType.filter("Component")%>" documentation="Mapping to create classes" domainClass="Class" childrenPresentation="List"> - <subNodeMappings name="CD_Property" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%name%>" documentation="Mapping to create attributes" domainClass="Property"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%visibility.visibilityToString%> <%name%> : <%type.name%>" labelAlignment="LEFT" sizeComputationExpression="<%2%>"> + <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="aql:self.oclIsKindOf(uml::Class) or self.oclIsKindOf(uml::DataType)" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType->asSet() - self.ownedType->filter(uml::Component)" documentation="Mapping to create classes" domainClass="Class" childrenPresentation="List"> + <subNodeMappings name="CD_Property" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.name" documentation="Mapping to create attributes" domainClass="Property"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.visibility.visibilityToString() + ' ' + self.name + ' : ' + self.type.name" labelAlignment="LEFT" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="CD_Operation" preconditionExpression="<%$container == eContainer%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedOperation%>" domainClass="Operation"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>(<%parametersToString%>) : <%type.name%>" labelAlignment="LEFT" sizeComputationExpression="2"> + <subNodeMappings name="CD_Operation" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedOperation" domainClass="Operation"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + '(' +self.parametersToString() + ') : ' + self.type.name" labelAlignment="LEFT" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType%>" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType.filter("Enumeration")%>" semanticElements="" domainClass="Enumeration" childrenPresentation="List"> - <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedLiteral%>" domainClass="EnumerationLiteral"> - <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="<%2%>"> + <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType->filter(uml::Enumeration)" semanticElements="" domainClass="Enumeration" childrenPresentation="List"> + <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedLiteral" domainClass="EnumerationLiteral"> + <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Package_StartsWithAA" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="<%packagedElement.nSize() > 0 && eContainer != null%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Package")[name.startsWith("AA")]%>" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package_StartsWithAA'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="CD_Package_StartsWithAA" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="aql:self.packagedElement->size() > 0 and self.eContainer() <> null" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Package)->select( e | e.name.startsWith('AA'))" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package_StartsWithAA'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CD_Package_Empty_StartsWithAA" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="<%packagedElement.nSize() == 0 && eContainer != null%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Package")[name.startsWith("AA")]%>" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="CD_Package_Empty_StartsWithAA" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="aql:self.packagedElement->size() = 0 and self.eContainer() <> null" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Package)->select( e | e.name.startsWith('AA'))" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -471,7 +480,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("Package").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -482,7 +491,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Class" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("Class").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(uml::Class)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -493,7 +502,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interface" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Interface<%eContainer().eContents().filter("Interface").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Interface' + self.eContainer().eContents()->filter(uml::Interface)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -504,7 +513,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Enumeration" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Enumeration<%eContainer.ownedType.filter("Enumeration").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Enumeration' + self.eContainer().ownedType->filter(uml::Enumeration)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -515,7 +524,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedAttribute"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Attribute<%eContainer().eContents().filter("Property").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Attribute' + self.eContainer().eContents()->filter(uml::Property)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -526,7 +535,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Operation" referenceName="ownedOperation"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Operation<%eContainer().eContents().filter("Operation").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Operation' + self.eContainer().eContents()->filter(uml::Operation)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -537,7 +546,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EnumerationLiteral" referenceName="ownedLiteral"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="EnumerationLiteral<%eContainer.ownedLiteral.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'EnumerationLiteral' + self.eContainer().ownedLiteral->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -548,17 +557,17 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$target.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="<%memberEnd.nGet(0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="aql:self.memberEnd->first()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Association"/> </subModelOperations> </firstModelOperations> @@ -596,7 +605,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Dependency" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="client" valueExpression="var:source"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="supplier" valueExpression="var:target"/> @@ -606,7 +615,7 @@ </ownedTools> </subSections> <subSections name="wizard"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="<%$containerView.target.filter("Package").nSize() == 1%>" forceRefresh="true" candidatesExpression="<%getRootContainer.eAllContents("Package") - ($containerView.eContainer("ViewPoint").target.eAllContents("Package") + $containerView.target.packageImport.getImportedPackage + $containerView.target.ancestor.filter("Package"))%>" multiple="true"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="aql:containerView.target->filter(uml::Package)->size() = 1" forceRefresh="true" candidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Package) - (containerView.eContainerOrSelf(ViewPoint).target.eAllContents(uml::Package) + containerView.target.packageImport.getImportedPackage + containerView.target.ancestors()->filter(uml::Package))" multiple="true"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -661,47 +670,49 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='Drop%20Interface%20on%20canvas']" name="Component Diagram" domainClass="Package"> - <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Interface")%>" createElements="false" domainClass="Interface"> - <style xsi:type="style:BundledImageDescription" labelFormat="italic" showIcon="false" shape="dot"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Interface)" createElements="false" domainClass="Interface"> + <style xsi:type="style:BundledImageDescription" showIcon="false" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> + <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='CO_D%26D_Drop_Port']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"> - <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='CO_D%26D_Drop_Port']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"> + <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -709,21 +720,21 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Component") - eAllContents("Component")%>" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> - <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> + <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -731,7 +742,7 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -826,37 +837,40 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="State Machine Diagram" domainClass="StateMachine"> - <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="Transition" useDomainElement="true"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="Transition" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%eContents().nSize > 0%>"> - <style> + <conditionnalStyles predicateExpression="aql:self.eContents()->size() > 0"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> <containerMappings name="SM_Region" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Region"> - <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%subvertex%>" domainClass="Vertex"> + <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.subvertex" domainClass="Vertex"> <style xsi:type="style:BundledImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="4"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%filter("Pseudostate").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::Pseudostate)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="ring"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%filter("FinalState").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::FinalState)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -864,8 +878,9 @@ </style> </conditionnalStyles> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -914,7 +929,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Region")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(uml::Region)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Transition" referenceName="transition"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Transition"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="var:source"/> @@ -923,9 +938,9 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="<%eContents.filter("StateMachine").nLast()%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="aql:self.eContents()->filter(uml::StateMachine)->last())" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="StateMachine" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New StateMachine"/> </subModelOperations> @@ -937,20 +952,21 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Sequence Diagram" domainClass="Interaction"> - <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="<%lifeline%>" domainClass="Lifeline"> - <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="<%coveredBy%>" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> - <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="<%""%>" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.png"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="aql:self.lifeline" domainClass="Lifeline"> + <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="aql:self.coveredBy" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> + <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:''" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.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> </borderedNodeMappings> - <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="<%6%>" labelPosition="node" resizeKind="NSEW" id="uml2.LifelineStyle"> + <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW" id="uml2.LifelineStyle"> <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> </nodeMappings> - <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%message%>" semanticElements="<%current + sendEvent + receiveEvent%>" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="<%receiveEvent.covered%>" sourceFinderExpression="<%sendEvent.covered%>" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.message" semanticElements="aql:OrderedSet{self , self.sendEvent , self.receiveEvent}" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="aql:self.receiveEvent.covered" sourceFinderExpression="aql:self.sendEvent.covered" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> + <style routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> @@ -973,25 +989,25 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Message" referenceName="message"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Message"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:source"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1000,10 +1016,10 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="BehaviorExecutionSpecification" referenceName="fragment"/> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%($containerView + $containerView.ancestor)[target.filter("Lifeline").nSize() > 0].target%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="<%eContainer("Interaction").fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.ancestors()->including(containerView)->select( e | e.target.oclIsKdinfOf(uml::Lifeline)).target"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="aql:self.eContainerOrSelf(interactions::Interaction).fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1012,17 +1028,18 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Diagrams to show instances and relation between them." name="Object Diagram" domainClass="Package"> - <edgeMappings name="OD_Slot" semanticCandidatesExpression="<%packagedElement.filter("InstanceSpecification").slot[value.filter("InstanceValue")]%>" semanticElements="<%current + definingFeature%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="<%value.filter("InstanceValue").instance%>" sourceFinderExpression="<%owningInstance%>" domainClass="Slot" useDomainElement="true"> - <style sizeComputationExpression="<%1%>"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> + <edgeMappings name="OD_Slot" semanticCandidatesExpression="aql:self.packagedElement->filter(uml::InstanceSpecification).slot->select( e | e.value->filter(InstanceValue)->size() > 0)" semanticElements="aql:Sequence{self} + Sequence{self.definingFeature}" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="aql:self.value->filter(uml::InstanceValue).instance" sourceFinderExpression="aql:self.owningInstance" domainClass="Slot" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%definingFeature.name%>"> + <centerLabelStyleDescription labelExpression="aql:self.definingFeature.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="<%packagedElement%>" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> - <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%slot[!values.filter("InstanceValue")]%>" domainClass="Slot"/> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelExpression="<%name%> : <%classifier.nGet(0).name%>"> + <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="aql:self.packagedElement" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> + <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.slot->select( e | e.values->filter(uml::InstanceValue)->size() = 0)" domainClass="Slot"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + ' : ' + self.classifier->first().name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1042,7 +1059,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="InstanceSpecification" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="InstanceSpecification<%eContainer.packagedElement.filter("InstanceSpecification").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'InstanceSpecification' + self.eContainer().packagedElement->filter(uml::InstanceSpecification)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1066,8 +1083,9 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnNode" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="CDMPoN_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <nodeMappings name="CDMPoN_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDMPoN_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1081,7 +1099,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoN_Component']/@borderedNodeMappings[name='CDMPoN_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -1089,13 +1107,14 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainer']/@defaultLayer/@containerMappings[name='CDC_Component']/@borderedNodeMappings[name='CDC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDC_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDC_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1103,7 +1122,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1113,14 +1132,15 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnNodeInContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDNIC_Component_Container']/@subNodeMappings[name='CDNIC_Component_Node']/@borderedNodeMappings[name='CDNIC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDNIC_Component_Container" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <subNodeMappings name="CDNIC_Component_Node" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDNIC_Component_Container" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <subNodeMappings name="CDNIC_Component_Node" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDNIC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1134,7 +1154,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1144,13 +1164,14 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnContainerInContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']/@borderedNodeMappings[name='CDCIC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDCIC_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"> + <containerMappings name="CDCIC_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDCIC_Component']"> <borderedNodeMappings name="CDCIC_Port" semanticCandidatesExpression="feature:eContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1158,7 +1179,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1168,14 +1189,15 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnPortOnContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDMPoPoC_Component_Container']/@borderedNodeMappings[name='CDMPoPoC_Component_Port']/@borderedNodeMappings[name='CDMPoPoC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDMPoPoC_Component_Container" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <borderedNodeMappings name="CDMPoPoC_Component_Port" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDMPoPoC_Component_Container" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <borderedNodeMappings name="CDMPoPoC_Component_Port" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDMPoPoC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1189,7 +1211,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1199,9 +1221,10 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-MovePortOnPortOnNode" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="CDMPoPoN_Component_Node" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <borderedNodeMappings name="CDMPoPoN_Component_Port" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <nodeMappings name="CDMPoPoN_Component_Node" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <borderedNodeMappings name="CDMPoPoN_Component_Port" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDMPoPoN_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1221,7 +1244,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-MovePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDMPoPoN_Component_Node']/@borderedNodeMappings[name='CDMPoPoN_Component_Port']/@borderedNodeMappings[name='CDMPoPoN_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -1229,8 +1252,9 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnNode" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="CDRPoN_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <nodeMappings name="CDRPoN_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDRPoN_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1244,7 +1268,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoN_Component']/@borderedNodeMappings[name='CDRPoN_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -1252,13 +1276,14 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoC_Component']/@borderedNodeMappings[name='CDRPoC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDRPoC_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDRPoC_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDRPoC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1266,7 +1291,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1276,14 +1301,15 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnNodeInContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnNodeInContainer']/@defaultLayer/@containerMappings[name='CDRPoNiC_Component_Container']/@subNodeMappings[name='CDRPoNiC_Component_Node']/@borderedNodeMappings[name='CDRPoNiC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDRPoNiC_Component_Container" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <subNodeMappings name="CDRPoNiC_Component_Node" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDRPoNiC_Component_Container" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <subNodeMappings name="CDRPoNiC_Component_Node" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDRPoNiC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1297,7 +1323,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1306,14 +1332,15 @@ </containerMappings> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnContainerInContainer" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" domainClass="Package"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" name="Component Diagram-ResizePortOnContainerInContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']/@borderedNodeMappings[name='CDRPoCiC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDRPoCiC_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"> + <containerMappings name="CDRPoCiC_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnContainerInContainer']/@defaultLayer/@containerMappings[name='CDRPoCiC_Component']"> <borderedNodeMappings name="CDRPoCiC_Port" semanticCandidatesExpression="feature:eContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1321,14 +1348,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> <conditionnalStyles predicateExpression="[name.equalsIgnoreCase('InnerComponent')/]"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1352,14 +1379,15 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnPortOnContainer" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnContainer']/@defaultLayer/@containerMappings[name='CDRPoPoC_Component_Container']/@borderedNodeMappings[name='CDRPoPoC_Component_Port']/@borderedNodeMappings[name='CDRPoPoC_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CDRPoPoC_Component_Container" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <borderedNodeMappings name="CDRPoPoC_Component_Port" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <containerMappings name="CDRPoPoC_Component_Container" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <borderedNodeMappings name="CDRPoPoC_Component_Port" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDRPoPoC_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1373,7 +1401,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1383,9 +1411,10 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-ResizePortOnPortOnNode" domainClass="Package"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="CDRPoPoN_Component_Node" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> - <borderedNodeMappings name="CDRPoPoN_Component_Port" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component"> + <nodeMappings name="CDRPoPoN_Component_Node" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> + <borderedNodeMappings name="CDRPoPoN_Component_Port" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component"> <borderedNodeMappings name="CDRPoPoN_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1405,7 +1434,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%eAllContents().ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.eAllContents().ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-ResizePortOnPortOnNode']/@defaultLayer/@nodeMappings[name='CDRPoPoN_Component_Node']/@borderedNodeMappings[name='CDRPoPoN_Component_Port']/@borderedNodeMappings[name='CDRPoPoN_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -1413,11 +1442,12 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Component Diagram-DnDPortOnNode" domainClass="Component"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Collapse"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" semanticConditionExpression="<%!(name.startsWith("collapsed"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" semanticConditionExpression="aql:not self.name.startsWith('collapsed')"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="CDN_Component" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']"> + <nodeMappings name="CDN_Component" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']"> <borderedNodeMappings name="CDN_Port" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1431,7 +1461,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Deployment" semanticCandidatesExpression="<%packagedElement.ownedAttribute.deployment%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> + <edgeMappings name="Deployment" semanticCandidatesExpression="aql:self.packagedElement.ownedAttribute.deployment" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDPortOnNode']/@defaultLayer/@nodeMappings[name='CDN_Component']/@borderedNodeMappings[name='CDN_Port']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Deployment" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -1452,11 +1482,12 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" name="Component Diagram-DnDComponentFromModelExplorer" domainClass="Component"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Collapse"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']" semanticConditionExpression="<%!(name.startsWith("collapse"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']" semanticConditionExpression="aql:not self.name.startsWith('collapse')"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="CD_DnDComponent" semanticCandidatesExpression="<%eContents.filter("Component")%>" createElements="false" domainClass="Component"> + <nodeMappings name="CD_DnDComponent" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" createElements="false" domainClass="Component"> <borderedNodeMappings name="CD_DnDPort" semanticCandidatesExpression="feature:eAllContents" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1484,67 +1515,68 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnD']" name="Component Diagram-DnDComponentAndPortFromModelExplorer" domainClass="Component"> + <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="collapsePort2"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']" semanticConditionExpression="<%!(name.endsWith("2"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@nodeMappings[name='CD_DnDComponent']/@borderedNodeMappings[name='CD_DnDPort']" semanticConditionExpression="aql:not self.name.endsWith('2')"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="CD_DnDComponent" semanticCandidatesExpression="<%eContents.filter("Component")%>" createElements="false" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnDPort']"> + <nodeMappings name="CD_DnDComponent" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" createElements="false" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram-DnDComponentAndPortFromModelExplorer']/@defaultLayer/@toolSections.0/@ownedTools[name='DnDPort']"> <borderedNodeMappings name="CD_DnDPort" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> - <conditionnalStyles predicateExpression="<%name.endsWith("1")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('1')"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("2")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('2')"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="1" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("3")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('3')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("4")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('4')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("5")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('5')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("6")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('6')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("7")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('7')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%name.endsWith("8")%>"> + <conditionnalStyles predicateExpression="aql:self.name.endsWith('8')"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/extraMapping/3216.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/extraMapping/3216.odesign index 645f40331a..10af6e0640 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/extraMapping/3216.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/extraMapping/3216.odesign @@ -1,5 +1,5 @@ <?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" version="8.0.0"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="VP3216"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> <defaultLayer name="Default"> @@ -18,7 +18,7 @@ </style> </nodeMappings> <nodeMappings name="annotation" domainClass="EAnnotation"> - <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="<%source%>" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="aql:self.source" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> @@ -40,17 +40,17 @@ <targetViewVariable name="targetView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:Switch"> - <cases conditionExpression="<%$target.filter("EPackage") %>"> + <cases conditionExpression="aql:target.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="eAnnotations"/> </subModelOperations> </cases> - <cases conditionExpression="<%$target.filter("EClass") %>"> + <cases conditionExpression="aql:target.oclIsKindOf(ecore::EClass)"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="eAnnotations"/> </subModelOperations> </cases> - <cases conditionExpression="<%$sourceView.filter("DEdge")%>"> + <cases conditionExpression="aql:sourceView.oclIsKindOf(diagram::DEdge)"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="eAnnotations"/> </subModelOperations> @@ -65,7 +65,7 @@ <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:SetValue" featureName="name" valueExpression="<%eContainer.name%><%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -75,7 +75,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="E<%eContainer().eAllContents("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'E' + self.eContainer().eAllContents(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -84,7 +84,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="a<%eContainer().name + eContainer().eAnnotations.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="aql:'a' + self.eContainer().name + self.eContainer().eAnnotations->size()"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/ticket2298.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/ticket2298.odesign index 64fa263002..e800103a36 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/ticket2298.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeCreation/ticket2298.odesign @@ -1,14 +1,14 @@ <?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" 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="ticket2298" version="8.0.0"> +<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="ticket2298" version="10.1.3.201511131800"> <ownedViewpoints name="Ticket_2298" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag2298" domainClass="EPackage"> - <nodeMappings name="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/DesignerTestProject/Thing.gif"> + <nodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/DesignerTestProject/Thing.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']"/> </style> </nodeMappings> - <edgeMappings name="Reference" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Ticket_2298']/@ownedRepresentations[name='Diag2298']/@nodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket_2298']/@ownedRepresentations[name='Diag2298']/@nodeMappings[name='EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Reference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Ticket_2298']/@ownedRepresentations[name='Diag2298']/@nodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket_2298']/@ownedRepresentations[name='Diag2298']/@nodeMappings[name='EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -23,7 +23,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign index d0f2d8b833..b6f6ae99ef 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelMove/VSMForEdgeLabelsMoveTest.odesign @@ -1,5 +1,5 @@ <?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="VSMForEdgeLabelsMoveTest" version="10.1.0.201507271600"> +<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="VSMForEdgeLabelsMoveTest" version="10.1.3.201511131800"> <ownedViewpoints name="VSMForEdgeLabelsMoveTest" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20EClass']" name="Diagram" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> @@ -321,14 +321,14 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramWithBracketEdge" domainClass="ecore.EPackage"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <nodeMappings name="EAnnotationMapping" semanticCandidatesExpression="<%eAnnotations%>" domainClass="ecore.EAnnotation"> - <style xsi:type="style:DotDescription" labelExpression="<%source%>"> + <nodeMappings name="EAnnotationMapping" semanticCandidatesExpression="aql:self.eAnnotations" domainClass="ecore.EAnnotation"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.source"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EReferenceMapping" preconditionExpression="<%!eOpposite%>" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="feature:eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReferenceTool']"> + <edgeMappings name="EReferenceMapping" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@containerMappings[name='EClassMapping']" targetMapping="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@containerMappings[name='EClassMapping']" targetFinderExpression="feature:eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='VSMForEdgeLabelsMoveTest']/@ownedRepresentations[name='DiagramWithBracketEdge']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectEReferenceTool']"> <style xsi:type="style:BracketEdgeStyleDescription" sourceArrow="InputArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <beginLabelStyleDescription labelExpression="aql:self.name+'Begin'"> @@ -373,7 +373,7 @@ </subModelOperations> <subModelOperations xsi:type="tool:If" conditionExpression="[otherEnd != $edgeView.targetNode/]"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="[otherEnd.getTarget()/]"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelStability/2179.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelStability/2179.odesign index c38abc01c8..4631b8cf0b 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelStability/2179.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeLabelStability/2179.odesign @@ -1,17 +1,17 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.0.0"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="2179Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2179Diag" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="extends <%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'extends ' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageContainer" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']"> + <containerMappings name="PackageContainer" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='2179Viewpoint']/@ownedRepresentations[name='2179Diag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']"> <borderedNodeMappings name="ClassBorderedNode" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <style xsi:type="style:SquareDescription" showIcon="false" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -19,7 +19,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -33,8 +33,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eClassifiers"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeMapping/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeMapping/ecore.odesign index 1b648a713a..e7d8605b47 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeMapping/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeMapping/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,68 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$target.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:target->filter(ecore::EClass)->select( e | e.interface)"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +81,38 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%name%><%if (eParameters.nSize()>0) {%> (<%eParameters.getParameterLabel().sep(", ")%>)<%}%> : <%eType.name%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.name + if self.eParameters->size() > 0 then ' (' + self.eParameters().name->sep(',') + ')' else '' endif + ' : '+ self.eType.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +120,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -141,7 +142,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -150,7 +151,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -160,7 +161,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -209,7 +210,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -234,7 +235,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -249,7 +250,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -259,8 +260,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -274,12 +275,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -296,18 +297,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -326,9 +327,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -337,9 +338,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -347,19 +348,19 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getOperationNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%createParameterFromString($0)%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -367,7 +368,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -381,7 +382,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -395,7 +396,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -408,23 +409,24 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="10"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="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="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -434,7 +436,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -447,45 +449,45 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20Bi-directional%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference)->select( e | e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> + <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -493,9 +495,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -508,22 +510,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EEnum")%>" createElements="false" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EEnum)" createElements="false" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -531,15 +534,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EDataType")%>" createElements="false" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EDataType)" createElements="false" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -552,7 +555,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -581,7 +584,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -595,12 +598,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -620,7 +623,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -669,9 +672,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -681,12 +684,12 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -707,12 +710,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -729,18 +732,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -750,8 +753,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Blank Layer Package" activeByDefault="true"> - <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -759,7 +762,7 @@ </style> </containerMappings> <containerMappings name="Blank Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -773,7 +776,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -783,7 +786,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -798,41 +801,42 @@ </additionalLayers> </ownedRepresentations> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -846,15 +850,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -864,15 +868,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -882,15 +886,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -900,15 +904,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -920,7 +924,7 @@ <ownedViewpoints name="Quality" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -928,8 +932,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%self + eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:Sequence{self} + self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -939,22 +943,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -969,19 +973,21 @@ <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -990,15 +996,15 @@ </containerMappings> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1006,7 +1012,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1014,15 +1020,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1032,15 +1038,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eType%>" sourceFinderExpression="" domainClass="EReference"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eType" sourceFinderExpression="" domainClass="EReference"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1048,7 +1054,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1056,15 +1062,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1076,7 +1082,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1084,7 +1090,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1094,36 +1100,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1136,8 +1144,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -1147,21 +1156,22 @@ </ownedViewpoints> <ownedViewpoints name="Review" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30"> - <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> - <defaultForeground labelSize="8" labelFormat="bold"> + <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> + <defaultForeground labelSize="8"> + <labelFormat>bold</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultForeground> - <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"/> + <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/> </ownedLineMappings> - <ownedColumnMappings name="Available Tags" headerLabelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="<%getRootContainer.eAnnotations[source=="Tags"].details%>"/> - <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="<%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="TagValues"]%>" domainClass="EAnnotation"> + <ownedColumnMappings name="Available Tags" headerLabelExpression="aql:if self->oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.key" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAnnotations->select( e | e.source='Tags').details"/> + <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="aql:self.eAllContents(EAnnotation)->select( e | e.source='TagValues')" domainClass="EAnnotation"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/> <variables name="root" documentation="The semantic element of the table."/> - <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$0.nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:arg0->size() = 0"> <subModelOperations xsi:type="tool:Unset" featureName="references" elementExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> @@ -1172,29 +1182,29 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="TagValues"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='TagValues')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="TagValues"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> <subModelOperations xsi:type="tool:SetValue" featureName="references" valueExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> <mask mask="{0}"/> </create> </intersection> - <createColumn name="New Tag" forceRefresh="true" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> + <createColumn name="New Tag" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> <variables name="root" documentation="The semantic element of the table."/> <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="<%getRootContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="Tags"].nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='Tags')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eAnnotations[source=="Tags"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source='Tags')"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="NEWTAG"/> </subModelOperations> @@ -1203,18 +1213,18 @@ </createColumn> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -1231,19 +1241,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -1251,12 +1261,13 @@ </create> </intersection> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> @@ -1268,7 +1279,7 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"> <colorSteps> <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </colorSteps> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnDragAndDrop/2123.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnDragAndDrop/2123.odesign index eebe927154..5eff0d82a0 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnDragAndDrop/2123.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnDragAndDrop/2123.odesign @@ -1,9 +1,9 @@ <?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" 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" version="8.1.0"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="2123Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2123Diag" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" sourceMapping="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetMapping="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']/@borderedNodeMappings[name='ClassBorderedNode']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -11,7 +11,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageContainer" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']" reusedContainerMappings="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']"> + <containerMappings name="PackageContainer" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Package']" reusedContainerMappings="//@ownedViewpoints[name='2123Viewpoint']/@ownedRepresentations[name='2123Diag']/@defaultLayer/@containerMappings[name='PackageContainer']"> <borderedNodeMappings name="ClassBorderedNode" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <style xsi:type="style:SquareDescription" showIcon="false" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -19,7 +19,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnLayerManagement/doremi-2678.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnLayerManagement/doremi-2678.odesign index 1b6b5d2616..cdd9932484 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnLayerManagement/doremi-2678.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnLayerManagement/doremi-2678.odesign @@ -1,17 +1,17 @@ <?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="doremi-2678" version="8.0.0"> +<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="doremi-2678" version="10.1.3.201511131800"> <ownedViewpoints name="doremi-2678" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2678" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="EReference" semanticCandidatesExpression="<%eAllContents("EReference")%>" sourceMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EClass'] //@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@additionalLayers[name='Abstract%20EClass']/@containerMappings[name='Abstract%20EClass']" targetMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EClass'] //@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@additionalLayers[name='Abstract%20EClass']/@containerMappings[name='Abstract%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)" sourceMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EClass'] //@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@additionalLayers[name='Abstract%20EClass']/@containerMappings[name='Abstract%20EClass']" targetMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EClass'] //@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@additionalLayers[name='Abstract%20EClass']/@containerMappings[name='Abstract%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="EAnnotationReferences" sourceMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EAnnotation']" targetMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@edgeMappings[name='EReference']" targetFinderExpression="<%references%>"> + <edgeMappings name="EAnnotationReferences" sourceMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@containerMappings[name='EAnnotation']" targetMapping="//@ownedViewpoints[name='doremi-2678']/@ownedRepresentations[name='doremi-2678']/@defaultLayer/@edgeMappings[name='EReference']" targetFinderExpression="aql:self.references"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <centerLabelStyleDescription> @@ -19,16 +19,16 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EClass" preconditionExpression="<%!isAbstract%>" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="EClass" preconditionExpression="aql:not self.abstract" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> </style> </containerMappings> - <containerMappings name="EAnnotation" semanticCandidatesExpression="<%eContents().filter("EAnnotation")%>" domainClass="EAnnotation"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%source%>"> + <containerMappings name="EAnnotation" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAnnotation)" domainClass="EAnnotation"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.source"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -37,8 +37,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="Abstract EClass" activeByDefault="true"> - <containerMappings name="Abstract EClass" preconditionExpression="<%isAbstract%>" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="Abstract EClass" preconditionExpression="aql:self.abstract" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481.odesign index 85a02f08fa..0a81d6792a 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481.odesign @@ -1,28 +1,28 @@ <?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: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" name="Ticket #1481" version="8.0.0"> +<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: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" name="Ticket #1481" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1481" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1481" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="port collapse"> <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481']/@ownedRepresentations[name='TC1481']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/> </filters> <defaultLayer name="Default"> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481']/@ownedRepresentations[name='TC1481']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481']/@ownedRepresentations[name='TC1481']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eReferenceType%>"> - <style routingStyle="manhattan"> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481']/@ownedRepresentations[name='TC1481']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481']/@ownedRepresentations[name='TC1481']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eReferenceType"> + <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="from<%name%>"> + <centerLabelStyleDescription labelExpression="aql:'from' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481_domainbased.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481_domainbased.odesign index f39155c993..4e3e60b18b 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481_domainbased.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnPortCollapsing/tc1481_domainbased.odesign @@ -1,28 +1,28 @@ <?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: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" name="Ticket #1481" version="8.0.0"> +<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: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" name="Ticket #1481" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1481 domain based" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1481 domain based" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="port collapse"> <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/> </filters> <defaultLayer name="Default"> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style routingStyle="manhattan"> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231481%20domain%20based']/@ownedRepresentations[name='TC1481%20domain%20based']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -33,8 +33,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Test" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="NodePackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="NodePackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> @@ -51,15 +51,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Test2" domainClass="EPackage"> <defaultLayer name="Default"> - <containerMappings name="ContainerMapping" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="ContainerBorderClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="ContainerMapping" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="ContainerBorderClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:ShapeContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnSemanticChange/VP-2648/tc2648.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnSemanticChange/VP-2648/tc2648.odesign index 00d60ab88d..47c9e92dbc 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnSemanticChange/VP-2648/tc2648.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeStabilityOnSemanticChange/VP-2648/tc2648.odesign @@ -1,24 +1,24 @@ <?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="Use Case" version="8.0.0"> +<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="Use Case" version="10.1.3.201511131800"> <ownedViewpoints name="UseCase2648" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2648" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="CN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="CN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </style> </nodeMappings> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eReferenceType%>"> - <style> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eReferenceType"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="EC_Link" sourceMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@nodeMappings[name='CN_EClass']" targetMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@nodeMappings[name='CN_EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EC_Link" sourceMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@nodeMappings[name='CN_EClass']" targetMapping="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@nodeMappings[name='CN_EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <centerLabelStyleDescription> @@ -26,15 +26,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2648']/@defaultLayer/@containerMappings[name='CM_EPackage']"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -46,15 +46,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2675" domainClass="EPackage"> <defaultLayer name="Default"> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2675']/@defaultLayer/@containerMappings[name='CM_EPackage']"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='UseCase2648']/@ownedRepresentations[name='TC2675']/@defaultLayer/@containerMappings[name='CM_EPackage']"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelExpression="""" hideLabelByDefault="true"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeWithMultipleLabels/doremi_1551.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeWithMultipleLabels/doremi_1551.odesign index 896f83002b..785cc0a88b 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeWithMultipleLabels/doremi_1551.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/edgeWithMultipleLabels/doremi_1551.odesign @@ -1,24 +1,24 @@ <?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" 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="doremi_1551" version="8.0.0"> +<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="doremi_1551" version="10.1.3.201511131800"> <ownedViewpoints name="doremi_1551" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Relation Based Straight" domainClass="EPackage"> - <nodeMappings name="EClass RB Straight" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass RB Straight" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <edgeMappings name="EReference RB Straight" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@nodeMappings[name='EClass%20RB%20Straight']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@nodeMappings[name='EClass%20RB%20Straight']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EReference RB Straight" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@nodeMappings[name='EClass%20RB%20Straight']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@nodeMappings[name='EClass%20RB%20Straight']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -40,8 +40,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -54,23 +54,23 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Element Based Straight" domainClass="EPackage"> - <nodeMappings name="EClass EB Straight" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass EB Straight" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="EReference EB Straight" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@nodeMappings[name='EClass%20EB%20Straight']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@nodeMappings[name='EClass%20EB%20Straight']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EReference EB Straight" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@nodeMappings[name='EClass%20EB%20Straight']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@nodeMappings[name='EClass%20EB%20Straight']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -85,7 +85,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -99,23 +99,23 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Relation Based Manhattan" domainClass="EPackage"> - <nodeMappings name="EClass RB Manhattan" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass RB Manhattan" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <edgeMappings name="EReference RB Manhattan" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Manhattan']/@nodeMappings[name='EClass%20RB%20Manhattan']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Manhattan']/@nodeMappings[name='EClass%20RB%20Manhattan']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EReference RB Manhattan" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Manhattan']/@nodeMappings[name='EClass%20RB%20Manhattan']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Manhattan']/@nodeMappings[name='EClass%20RB%20Manhattan']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -135,23 +135,23 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Element Based Manhattan" domainClass="EPackage"> - <nodeMappings name="EClass EB Manhattan" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass EB Manhattan" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="EReference EB Manhattan" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Manhattan']/@nodeMappings[name='EClass%20EB%20Manhattan']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Manhattan']/@nodeMappings[name='EClass%20EB%20Manhattan']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EReference EB Manhattan" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Manhattan']/@nodeMappings[name='EClass%20EB%20Manhattan']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Manhattan']/@nodeMappings[name='EClass%20EB%20Manhattan']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -166,7 +166,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -174,23 +174,23 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Relation Based Tree" domainClass="EPackage"> - <nodeMappings name="EClass RB Tree" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass RB Tree" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <edgeMappings name="EReference RB Tree" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Tree']/@nodeMappings[name='EClass%20RB%20Tree']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Tree']/@nodeMappings[name='EClass%20RB%20Tree']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EReference RB Tree" deletionDescription="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='Delete%20reference%20RB']" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20RB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Tree']/@nodeMappings[name='EClass%20RB%20Tree']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Relation%20Based%20Tree']/@nodeMappings[name='EClass%20RB%20Tree']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -210,23 +210,23 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi_1551 Element Based Tree" domainClass="EPackage"> - <nodeMappings name="EClass EB Tree" semanticCandidatesExpression="<%eAllContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass EB Tree" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="EReference EB Tree" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Tree']/@nodeMappings[name='EClass%20EB%20Tree']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Tree']/@nodeMappings[name='EClass%20EB%20Tree']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EReference EB Tree" labelDirectEdit="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Straight']/@toolSection/@ownedTools[name='edit%20EB']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Tree']/@nodeMappings[name='EClass%20EB%20Tree']" targetMapping="//@ownedViewpoints[name='doremi_1551']/@ownedRepresentations[name='doremi_1551%20Element%20Based%20Tree']/@nodeMappings[name='EClass%20EB%20Tree']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> - <beginLabelStyleDescription labelExpression="<%name%> begin"> + <beginLabelStyleDescription labelExpression="aql:self.name + ' begin'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%> center"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' center'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%> end"> + <endLabelStyleDescription labelExpression="aql:self.name + ' end'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> </endLabelStyleDescription> </style> @@ -241,7 +241,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelDeletion/vp-3009.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelDeletion/vp-3009.odesign index 98b607d496..d6abc06b4f 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelDeletion/vp-3009.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelDeletion/vp-3009.odesign @@ -1,17 +1,17 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="vp-3009"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp-3009" domainClass="EPackage"> <defaultLayer name="Default"> <nodeMappings name="n" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" domainClass="EClass"> <borderedNodeMappings name="attr" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="border_<%name%>" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'border_' + self.name" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="node_<%name%>" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'node_' + self.name" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -20,33 +20,33 @@ <edgeMappings name="e" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" sourceMapping="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@containerMappings[name='c']" targetMapping="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@containerMappings[name='list']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EClass" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelExpression="begin_<%name%>"> + <beginLabelStyleDescription labelExpression="aql:'begin_' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="center_<%name%>"> + <centerLabelStyleDescription labelExpression="aql:'center_' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="end_<%name%>"> + <endLabelStyleDescription labelExpression="aql:'end_' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </endLabelStyleDescription> </style> </edgeMappings> <containerMappings name="c" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" domainClass="EClass"> <borderedNodeMappings name="attr2" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="container_border_<%name%>" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'container_border_' + self.name" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> <subNodeMappings name="rfN" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" semanticCandidatesExpression="feature:eContents" domainClass="EReference"> - <style xsi:type="style:SquareDescription" labelExpression="container_node_<%name%>" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'container_node_' + self.name" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="container_<%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'container_' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -55,13 +55,13 @@ </containerMappings> <containerMappings name="list" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="listElt" deletionDescription="//@ownedViewpoints[name='vp-3009']/@ownedRepresentations[name='vp-3009']/@defaultLayer/@toolSections.0/@ownedTools[name='del']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="list_element_<%name%>" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'list_element_' + self.name" sizeComputationExpression="1" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="list_<%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'list_' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -69,13 +69,13 @@ </style> </containerMappings> <toolSections name="s"> - <ownedTools xsi:type="tool:DeleteElementDescription" documentation="3 behaviors: 
 - name.endsWith("_1") -> no delete tool : delete is not disabled but does nothing
 - name.endsWith("_2") -> delete from model is disabled
 - other cases -> remove eleemnt from model
 " name="del" precondition="<%!name.endsWith("_2")%>"> + <ownedTools xsi:type="tool:DeleteElementDescription" documentation="3 behaviors: 
 - name.endsWith("_1") -> no delete tool : delete is not disabled but does nothing
 - name.endsWith("_2") -> delete from model is disabled
 - other cases -> remove eleemnt from model
 " name="del" precondition="aql:not self.name.endsWith('_2')"> <element name="element"/> <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%!name.endsWith("_1")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.name.endsWith('_1')"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelPosition/2321.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelPosition/2321.odesign index 481b00ca28..8d8391a87a 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelPosition/2321.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelPosition/2321.odesign @@ -1,30 +1,30 @@ <?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" version="8.0.0"> +<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="10.1.3.201511131800"> <ownedViewpoints name="tc-2321" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diag-2321" domainClass="EPackage"> - <nodeMappings name="NodePackageBorder" semanticCandidatesExpression="<%eSubpackages%>" domainClass="EPackage"> - <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="<%name%>Border" resizeKind="NSEW"> + <nodeMappings name="NodePackageBorder" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage"> + <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="aql:self.name + 'Border'" 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']"/> - <sections maxValueExpression="<%12%>" valueExpression="<%eSubpackages.nSize()%>"> + <sections maxValueExpression="12" valueExpression="aql:self.eSubpackages->size()"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </sections> - <sections maxValueExpression="<%3%>" valueExpression="<%eSubpackages.nSize()%>"> + <sections maxValueExpression="3" valueExpression="aql:self.eSubpackages->size()"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </sections> </style> </nodeMappings> - <nodeMappings name="NodePackageNode" semanticCandidatesExpression="<%eSubpackages%>" domainClass="EPackage"> + <nodeMappings name="NodePackageNode" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage"> <style xsi:type="style:GaugeCompositeStyleDescription" 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']"/> - <sections maxValueExpression="<%12%>" valueExpression="<%eSubpackages.nSize()%>"> + <sections maxValueExpression="12" valueExpression="aql:self.eSubpackages->size()"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </sections> - <sections maxValueExpression="<%3%>" valueExpression="<%eSubpackages.nSize()%>"> + <sections maxValueExpression="3" valueExpression="aql:self.eSubpackages->size()"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </sections> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/tc1522.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/tc1522.odesign index 2b23c6b8b6..139db77108 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/tc1522.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/tc1522.odesign @@ -1,48 +1,49 @@ <?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="TC1522" version="8.0.0"> +<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="TC1522" version="10.1.3.201511131800"> <ownedViewpoints name="Design TC1522" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC 1522" titleExpression="<%name%> package entities" initialisation="true" showOnStartup="true" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC 1522" titleExpression="aql:self.name + ' package entities'" initialisation="true" showOnStartup="true" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="EC ESupertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="EC ESupertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20TC1522']/@ownedRepresentations[name='TC%201522']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -54,6 +55,6 @@ <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> </userColorsPalettes> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/vp-3826.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/vp-3826.odesign index 0bcb7b08cb..6dc2e2627c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/vp-3826.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/labelSelection/vp-3826.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="vp-3826" version="8.0.0"> +<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="vp-3826" version="10.1.3.201511131800"> <ownedViewpoints name="vp-3826"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="LabelTests" domainClass="EPackage"> <defaultLayer name="Default"> <edgeMappings name="edge" labelDirectEdit="//@ownedViewpoints[name='vp-3826']/@ownedRepresentations[name='LabelTests']/@defaultLayer/@toolSections.0/@ownedTools[name='e']" sourceMapping="//@ownedViewpoints[name='vp-3826']/@ownedRepresentations[name='LabelTests']/@defaultLayer/@containerMappings[name='cont']/@subNodeMappings[name='node1']" targetMapping="//@ownedViewpoints[name='vp-3826']/@ownedRepresentations[name='LabelTests']/@defaultLayer/@containerMappings[name='cont']/@subNodeMappings[name='node2']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EClass" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -26,7 +26,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="container"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="container"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -44,7 +44,7 @@ </defaultLayer> <additionalLayers name="layer" label="Layer with begin and end labels"> <edgeMappingImports name="edgeWithMultiLabels" importedMapping="//@ownedViewpoints[name='vp-3826']/@ownedRepresentations[name='LabelTests']/@defaultLayer/@edgeMappings[name='edge']"> - <conditionnalStyles predicateExpression="<%true%>"> + <conditionnalStyles predicateExpression="aql:true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <beginLabelStyleDescription labelExpression="begin"> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layers/vp-4179/vp-4179.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layers/vp-4179/vp-4179.odesign index cf26a6c73c..fdc12d2dad 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layers/vp-4179/vp-4179.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layers/vp-4179/vp-4179.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" name="vp-4179" version="8.0.0"> +<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="vp-4179" version="10.1.3.201511131800"> <ownedViewpoints name="vp-4179_AL" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp-4179" domainClass="EPackage"> <defaultLayer name="Default"> <containerMappings name="EClassA" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="A + <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'A + ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -12,7 +12,7 @@ </style> </containerMappings> <containerMappings name="EClassB" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="B + <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'B + ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -20,7 +20,7 @@ </style> </containerMappings> <containerMappings name="EClassC" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="C + <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'C + ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -28,7 +28,7 @@ </style> </containerMappings> <containerMappings name="EClassD" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="D + <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'D + ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -36,7 +36,7 @@ </style> </containerMappings> <containerMappings name="EClassE" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="E + <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'E + ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -46,7 +46,7 @@ </defaultLayer> <additionalLayers name="optionalAndActiveByDefault" activeByDefault="true"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="A" importedMapping="//@ownedViewpoints[name='vp-4179_AL']/@ownedRepresentations[name='vp-4179']/@defaultLayer/@containerMappings[name='EClassA']"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="A extended <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'A extended ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> @@ -56,7 +56,7 @@ </additionalLayers> <additionalLayers name="optional"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="B" importedMapping="//@ownedViewpoints[name='vp-4179_AL']/@ownedRepresentations[name='vp-4179']/@defaultLayer/@containerMappings[name='EClassB']"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="B extended <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'B extended ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> @@ -66,7 +66,7 @@ </additionalLayers> <additionalLayers name="notOptional" optional="false"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="C" importedMapping="//@ownedViewpoints[name='vp-4179_AL']/@ownedRepresentations[name='vp-4179']/@defaultLayer/@containerMappings[name='EClassC']"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="C extended <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'C extended ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> @@ -76,7 +76,7 @@ </additionalLayers> <additionalLayers name="notOptionalAndActiveByDefault" activeByDefault="true" optional="false"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="D" importedMapping="//@ownedViewpoints[name='vp-4179_AL']/@ownedRepresentations[name='vp-4179']/@defaultLayer/@containerMappings[name='EClassD']"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="D extended <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'D extended ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> @@ -90,7 +90,7 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="vp-4179-ext" viewpointURI="viewpoint:/DesignerTestProject/vp-4179_AL" representationName="vp-4179"> <layers name="extNotOptional" optional="false"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="E" importedMapping="//@ownedViewpoints[name='vp-4179_AL']/@ownedRepresentations[name='vp-4179']/@defaultLayer/@containerMappings[name='EClassE']"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="E extended <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'E extended ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_chocolate']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-2545/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-2545/My.odesign index 4f4a615841..24431a1958 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-2545/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-2545/My.odesign @@ -1,5 +1,5 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="pbLostLayout" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" showOnStartup="true" domainClass="EPackage"> <defaultLayer name="Default"> @@ -11,7 +11,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -25,15 +25,15 @@ <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:SetValue" featureName="name" valueExpression="C<%eContainer.eClassifiers.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'C' + self.eContainer().eClassifiers->size()"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainer()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="C<%eContainer.eClassifiers.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'C' + self.eContainer().eClassifiers->size()"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainer()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="C<%eContainer.eClassifiers.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'C' + self.eContainer().eClassifiers->size()"/> </subModelOperations> </subModelOperations> </subModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-3018/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-3018/My.odesign index b7fa0f79a1..f89ea2e7fa 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-3018/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/VP-3018/My.odesign @@ -1,24 +1,24 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="vp3018"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp3018" domainClass="EPackage"> <defaultLayer name="Default"> <nodeMappings name="eclass" domainClass="EClass"> - <style xsi:type="style:SquareDescription" sizeComputationExpression="<%3%>" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> <containerMappings name="pkg" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage"> - <style xsi:type="style:ShapeContainerStyleDescription" widthComputationExpression="5" heightComputationExpression="3"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" widthComputationExpression="5" heightComputationExpression="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> <containerMappings name="eenum" domainClass="EEnum" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" heightComputationExpression="7"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" heightComputationExpression="7"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <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.swtbot/data/unit/layout/borderedNodes/tc1957.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodes/tc1957.odesign index b19339fe1a..1986c1affa 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodes/tc1957.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodes/tc1957.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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ticket #1957" version="10.1.0.201507271600"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ticket #1957" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1957" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1957" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="NodePackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="NodePackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> @@ -17,7 +17,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -26,7 +26,7 @@ </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@edgeMappings[name='Reference']" extraSourceMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']" extraTargetMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@edgeMappings[name='Reference']" extraSourceMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']" extraTargetMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957']/@defaultLayer/@nodeMappings[name='NodePackage']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -40,7 +40,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -51,8 +51,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1957_withoutLabel" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="NodePackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="NodePackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BorderClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> @@ -65,7 +65,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']/@borderedNodeMappings[name='BorderClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -74,7 +74,7 @@ </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@edgeMappings[name='Reference']" extraSourceMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']" extraTargetMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@edgeMappings[name='Reference']" extraSourceMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']" extraTargetMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_withoutLabel']/@defaultLayer/@nodeMappings[name='NodePackage']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -88,7 +88,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -104,7 +104,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1957_Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -112,8 +112,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="ContainerPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> - <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="ContainerPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> + <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> @@ -128,7 +128,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@edgeMappings[name='Reference']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container']/@defaultLayer/@edgeMappings[name='Reference']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -142,7 +142,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -156,7 +156,7 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter"/> </filters> @@ -167,59 +167,59 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='EC_ReferenceOut2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='EC_ReferenceIn2']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='EC_ReferenceOut2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@borderedNodeMappings[name='EC_ReferenceIn2']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EReference" useDomainElement="true"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' endif + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> + <conditionnalStyles predicateExpression="aql:self.containment"> <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' endif + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%derived%>"> + <conditionnalStyles predicateExpression="aql:self.derived"> <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="/<%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'/' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$target.filter("EClass")[interface]%>"> + <conditionnalStyles predicateExpression="aql:target->filter(ecore::EClass)->select( e | e.interface)"> <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -228,29 +228,29 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="EC_ReferenceOut2" semanticCandidatesExpression="<%eReferences%>" domainClass="EReference"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="EC_ReferenceOut2" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="EC_ReferenceIn2" semanticCandidatesExpression="<%current.~.filter("EReference") - eReferences%>" domainClass="EReference"> + <borderedNodeMappings name="EC_ReferenceIn2" semanticCandidatesExpression="aql:self.eInverse(ecore::EReference)->asSet() - self.eReferences" domainClass="EReference"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -259,7 +259,7 @@ </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -274,7 +274,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> @@ -289,7 +289,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -298,7 +298,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -308,7 +308,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Interface ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="interface" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -338,9 +338,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -355,7 +355,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -380,7 +380,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -394,12 +394,12 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:instanceTarget"> @@ -419,7 +419,7 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -429,16 +429,16 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <borderedNodeMappings name="Package_Out" semanticCandidatesExpression="<%self[name=="Package2"]%>" semanticElements="" domainClass="EPackage"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> + <borderedNodeMappings name="Package_Out" semanticCandidatesExpression="aql:self->select( e | e.name='Package2')" semanticElements="" domainClass="EPackage"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> @@ -467,7 +467,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -476,7 +476,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -488,7 +488,7 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities2" titleExpression="<%name%> package entities2" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities2" titleExpression="aql:self.name + ' package entities2'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter"/> </filters> @@ -499,36 +499,36 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@edgeMappings[name='EC_EReference']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@edgeMappings[name='EC_EReference']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <nodeMappings name="EC2_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="EC2_ReferenceOut2" semanticCandidatesExpression="<%getUniqueReferencesByName()%>" semanticElements="" domainClass="EReference"> + <nodeMappings name="EC2_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="EC2_ReferenceOut2" semanticCandidatesExpression="aql:self.getUniqueReferencesByName()" semanticElements="" domainClass="EReference"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="EC2_ReferenceIn2" semanticCandidatesExpression="<%current.~.filter("EReference") - eReferences%>" domainClass="EReference"> + <borderedNodeMappings name="EC2_ReferenceIn2" semanticCandidatesExpression="aql:self.eInverse(ecore::EReference)->asSet() - self.eReferences" domainClass="EReference"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> @@ -541,31 +541,31 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']/@borderedNodeMappings[name='EC2_ReferenceOut2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']/@borderedNodeMappings[name='EC2_ReferenceIn2']" targetFinderExpression="var:self" sourceFinderExpression="<%self.eContainer.getReferencesForName(self.getName())%>" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']/@borderedNodeMappings[name='EC2_ReferenceOut2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']/@borderedNodeMappings[name='EC2_ReferenceIn2']" targetFinderExpression="var:self" sourceFinderExpression="aql:self.eContainer().getReferencesForName(self.name)" domainClass="EReference" useDomainElement="true"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' endif + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> + <conditionnalStyles predicateExpression="aql:self.containment"> <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' endif + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%derived%>"> + <conditionnalStyles predicateExpression="aql:self.derived"> <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="/<%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'/' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -580,7 +580,7 @@ <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> @@ -595,7 +595,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -604,7 +604,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -645,9 +645,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -662,7 +662,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -676,7 +676,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -691,7 +691,7 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -699,8 +699,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <borderedNodeMappings name="EC2_Out" semanticCandidatesExpression="<%self[name=="Package2"]%>" semanticElements="" domainClass="EPackage"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@defaultLayer/@nodeMappings[name='EC2_EClass']" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='Entities2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> + <borderedNodeMappings name="EC2_Out" semanticCandidatesExpression="aql:self->select( e | e.name='Package2')" semanticElements="" domainClass="EPackage"> <style xsi:type="style:SquareDescription" labelExpression="" width="1" height="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']"/> @@ -729,7 +729,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -738,7 +738,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -753,7 +753,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1957_Container_LeftRight" domainClass="EPackage"> <layout xsi:type="description_1:CompositeLayout" direction="LeftToRight"/> <defaultLayer name="Default"> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -761,8 +761,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="ContainerPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']"> - <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="ContainerPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@containerMappings[name='ContainerPackage']"> + <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> @@ -777,7 +777,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@edgeMappings[name='Reference']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231957']/@ownedRepresentations[name='TC1957_Container_LeftRight']/@defaultLayer/@edgeMappings[name='Reference']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -791,7 +791,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign index 0c70f682da..b2863063e4 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/borderedNodesCopyPastLayout/VP-3601.odesign @@ -1,5 +1,5 @@ <?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: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" version="8.0.0"> +<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: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" version="10.1.3.201511131800"> <ownedViewpoints name="Doremi-2842"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="test"> @@ -12,7 +12,7 @@ <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']"/> </filters> <defaultLayer name="Default"> - <edgeMappings name="ref" sourceMapping="//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']" targetMapping="//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']" targetFinderExpression="<%eType.eAttributes.nFirst()%>"> + <edgeMappings name="ref" sourceMapping="//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='reference']" targetMapping="//@ownedViewpoints[name='Doremi-2842']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']/@borderedNodeMappings[name='attribute']" targetFinderExpression="aql:self.eType.eAttributes->first()"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -42,7 +42,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeLayoutWithWizard/edgeLayoutPb.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeLayoutWithWizard/edgeLayoutPb.odesign index 76c3ba19b4..379210e5b3 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeLayoutWithWizard/edgeLayoutPb.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeLayoutWithWizard/edgeLayoutPb.odesign @@ -1,22 +1,22 @@ <?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" 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="edgeLayoutPb" version="8.0.0"> +<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="edgeLayoutPb" version="10.1.3.201511131800"> <ownedViewpoints name="edgeLayoutPb" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="edgeLayoutPbDiag" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Ref" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='edgeLayoutPb']/@ownedRepresentations[name='edgeLayoutPbDiag']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='edgeLayoutPb']/@ownedRepresentations[name='edgeLayoutPbDiag']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eReferenceType%>"> - <style> + <edgeMappings name="Ref" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='edgeLayoutPb']/@ownedRepresentations[name='edgeLayoutPbDiag']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='edgeLayoutPb']/@ownedRepresentations[name='edgeLayoutPbDiag']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eReferenceType"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" synchronizationLock="true" domainClass="EClass"> + <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" synchronizationLock="true" domainClass="EClass"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -24,7 +24,7 @@ </style> </containerMappings> <toolSections> - <ownedTools xsi:type="tool:SelectionWizardDescription" name="clickOnPackage" candidatesExpression="<%$diagram.target.eSubpackages%>" message="Select the package p3"> + <ownedTools xsi:type="tool:SelectionWizardDescription" name="clickOnPackage" candidatesExpression="aql:diagram.target.eSubpackages" message="Select the package p3"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath.odesign index ae6bc944b6..926aa9d1c7 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath.odesign @@ -1,20 +1,20 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour le point de vue "Ticket2094"...." name="Ticket2094" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour la description de digramme "TestTicket2094"...." name="TestTicket2094" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="<%eSuperTypes.eSuperTypes.eSuperTypes%>" pathExpression="<% self.getRootContainer().eAllContents[name == "C3"] + self.getRootContainer().eAllContents[name == "C2"]%>" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']"> + <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes.eSuperTypes.eSuperTypes" pathExpression="aql:self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C3') + self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C2') " pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']"> <style targetArrow="InputClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>" pathExpression=""> + <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes" pathExpression=""> <style targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </edgeMappings> <containerMappings name="EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath2.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath2.odesign index 7c532148cf..796cf25a38 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath2.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/edgeWithPath/manualBendpointsForEdgeWithPath2.odesign @@ -1,20 +1,20 @@ <?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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour le point de vue "Ticket2094"...." name="Ticket2094" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour la description de digramme "TestTicket2094"...." name="TestTicket2094" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="<%eSuperTypes.eSuperTypes.eSuperTypes%>" pathExpression="<% self.getRootContainer().eAllContents[name == "C3"] + self.getRootContainer().eAllContents[name == "C2"]%>" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']"> + <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes.eSuperTypes.eSuperTypes" pathExpression="aql:self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C3') + self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C2') " pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']"> <style targetArrow="InputClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>" pathExpression=""> + <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094']/@defaultLayer/@containerMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes" pathExpression=""> <style targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </edgeMappings> <containerMappings name="EClass" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -25,12 +25,12 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour la description de digramme "TestTicket2094"...." name="TestTicket2094OtherCase" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes.eSuperTypes.eSuperTypes%>" pathExpression="<% self.getRootContainer().eAllContents[name == "C4"]%>" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']"> + <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes.eSuperTypes.eSuperTypes" pathExpression="aql:self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C4')" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']"> <style targetArrow="InputClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>" pathExpression=""> + <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes" pathExpression=""> <style targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> @@ -43,7 +43,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -54,12 +54,12 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Ceci est une documentation technique à destination des specifiers...." endUserDocumentation="Ceci est la documentation pour la description de digramme "TestTicket2094"...." name="TestTicket2094OtherCase2" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes.eSuperTypes.eSuperTypes%>" pathExpression="<% self.getRootContainer().eAllContents[name == "C4"] + self.getRootContainer().eAllContents[name == "C2"] + self.getRootContainer().eAllContents[name == "C3"]%>" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']"> + <edgeMappings name="superSuperTypeWithPath" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes.eSuperTypes.eSuperTypes" pathExpression="aql:OrderedSet{self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C4'),self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C2'),self.eResource().getContents()->first().eAllContents->select( e | e.name = 'C3')}" pathNodeMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']"> <style targetArrow="InputClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>" pathExpression=""> + <edgeMappings name="superType" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='Ticket2094']/@ownedRepresentations[name='TestTicket2094OtherCase2']/@defaultLayer/@containerMappings[name='EPackage']/@subNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes" pathExpression=""> <style targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> @@ -72,7 +72,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/specific_layout/breakDownEcore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/specific_layout/breakDownEcore.odesign index 5d0bbdcafb..181bec64c4 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/specific_layout/breakDownEcore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layout/specific_layout/breakDownEcore.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" 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="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="BreakDownEcore" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Breakdown" domainClass="EPackage"> - <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="<%eSubpackages %>" nodeMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']"/> + <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eSubpackages" nodeMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']"/> <defaultLayer name="Default"> - <nodeMappings name="Package" semanticCandidatesExpression="<%eAllContents.filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="Package" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" 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']"/> @@ -12,7 +12,7 @@ </style> </nodeMappings> <edgeMappings name="Containers" sourceMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='Breakdown']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="feature:eContainer"> - <style sizeComputationExpression="1" routingStyle="tree"> + <style routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> @@ -37,7 +37,7 @@ <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:SetValue" featureName="name" valueExpression="<%eContainer.name%><%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -48,7 +48,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BreakdownCompositeTopToBottom" domainClass="EPackage"> <layout xsi:type="description_1:CompositeLayout"/> <defaultLayer name="Default"> - <nodeMappings name="Package" semanticCandidatesExpression="<%eAllContents.filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="Package" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" 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']"/> @@ -56,7 +56,7 @@ </style> </nodeMappings> <edgeMappings name="Containers" sourceMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeTopToBottom']/@defaultLayer/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeTopToBottom']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="feature:eContainer"> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree"> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> @@ -81,7 +81,7 @@ <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:SetValue" featureName="name" valueExpression="<%eContainer.name%><%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -92,7 +92,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BreakdownCompositeLeftToRight" domainClass="EPackage"> <layout xsi:type="description_1:CompositeLayout" direction="LeftToRight"/> <defaultLayer name="Default"> - <nodeMappings name="Package" semanticCandidatesExpression="<%eAllContents.filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="Package" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" 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']"/> @@ -100,7 +100,7 @@ </style> </nodeMappings> <edgeMappings name="Containers" sourceMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeLeftToRight']/@defaultLayer/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeLeftToRight']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="feature:eContainer"> - <style sizeComputationExpression="1" routingStyle="tree"> + <style routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> @@ -125,7 +125,7 @@ <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:SetValue" featureName="name" valueExpression="<%eContainer.name%><%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -136,7 +136,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BreakdownCompositeBottomToTop" domainClass="EPackage"> <layout xsi:type="description_1:CompositeLayout" direction="bottomToTop"/> <defaultLayer name="Default"> - <nodeMappings name="Package" semanticCandidatesExpression="<%eAllContents.filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="Package" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" 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']"/> @@ -144,7 +144,7 @@ </style> </nodeMappings> <edgeMappings name="Containers" sourceMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeBottomToTop']/@defaultLayer/@nodeMappings[name='Package']" targetMapping="//@ownedViewpoints[name='BreakDownEcore']/@ownedRepresentations[name='BreakdownCompositeBottomToTop']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="feature:eContainer"> - <style sizeComputationExpression="1" routingStyle="tree"> + <style routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> @@ -169,7 +169,7 @@ <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:SetValue" featureName="name" valueExpression="<%eContainer.name%><%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layoutingMode/vp2120.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layoutingMode/vp2120.odesign index 9b2271ef8c..622c044ff5 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layoutingMode/vp2120.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/layoutingMode/vp2120.odesign @@ -1,32 +1,32 @@ <?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="LayoutingMode" version="8.0.0"> +<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="LayoutingMode" version="10.1.3.201511131800"> <ownedViewpoints name="LayoutingMode" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="LayoutingMode Diagram" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum"> + <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> </style> </nodeMappings> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style routingStyle="manhattan"> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20on%20Package']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20brodered']"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20On%20Class']" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20on%20Package']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='drop%20brodered']"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" doubleClickDescription="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DoubleClick%20On%20Class']" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="2" height="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -51,7 +51,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="drop brodered" mappings="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="drop brodered" mappings="//@ownedViewpoints[name='LayoutingMode']/@ownedRepresentations[name='LayoutingMode%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -73,7 +73,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%name%>_RENAMMED"/> + <firstModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.name + '_RENAMMED'"/> </initialOperation> </ownedTools> </toolSections> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiColumns/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiColumns/ecore.odesign index 5fef0f36cd..b078424da3 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiColumns/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiColumns/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design multi-columns" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,60 +12,60 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="/<%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'/' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$target.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <conditionnalStyles predicateExpression="aql:target->filter(ecore::EClass)->select( e | e.interface)"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -73,45 +73,46 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eAllContents("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eAllContents(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +120,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -141,7 +142,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -150,7 +151,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -160,7 +161,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -190,9 +191,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -201,9 +202,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -256,7 +257,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -270,12 +271,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -295,7 +296,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -305,14 +306,14 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> <toolSections name="Navigation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -320,8 +321,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -329,7 +330,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -343,7 +344,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -357,7 +358,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -370,25 +371,26 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="10"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="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="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%name%>"/> - <ownedColumnMappings name="Name2" headerLabelExpression="Name2" featureName="name" labelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%name%>"/> - <ownedColumnMappings name="Name3" headerLabelExpression="Name3" featureName="name" labelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.name"/> + <ownedColumnMappings name="Name2" headerLabelExpression="Name2" featureName="name" labelExpression="aql: if self.oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.name"/> + <ownedColumnMappings name="Name3" headerLabelExpression="Name3" featureName="name" labelExpression="aql: if self.oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.name"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass%20from%20treeview']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -401,45 +403,45 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20Bi-directional%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference)->select( e | e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -447,9 +449,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -462,22 +464,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EEnum")%>" createElements="false" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EEnum)" createElements="false" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -485,15 +488,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EDataType")%>" createElements="false" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EDataType)" createElements="false" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -506,7 +509,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -535,7 +538,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -549,12 +552,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -574,7 +577,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -623,9 +626,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -635,12 +638,12 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -659,7 +662,7 @@ <ownedViewpoints name="Quality" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -667,8 +670,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%self + eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:Sequence{self} + self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -678,22 +681,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -708,19 +711,21 @@ <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -729,15 +734,15 @@ </containerMappings> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -745,7 +750,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -753,15 +758,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -771,15 +776,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eType%>" sourceFinderExpression="" domainClass="EReference"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eType" sourceFinderExpression="" domainClass="EReference"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -787,7 +792,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -795,15 +800,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -815,7 +820,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -823,7 +828,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -833,36 +838,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -875,8 +882,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design%20multi-columns']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -886,21 +894,22 @@ </ownedViewpoints> <ownedViewpoints name="Review" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30"> - <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> - <defaultForeground labelSize="8" labelFormat="bold"> + <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> + <defaultForeground labelSize="8"> + <labelFormat>bold</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultForeground> - <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"/> + <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/> </ownedLineMappings> - <ownedColumnMappings name="Available Tags" headerLabelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="<%getRootContainer.eAnnotations[source=="Tags"].details%>"/> - <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="<%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="TagValues"]%>" domainClass="EAnnotation"> + <ownedColumnMappings name="Available Tags" headerLabelExpression="aql:if self->oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.key" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAnnotations->select( e | e.source='Tags').details"/> + <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="aql:self.eAllContents(EAnnotation)->select( e | e.source='TagValues')" domainClass="EAnnotation"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/> <variables name="root" documentation="The semantic element of the table."/> - <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$0.nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:arg0->size() = 0"> <subModelOperations xsi:type="tool:Unset" featureName="references" elementExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> @@ -911,29 +920,29 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="TagValues"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='TagValues')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="TagValues"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> <subModelOperations xsi:type="tool:SetValue" featureName="references" valueExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> <mask mask="{0}"/> </create> </intersection> - <createColumn name="New Tag" forceRefresh="true" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> + <createColumn name="New Tag" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> <variables name="root" documentation="The semantic element of the table."/> <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="<%getRootContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="Tags"].nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='Tags')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eAnnotations[source=="Tags"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source='Tags')"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="NEWTAG"/> </subModelOperations> @@ -942,18 +951,18 @@ </createColumn> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -970,19 +979,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -990,12 +999,13 @@ </create> </intersection> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> @@ -1007,6 +1017,6 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> </userColorsPalettes> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiLines/multiLines.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiLines/multiLines.odesign index 7359eb3503..26f03f21d9 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiLines/multiLines.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/multiLines/multiLines.odesign @@ -1,31 +1,31 @@ <?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" 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="multiLines" version="8.0.0"> +<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="multiLines" version="10.1.3.201511131800"> <ownedViewpoints name="multiLines" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Ticket VP-1810 EPackage" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <nodeMappings name="Node with label on border" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="Port with label on border" semanticCandidatesExpression="<%eContents().filter("EAttribute")%>" domainClass="EAttribute"> - <style xsi:type="style:EllipseNodeDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <nodeMappings name="Node with label on border" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="Port with label on border" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)" domainClass="EAttribute"> + <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="Port with label in node" semanticCandidatesExpression="<%eContents().filter("EAttribute")%>" domainClass="EAttribute"> - <style xsi:type="style:EllipseNodeDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3" sizeComputationExpression="10" labelPosition="node"> + <borderedNodeMappings name="Port with label in node" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)" domainClass="EAttribute"> + <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'" sizeComputationExpression="10" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </borderedNodeMappings> - <style xsi:type="style:EllipseNodeDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3" sizeComputationExpression="10"> + <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'" sizeComputationExpression="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <nodeMappings name="Node with label in node" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <style xsi:type="style:EllipseNodeDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3" sizeComputationExpression="10" labelPosition="node"> + <nodeMappings name="Node with label in node" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <style xsi:type="style:EllipseNodeDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'" sizeComputationExpression="10" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -34,35 +34,35 @@ <edgeMappings name="RelationBasedEdge EReference" label="Edge" sourceMapping="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='List']" targetMapping="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EPackage" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <beginLabelStyleDescription labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <centerLabelStyleDescription labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <endLabelStyleDescription labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </endLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="List" label="List" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=" <%self.name%>1 
 <%self.name%>2 
 <%self.name%>3"> + <containerMappings name="List" label="List" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </containerMappings> - <containerMappings name="Container" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']"> - <subNodeMappings name="Node In Container with label on border" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border']"> - <style xsi:type="style:SquareDescription" labelExpression=" <%self.name%>1 
 <%self.name%>2 
 <%self.name%>3" sizeComputationExpression="7"> + <containerMappings name="Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']"> + <subNodeMappings name="Node In Container with label on border" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border']"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'" sizeComputationExpression="7"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <subNodeMappings name="Node In Container with label on node" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <style xsi:type="style:SquareDescription" labelExpression=" <%self.name%>1 
 <%self.name%>2 
 <%self.name%>3" sizeComputationExpression="7" labelPosition="node"> + <subNodeMappings name="Node In Container with label on node" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'" sizeComputationExpression="7" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -70,33 +70,33 @@ </subNodeMappings> <subContainerMappings name="Container EClass R1" label="Container 2" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node']"> <subNodeMappings name="Node EAttribute R1" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:DotDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subNodeMappings> <subNodeMappings name="Node EAttribute R1 label" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:DotDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </subNodeMappings> - <style xsi:type="style:ShapeContainerStyleDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> <subContainerMappings name="Container EClass R1 List" label="List2" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subContainerMappings[name='Container%20EClass%20R1']/@subNodeMappings[name='Node%20EAttribute%20R1%20label'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='Ticket%20VP-1810%20EPackage']/@defaultLayer/@containerMappings[name='Container']/@subContainerMappings[name='Container%20EClass%20R1']/@subNodeMappings[name='Node%20EAttribute%20R1']" childrenPresentation="List"> - <style xsi:type="style:ShapeContainerStyleDescription" labelExpression=" <%name%>1 
 <%name%>2 
 <%name%>3"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=" <%self.name%>1 
 <%self.name%>2 
 <%self.name%>3"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + '1 \n ' + self.name + '2 \n ' + self.name + '3'"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -108,7 +108,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2211" domainClass="EPackage"> <defaultLayer name="Default"> <nodeMappings name="NodeFirstLevel" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> - <style xsi:type="style:SquareDescription" labelExpression="Node <%name%>" labelPosition="node" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'Node ' + self.name" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -130,7 +130,7 @@ </style> </subNodeMappings> <subContainerMappings name="ContainerSecondLevel" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -138,14 +138,14 @@ </style> </subContainerMappings> <subContainerMappings name="ContainerListSecondLevel" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="ListContainer <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'ListContainer ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Container <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'Container ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -153,14 +153,14 @@ </style> </containerMappings> <containerMappings name="ContainerListFirstLevelTrunc" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="List"> - <subNodeMappings name="NodeElementListTrunc" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EClass"> + <subNodeMappings name="NodeElementListTrunc" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelExpression="Truncated Element List At opening" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Truncated ListContainer At opening"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="Truncated ListContainer At opening"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -176,7 +176,7 @@ </style> </subNodeMappings> <subContainerMappings name="ContainerSecondLevelTrunc" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Truncated Container in container At opening"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="Truncated Container in container At opening"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -184,14 +184,14 @@ </style> </subContainerMappings> <subContainerMappings name="ContainerListSecondLevelTrunc" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Truncated ListContainer in container At opening"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="Truncated ListContainer in container At opening"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="Truncated Container At opening"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="Truncated Container At opening"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -199,14 +199,14 @@ </style> </containerMappings> <containerMappings name="ContainerListFirstLevel" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" childrenPresentation="List"> - <subNodeMappings name="NodeElementList" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EClass"> - <style xsi:type="style:SquareDescription" labelExpression="NE <%name%>" labelPosition="node"> + <subNodeMappings name="NodeElementList" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EClass"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'NE ' + self.name" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="ListContainer <%name%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:'ListContainer ' + self.name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -217,15 +217,15 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3382" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <nodeMappings name="Node with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="Port with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EAttribute")%>" domainClass="EAttribute"> + <nodeMappings name="Node with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="Port with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="Port with label in node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EAttribute")%>" domainClass="EAttribute"> + <borderedNodeMappings name="Port with label in node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription" sizeComputationExpression="10" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -238,7 +238,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <nodeMappings name="Node with label in node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="Node with label in node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:EllipseNodeDescription" sizeComputationExpression="10" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -248,34 +248,34 @@ <edgeMappings name="RelationBasedEdge EReference" label="Edge" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" sourceMapping="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='List']" targetMapping="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']" targetFinderExpression="var:self" sourceFinderExpression="var:self" domainClass="EPackage" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelExpression="<%name%>"> + <beginLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelExpression="<%name%>"> + <endLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </endLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="List" label="List" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List" label="List" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subNodeMappings[name='Node%20In%20Container%20with%20label%20on%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </containerMappings> - <containerMappings name="Container" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']"> - <subNodeMappings name="Node In Container with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border']"> + <containerMappings name="Container" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20in%20node']"> + <subNodeMappings name="Node In Container with label on border" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border']"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <subNodeMappings name="Node In Container with label on node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <subNodeMappings name="Node In Container with label on node" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -297,20 +297,20 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </subNodeMappings> - <style xsi:type="style:ShapeContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> <subContainerMappings name="Container EClass R1 List" label="List2" labelDirectEdit="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@toolSections.0/@ownedTools[name='directEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20%20with%20label%20on%20border'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@nodeMappings[name='Node%20with%20label%20on%20border']/@borderedNodeMappings[name='Port%20with%20label%20in%20node']" reusedNodeMappings="//@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subContainerMappings[name='Container%20EClass%20R1']/@subNodeMappings[name='Node%20EAttribute%20R1%20label'] //@ownedViewpoints[name='multiLines']/@ownedRepresentations[name='VP-3382']/@defaultLayer/@containerMappings[name='Container']/@subContainerMappings[name='Container%20EClass%20R1']/@subNodeMappings[name='Node%20EAttribute%20R1']" childrenPresentation="List"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc732/tc732.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc732/tc732.odesign index 3856d2d775..90bbf61710 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc732/tc732.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc732/tc732.odesign @@ -1,22 +1,22 @@ <?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" 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="Ticket #732" version="8.0.0"> +<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="Ticket #732" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #732" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC732 Square representation 1" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <edgeMappings name="package hierarchie" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Representation%202']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1']" targetFinderExpression="<%eContents().filter("EPackage")%>"> - <style> + <edgeMappings name="package hierarchie" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Representation%202']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> </style> </edgeMappings> <containerMappings name="Container EPackage R1" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Representation%202']" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name%20EPackage%20LP']" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <subNodeMappings name="Node EPackage R1" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Representation%202']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> + <subNodeMappings name="Node EPackage R1" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732']/@ownedRepresentations[name='TC732%20Square%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Representation%202']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -43,14 +43,14 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC732 Square representation 2" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> <containerMappings name="Container EPackage R2" labelDirectEdit="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23732%20second%20viewpoint']/@ownedRepresentations[name='TC732%20Square%20representation%202']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name%20EPackage%20NL']" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <subNodeMappings name="Node EClass R2" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <subNodeMappings name="Node EClass R2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc814/tc814.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc814/tc814.odesign index 3258465a01..8baa4b20ef 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc814/tc814.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/tc814/tc814.odesign @@ -1,17 +1,17 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="Ticket #814" version="8.0.0"> +<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" name="Ticket #814" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #814" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC814 Square List Package" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> <containerMappings name="Container EPackage LP" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" childrenPresentation="List"> - <subNodeMappings name="Node EPackage LP" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23814']/@ownedRepresentations[name='TC814%20Square%20List%20Package']/@defaultLayer/@toolSections.0/@ownedTools[name='Navigate%20to%20Not%20List']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> + <subNodeMappings name="Node EPackage LP" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%23814']/@ownedRepresentations[name='TC814%20Square%20List%20Package']/@defaultLayer/@toolSections.0/@ownedTools[name='Navigate%20to%20Not%20List']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:SquareDescription" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -30,14 +30,14 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC814 Square Not List" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> <containerMappings name="Container EPackage NL" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <subNodeMappings name="Node EClass NL" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <subNodeMappings name="Node EClass NL" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/vp2659/vp-2659.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/vp2659/vp-2659.odesign index 958fbe1cf2..94ca580f39 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/vp2659/vp-2659.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/navigation/vp2659/vp-2659.odesign @@ -1,9 +1,9 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-2659" version="8.0.0"> +<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" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-2659" version="10.1.3.201511131800"> <ownedViewpoints name="NavigationDescriptions"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="EPackage Diagram" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticElements="<%self.eClassifiers%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticElements="aql:self.eClassifiers" domainClass="EClass"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -13,38 +13,38 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="EPackage crossTable" domainClass="EPackage"> - <ownedRepresentationNavigationDescriptions xsi:type="tool:DiagramNavigationDescription" name="Navigate From Class to Package" browseExpression="<%self.ancestor().filter("EPackage")%>" navigationNameExpression="custom navigation" diagramDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20Diagram']"> + <ownedRepresentationNavigationDescriptions xsi:type="tool:DiagramNavigationDescription" name="Navigate From Class to Package" browseExpression="aql:self.ancestors()->filter(ecore::EPackage)" navigationNameExpression="custom navigation" diagramDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20Diagram']"> <containerViewVariable name="containerView"/> <containerVariable name="container"/> <representationNameVariable name="diagramName"/> </ownedRepresentationNavigationDescriptions> - <ownedLineMappings name="EClass" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedRepresentationNavigationDescriptions[name='Navigate%20From%20Class%20to%20Package']" domainClass="EClass" semanticCandidatesExpression="<%self.eClassifiers%>"/> + <ownedLineMappings name="EClass" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedRepresentationNavigationDescriptions[name='Navigate%20From%20Class%20to%20Package']" domainClass="EClass" semanticCandidatesExpression="aql:self.eClassifiers"/> <ownedColumnMappings name="EAttributes" domainClass="EAttribute"/> - <intersection name="hasAttribute" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedRepresentationNavigationDescriptions[name='Navigate%20From%20Class%20to%20Package']" lineMapping="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedLineMappings[name='EClass']" columnMapping="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedColumnMappings.0" labelExpression="X" columnFinderExpression="<%self.eStructuralFeatures%>"/> + <intersection name="hasAttribute" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedRepresentationNavigationDescriptions[name='Navigate%20From%20Class%20to%20Package']" lineMapping="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedLineMappings[name='EClass']" columnMapping="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20crossTable']/@ownedColumnMappings.0" labelExpression="X" columnFinderExpression="aql:self.eStructuralFeatures"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="EPackage editionTable" domainClass="EPackage"> - <ownedRepresentationNavigationDescriptions xsi:type="description_3:TreeNavigationDescription" name="navigate to EPackage treee" precondition="<%self.name == "C1"%>" browseExpression="feature:eContainer" navigationNameExpression="custom navigation" treeDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']"> + <ownedRepresentationNavigationDescriptions xsi:type="description_3:TreeNavigationDescription" name="navigate to EPackage treee" precondition="aql:self.name = 'C1'" browseExpression="feature:eContainer" navigationNameExpression="custom navigation" treeDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']"> <containerViewVariable name="view"/> <containerVariable name="element"/> <representationNameVariable name="name"/> </ownedRepresentationNavigationDescriptions> - <ownedLineMappings name="EClass" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20editionTable']/@ownedRepresentationNavigationDescriptions[name='navigate%20to%20EPackage%20treee']" domainClass="EClass" semanticCandidatesExpression="<%self.eClassifiers%>"/> + <ownedLineMappings name="EClass" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20editionTable']/@ownedRepresentationNavigationDescriptions[name='navigate%20to%20EPackage%20treee']" domainClass="EClass" semanticCandidatesExpression="aql:self.eClassifiers"/> <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="feature:name"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="EPackage tree" domainClass="EPackage"> - <subItemMappings name="EClass" domainClass="EClass" semanticCandidatesExpression="<%self.eClassifiers%>"> + <subItemMappings name="EClass" domainClass="EClass" semanticCandidatesExpression="aql:self.eClassifiers"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="EAttribute" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']/@ownedRepresentationNavigationDescriptions[name='navigation%20FromTree%20To%20Tree']" domainClass="EAttribute" semanticCandidatesExpression="<%self.eStructuralFeatures%>"> + <subItemMappings name="EAttribute" navigationDescriptions="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']/@ownedRepresentationNavigationDescriptions[name='navigation%20FromTree%20To%20Tree']" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eStructuralFeatures"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> </subItemMappings> - <ownedRepresentationNavigationDescriptions xsi:type="description_3:TreeNavigationDescription" name="navigation FromTree To Tree" browseExpression="<%eContainer.eContainer%>" navigationNameExpression="custom navigation" treeDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']"> + <ownedRepresentationNavigationDescriptions xsi:type="description_3:TreeNavigationDescription" name="navigation FromTree To Tree" browseExpression="aql:self.eContainer().eContainer()" navigationNameExpression="custom navigation" treeDescription="//@ownedViewpoints[name='NavigationDescriptions']/@ownedRepresentations[name='EPackage%20tree']"> <containerViewVariable name="container"/> <containerVariable/> <representationNameVariable name="treeName"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/2444/2444.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/2444/2444.odesign index fe69dfc061..a3c4fba70c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/2444/2444.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/2444/2444.odesign @@ -1,25 +1,25 @@ <?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" 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="2444" version="8.0.0"> +<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="2444" version="10.1.3.201511131800"> <ownedViewpoints name="2444" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2444" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticCandidatesExpression="feature:eContents" semanticElements="<%self + eReferences%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticCandidatesExpression="feature:eContents" semanticElements="aql:Sequence{self} + self.eReferences" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" width="10" height="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <edgeMappings name="SimpleEdge" semanticElements="<%self + eReferences%>" sourceMapping="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@nodeMappings[name='EClass']" targetFinderExpression="var:self"> + <edgeMappings name="SimpleEdge" semanticElements="aql:Sequence{self} + self.eReferences" sourceMapping="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@nodeMappings[name='EClass']" targetFinderExpression="var:self"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%eReferences.nFirst.name%>"> + <centerLabelStyleDescription labelExpression="aql:self.eReferences->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="package" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@containerMappings[name='package']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='2444']/@ownedRepresentations[name='2444']/@defaultLayer/@containerMappings[name='package']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/ecore.odesign index 37553294af..21c0585e6a 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/nodeCreation/ecore.odesign @@ -1,17 +1,17 @@ <?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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.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_For_VP-1633" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="EntitiesWithEClassAsBorderedNodeMapping" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Design Package" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='EntitiesWithEClassAsBorderedNodeMapping']/@defaultLayer/@containerMappings[name='Design%20Package']"> - <borderedNodeMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="Design Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='EntitiesWithEClassAsBorderedNodeMapping']/@defaultLayer/@containerMappings[name='Design%20Package']"> + <borderedNodeMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -24,14 +24,14 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@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_For_VP-1633" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@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_For_VP-1633" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -42,75 +42,77 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name + ' class has more than 3 super types'" targets="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <nodeMappings name="Enum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum"> + <nodeMappings name="Enum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum"> <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -118,38 +120,39 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -163,7 +166,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -172,7 +175,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -182,7 +185,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Interface ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="interface" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -212,13 +215,13 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -270,7 +273,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -281,7 +284,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -294,7 +297,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -319,7 +322,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -334,7 +337,7 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -344,8 +347,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -386,15 +389,15 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -415,28 +418,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -454,35 +457,35 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source==$element%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -501,26 +504,26 @@ <ownedTools xsi:type="tool:DirectEditLabel" name="Edit EAttribute Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool:DirectEditLabel" name="EReference Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool:DirectEditLabel" documentation="- "name" : change the name of the operation" name="Operation Name" forceRefresh="true"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedNodeMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@nodeMappings[name='Enum']" reusedContainerMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedNodeMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@nodeMappings[name='Enum']" reusedContainerMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -528,7 +531,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -542,12 +545,12 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -558,7 +561,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" precondition="true" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" precondition="true" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -567,7 +570,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EPackage into EPackage" precondition="true" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EPackage into EPackage" precondition="true" mappings="//@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design_For_VP-1633']/@ownedRepresentations[name='Entities_For_VP-1633']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -582,7 +585,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool_1:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -598,7 +601,7 @@ <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EReferenceServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/popupMenu/vp939.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/popupMenu/vp939.odesign index 970e420ce9..e59e0a24a3 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/popupMenu/vp939.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/popupMenu/vp939.odesign @@ -1,5 +1,5 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="group" version="8.0.0"> +<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="group" version="10.1.3.201511131800"> <ownedViewpoints name="vp939" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp939" domainClass="EPackage"> <defaultLayer name="Default"> @@ -25,7 +25,7 @@ </style> </nodeMappings> <containerMappings name="package" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -34,41 +34,41 @@ </containerMappings> <toolSections name="tools"> <ownedTools xsi:type="tool:PopupMenu" name="myMenu1"> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction1.1" precondition="<%filter("EClass")%>"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction1.1" precondition="aql:self.oclIsKindOf(ecore::EClass)"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> </initialOperation> </menuItemDescription> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction1.2" precondition="<%filter("EAttribute")%>"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction1.2" precondition="aql:self.oclIsKindOf(ecore::EAttribute)"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> </initialOperation> </menuItemDescription> </ownedTools> - <ownedTools xsi:type="tool:PopupMenu" name="myMenu2" precondition="<%filter("EPackage")%>"> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction2.1" precondition="<%false%>"> + <ownedTools xsi:type="tool:PopupMenu" name="myMenu2" precondition="aql:self.oclIsKindOf(ecore::EPackage)"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction2.1" precondition="aql:false"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> </initialOperation> </menuItemDescription> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction2.2" precondition="<%false%>"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction2.2" precondition="aql:false"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> </initialOperation> </menuItemDescription> </ownedTools> - <ownedTools xsi:type="tool:PopupMenu" name="myMenu3" precondition="<%false%>"> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction3.1" precondition="<%filter("EAttribute")%>"> + <ownedTools xsi:type="tool:PopupMenu" name="myMenu3" precondition="aql:false"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction3.1" precondition="aql:self.oclIsKindOf(ecore::EAttribute)"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> </initialOperation> </menuItemDescription> - <menuItemDescription xsi:type="tool:OperationAction" name="myAction3.2" precondition="<%filter("EClass")%>"> + <menuItemDescription xsi:type="tool:OperationAction" name="myAction3.2" precondition="aql:self.oclIsKindOf(ecore::EClass)"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> @@ -76,7 +76,7 @@ </menuItemDescription> </ownedTools> <ownedTools xsi:type="tool:PopupMenu" name="myMenu4"> - <menuItemDescription xsi:type="tool:OperationAction" name="actionMenu4" precondition="<%$views.nSize() >= 2%>"> + <menuItemDescription xsi:type="tool:OperationAction" name="actionMenu4" precondition="aql:views->size() >= 2"> <view name="views"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"/> @@ -87,7 +87,7 @@ <parameters name="view" value="var:elementView"/> </menuItemDescription> </ownedTools> - <ownedTools xsi:type="tool:PopupMenu" name="myMenuWithWrongVariable" precondition="<%views%>"> + <ownedTools xsi:type="tool:PopupMenu" name="myMenuWithWrongVariable" precondition="aql:self.views"> <menuItemDescription xsi:type="tool:OperationAction" name="myActionWithViews1"> <view name="views"/> <initialOperation> @@ -106,7 +106,7 @@ </menuItemDescription> </ownedTools> <ownedTools xsi:type="tool:PopupMenu" name="myExternalJavaActionWithWrongVariable"> - <menuItemDescription xsi:type="tool:ExternalJavaAction" name="myExternalJavaActionWithWrongVariableAction" precondition="<%views%>" id="org.eclipse.sirius.tests.unit.api.tools.stubJavaActionID"> + <menuItemDescription xsi:type="tool:ExternalJavaAction" name="myExternalJavaActionWithWrongVariableAction" precondition="aql:self.views" id="org.eclipse.sirius.tests.unit.api.tools.stubJavaActionID"> <parameters name="eClass" value="var:element"/> <parameters name="view" value="var:elementView"/> </menuItemDescription> @@ -124,7 +124,7 @@ </menuItemDescription> </ownedTools> <ownedTools xsi:type="tool:PopupMenu" name="myExternalJavaActionCallWithWrongVariable"> - <menuItemDescription xsi:type="tool:ExternalJavaActionCall" name="myExternalJavaActionCallWithWrongVariableAction" precondition="<%views%>" action="//@ownedViewpoints[name='vp939']/@ownedRepresentations[name='vp939']/@defaultLayer/@toolSections.0/@ownedTools[name='myExternalJavaActionCallWithWrongVariable']/@menuItemDescription.2"/> + <menuItemDescription xsi:type="tool:ExternalJavaActionCall" name="myExternalJavaActionCallWithWrongVariableAction" precondition="aql:self.views" action="//@ownedViewpoints[name='vp939']/@ownedRepresentations[name='vp939']/@defaultLayer/@toolSections.0/@ownedTools[name='myExternalJavaActionCallWithWrongVariable']/@menuItemDescription.2"/> <menuItemDescription xsi:type="tool:OperationAction" name="myActionWithViews"> <view name="views"/> <initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign index b8d8d176d6..0d2f77d7f8 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-1479/description/tc1479.odesign @@ -1,9 +1,9 @@ <?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" 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="Ticket #1479" version="10.0.0.201504091800"> +<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="Ticket #1479" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1479" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1479" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eReferenceType%>"> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231479']/@ownedRepresentations[name='TC1479']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eReferenceType"> <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -31,14 +31,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -78,7 +78,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-2216/tc2216.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-2216/tc2216.odesign index 680ea90753..44e80a1c13 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-2216/tc2216.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc-2216/tc2216.odesign @@ -1,16 +1,16 @@ <?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="tc2216" version="8.0.0"> +<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="tc2216" version="10.1.3.201511131800"> <ownedViewpoints name="tc2216" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2216" domainClass="EPackage"> <nodeMappings name="EClass as node" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DNEP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DNEP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -19,13 +19,13 @@ <containerMappings name="Package" semanticCandidatesExpression="feature:eContents" semanticElements="var:self" domainClass="EPackage"> <borderedNodeMappings name="EClass as border node" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN4EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN4EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN4EP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN4EP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -33,19 +33,19 @@ </borderedNodeMappings> <subNodeMappings name="EClass as subnode" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN3EP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN3EP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <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.swtbot/data/unit/portPositionStability/tc_viewpoint_1283/tc_viewpoint_1283.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc_viewpoint_1283/tc_viewpoint_1283.odesign index 6570fe3fa6..186512d10d 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc_viewpoint_1283/tc_viewpoint_1283.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portPositionStability/tc_viewpoint_1283/tc_viewpoint_1283.odesign @@ -1,58 +1,58 @@ <?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="tc_viewpoint_1283" version="8.0.0"> +<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="tc_viewpoint_1283" version="10.1.3.201511131800"> <ownedViewpoints name="tc_viewpoint_1283" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc_viewpoint_1283" domainClass="EPackage"> <nodeMappings name="EPackage as node" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <borderedNodeMappings name="EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_on_DN2EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_on_DN2EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_on_DNEP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_on_DNEP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DNEP_<%name%>" resizeKind="NSEW" width="25" height="25"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DNEP_' + self.name" resizeKind="NSEW" width="25" height="25"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </nodeMappings> <containerMappings name="Package" semanticCandidatesExpression="feature:eContents" semanticElements="var:self" domainClass="EPackage"> - <borderedNodeMappings name="EClass as border node" preconditionExpression="<%eContents().nSize() > 0%>" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <borderedNodeMappings name="EClass as border node" preconditionExpression="aql:self.eContents()->size() > 0" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN4EP_on_DN4EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN4EP_on_DN4EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN4EP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN4EP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </borderedNodeMappings> - <subNodeMappings name="EClass as subnode" preconditionExpression="<%eContents().nSize() > 0%>" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> + <subNodeMappings name="EClass as subnode" preconditionExpression="aql:self.eContents()->size() > 0" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <borderedNodeMappings name="EAttribute" semanticCandidatesExpression="feature:eContents" domainClass="EAttribute"> - <style xsi:type="style:SquareDescription" labelExpression="DN2EP_on_DN3EP_<%name%>" resizeKind="NSEW" width="5" height="5"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN2EP_on_DN3EP_' + self.name" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="DN3EP_<%name%>" resizeKind="NSEW" width="10" height="10"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'DN3EP_' + self.name" resizeKind="NSEW" width="10" height="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <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.swtbot/data/unit/portSelectionWithManyEdges/manyEdges.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portSelectionWithManyEdges/manyEdges.odesign index ab434497c3..e9b7a3a05c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portSelectionWithManyEdges/manyEdges.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/portSelectionWithManyEdges/manyEdges.odesign @@ -1,5 +1,5 @@ <?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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="8.0.0"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="10.1.3.201511131800"> <ownedViewpoints documentation="Initialize an UML Analysis" name="UML Analysis" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Fake ViewPointDescription - factorize elements" name="Reused Description" domainClass="Model"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> @@ -26,11 +26,11 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="<%current.ownedBehavior.filter("Interaction").nLast%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="aql:self.ownedBehavior->filter(interactions::Interaction)->last()" diagramDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interaction" referenceName="ownedBehavior"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer.name%> Interaction <%eContainer.ownedBehavior.filter("Interaction").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + ' Interaction ' +self.eContainer().ownedBehavior->filter(interactions::Interaction)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -43,8 +43,8 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" documentation="Diagram for Packages" name="Package Diagram" domainClass="Model" preconditionExpression=""> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Package Diagram"> - <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Object%20Diagram']" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Package")%>" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PD_Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Object%20Diagram']" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PD_Package']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -59,14 +59,14 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> </subSections> <subSections name="drag & drop"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="PD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PD_Package']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="PD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Diagram']/@defaultLayer/@containerMappings[name='PD_Package']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -89,7 +89,7 @@ <ownedConcernDescriptions name="Default"/> <ownedConcernDescriptions name="Show Imports" filters="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@filters[name='Hide%20containment']"/> </concerns> - <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="<%eContents().filter("Package")%>" nodeMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']"/> + <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eContents()->filter(uml::Package)" nodeMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']"/> <defaultLayer name="Package Hierarchy"> <nodeMappings name="PH_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='State%20Machine%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='StateMachine'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Object%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Package"> <style xsi:type="style:BundledImageDescription" labelSize="10" sizeComputationExpression="4"> @@ -97,7 +97,7 @@ <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%eContents.filter("Classifier").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.eContents()->filter(uml::Classifier)->size() > 0"> <style xsi:type="style:BundledImageDescription" labelSize="10" sizeComputationExpression="4"> <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,14 +106,15 @@ </conditionnalStyles> </nodeMappings> <edgeMappings name="PH_Containment" deletionDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20a%20contained%20in%20edge']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:eContainer"> - <style lineStyle="dash" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style lineStyle="dash" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="<%importedPackage%>" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Package%20Hierarchy']/@defaultLayer/@nodeMappings[name='PH_Package']" targetFinderExpression="aql:self.importedPackage" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> - <centerLabelStyleDescription labelFormat="bold" showIcon="false"> + <centerLabelStyleDescription showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -124,7 +125,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New package <%eContainer.eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New package ' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -145,7 +146,7 @@ <containerView/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%eContainer("Model")%>" featureName="packagedElement"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:self.eContainerOrSelf(uml::Model)" featureName="packagedElement"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -169,51 +170,51 @@ <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Use Case"> <nodeMappings name="UCD_Actor" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" createElements="false" documentation="Mapping to create actors" domainClass="Actor"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" showIcon="false" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/Actor.png"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" showIcon="false" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/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> </nodeMappings> - <edgeMappings name="UCD_Association" semanticCandidatesExpression="<%getRootContainer().eAllContents("Association")%>" semanticElements="<%memberEnd + current%>" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%memberEnd.type%>" sourceFinderExpression="<%memberEnd.type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Association" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Association)" semanticElements="aql:OrderedSet{self.memberEnd,self}" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.memberEnd.type" sourceFinderExpression="aql:self.memberEnd.type" targetExpression="var:self" domainClass="Association" useDomainElement="true"> + <style targetArrow="NoDecoration" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Extend" semanticCandidatesExpression="<%getRootContainer().eAllContents("Extend")%>" semanticElements="<%current + extension + extendedCase%>" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%extendedCase%>" sourceFinderExpression="<%extension%>" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Extend" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Extend)" semanticElements="aql:OrderedSet{self,self.extension,self.extendedCase}" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.extendedCase" sourceFinderExpression="aql:self.extension" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« extend »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="aql:'« extend »'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Include" semanticCandidatesExpression="<%getRootContainer().eAllContents("Include")%>" semanticElements="<%current + includingCase + addition%>" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%addition%>" sourceFinderExpression="<%includingCase%>" targetExpression="var:self" domainClass="Include" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Include" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Include)" semanticElements="aql:OrderedSet{self ,self.includingCase ,self.addition}" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.addition" sourceFinderExpression="aql:self.includingCase" targetExpression="var:self" domainClass="Include" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« include »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="« include »"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="<%getRootContainer().eAllContents("Actor").generalization%>" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Actor).generalization" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="UCD_Subject" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> - <subNodeMappings name="UCD_UseCase" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("UseCase")%>" documentation="Mapping to create Use Cases" domainClass="UseCase"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.png"> + <containerMappings name="UCD_Subject" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> + <subNodeMappings name="UCD_UseCase" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::UseCase)" documentation="Mapping to create Use Cases" domainClass="UseCase"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.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> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" showIcon="false"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -227,7 +228,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Actor" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Actor<%eContainer.eContents.filter("Actor").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Actor' + self.eContainer().eContents()->filter(uml::Actor)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -236,9 +237,9 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="UseCase" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="UseCase<%eContainer("Package").name%><%eContainer("Package").eContents().filter("UseCase").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'UseCase' + self.eContainerOrSelf(uml::Package).name + self.eContainerOrSelf(uml::Package).eContents()->filter(uml::UseCase)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:container"/> </subModelOperations> </firstModelOperations> @@ -249,12 +250,12 @@ <viewVariable/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Component" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer("Package").name%> Subject"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainerOrSelf(Package).name + ' Subject'"/> </firstModelOperations> </initialOperation> </ownedTools> <subSections name="drag & drop"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="A Drag & Drop tool to add actors" name="UC_D&D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="A Drag & Drop tool to add actors" name="UC_D&D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@nodeMappings[name='UCD_Actor']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -263,14 +264,14 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newSemanticContainer"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to drag & drop a use case" name="UC_D&D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to drag & drop a use case" name="UC_D&D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:For" expression="<%current.filter("UseCase")[!subject.nContains($newSemanticContainer)]%>"> + <subModelOperations xsi:type="tool_1:For" expression="aql:current->filter(uml::UseCase)->select( e | not e.subject->includes(newSemanticContainer))"> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:newSemanticContainer"/> </subModelOperations> </firstModelOperations> @@ -279,13 +280,13 @@ </subSections> </toolSections> <toolSections name="relations"> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="<%$preSource.filter("Actor").nSize() > 0 && $preTarget.filter("UseCase").nSize() > 0%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Association']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Association']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> @@ -293,12 +294,12 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Association_<%$source.name%>_to_<%$target.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Association_' + source.name + '_to_' + target.name"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Extend']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Extend']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -312,7 +313,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Include']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Include']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -326,7 +327,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="<%($preSource + $preTarget).filter("Actor").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Generalization']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::Actor)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Use%20Case%20Diagram']/@defaultLayer/@edgeMappings[name='UCD_Generalization']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -342,190 +343,192 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="<%filter("Model").nSize() > 0%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="aql:self.oclIsKindOf(uml::Model)"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Class Diagram"> - <edgeMappings name="CD_Association" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%current + memberEnd%>" documentation="This mapping describes an association.





" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="<%memberEnd.nGet(1).type%>" sourceFinderExpression="<%memberEnd.nGet(0).type%>" domainClass="Association" useDomainElement="true"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="CD_Association" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.memberEnd" documentation="This mapping describes an association.





" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.memberEnd->at(2).type" sourceFinderExpression="aql:self.memberEnd->first().type" domainClass="Association" useDomainElement="true"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" targetArrow="NoDecoration"> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && !memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "none"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and not (self.memberEnd->first().isNavigableP() ) and self.memberEnd->at(2).aggregation = 'none'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && !memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "shared"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="Diamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and not ( self.memberEnd->first().isNavigableP() ) and self.memberEnd->at(2).aggregation = 'shared'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="Diamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && !memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "composite"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="FillDiamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and not ( self.memberEnd->first().isNavigableP()) and self.memberEnd->at(2).aggregation = 'composite'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="FillDiamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(0).isNavigableP() && !memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).aggregation == "none"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->first().isNavigableP() and not ( self.memberEnd->at(2).isNavigableP() ) and self.memberEnd->first().aggregation = 'none'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="NoDecoration"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(0).isNavigableP() && !memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).aggregation == "shared"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="Diamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->first().isNavigableP() and not ( self.memberEnd->at(2).isNavigableP() ) and self.memberEnd->first().aggregation = 'shared'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="Diamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(0).isNavigableP() && !memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).aggregation == "composite"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="FillDiamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->first().isNavigableP() and not (self.memberEnd->at(2).isNavigableP()) and self.memberEnd->first().aggregation = 'composite'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="FillDiamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "none" && memberEnd.nGet(0).aggregation == "none"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%> <---> <%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and self.memberEnd->first().isNavigableP() and self.memberEnd->at(2).aggregation = 'none' and self.memberEnd->first().aggregation = 'none'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name + ' <---> ' + self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "shared"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="Diamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%> <---> <%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and self.memberEnd->first().isNavigableP() and self.memberEnd->at(2).aggregation = 'shared'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="Diamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name + ' <---> ' + self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(1).aggregation == "composite"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="FillDiamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%> <---> <%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and self.memberEnd->first().isNavigableP() and self.memberEnd->at(2).aggregation = 'composite'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="FillDiamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name + ' <---> ' + self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(0).aggregation == "shared"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="Diamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%> <---> <%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and self.memberEnd->first().isNavigableP() and self.memberEnd->first().aggregation = 'shared'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="Diamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name + ' <---> ' + self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%memberEnd.nGet(1).isNavigableP() && memberEnd.nGet(0).isNavigableP() && memberEnd.nGet(0).aggregation == "composite"%>"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="FillDiamond" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).multiplicityToString%> <%memberEnd.nGet(1).name%> <---> <%memberEnd.nGet(0).multiplicityToString%> <%memberEnd.nGet(0).name%>"> + <conditionnalStyles predicateExpression="aql:self.memberEnd->at(2).isNavigableP() and self.memberEnd->first().isNavigableP() and self.memberEnd->first().aggregation = 'composite'"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sourceArrow="InputArrow" targetArrow="FillDiamond"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).multiplicityToString() + ' ' + self.memberEnd->at(2).name + ' <---> ' + self.memberEnd->first().multiplicityToString() + ' ' + self.memberEnd->first().name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="CD_Generalization" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" domainClass="Generalization" useDomainElement="true"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="CD_Generalization" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" domainClass="Generalization" useDomainElement="true"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CD_Realization" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface']" targetFinderExpression="<%contract%>" sourceFinderExpression="<%implementingClassifier%>" domainClass="InterfaceRealization" useDomainElement="true"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="CD_Realization" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.contract" sourceFinderExpression="aql:self.implementingClassifier" domainClass="InterfaceRealization" useDomainElement="true"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CD_Dependency" preconditionExpression="<%filter("InterfaceRealization").nSize() == 0%>" deletionDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='delete']/@ownedTools[name='Delete_Dependency']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%current + supplier + client%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" domainClass="Dependency" useDomainElement="true"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" lineStyle="dash" sizeComputationExpression="1"/> + <edgeMappings name="CD_Dependency" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" deletionDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='delete']/@ownedTools[name='Delete_Dependency']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:OrderedSet{self, self.supplier, self.client}" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" domainClass="Dependency" useDomainElement="true"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" lineStyle="dash"/> </edgeMappings> - <edgeMappings name="CD_AssociationToEnum" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%current + memberEnd.nGet(0)%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Enumeration']" targetFinderExpression="<%memberEnd.nGet(1).type%>" sourceFinderExpression="<%memberEnd.nGet(0).type%>" domainClass="Association" useDomainElement="true"> - <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']" sizeComputationExpression="1"> - <centerLabelStyleDescription labelSize="10" labelExpression="<%memberEnd.nGet(1).name%>"> + <edgeMappings name="CD_AssociationToEnum" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:OrderedSet{self,memberEnd->first()}" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Enumeration']" targetFinderExpression="aql:self.memberEnd->at(2).type" sourceFinderExpression="aql:self.memberEnd->first().type" domainClass="Association" useDomainElement="true"> + <style strokeColor="//@userColorsPalettes[name='Migration%20Palette']/@entries[name='color1']"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->at(2).name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType%>" domainClass="Class"> - <subNodeMappings name="CD_Attribute" preconditionExpression="<%association == null%>" semanticCandidatesExpression="<%attribute%>" domainClass="Property"> - <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="<%visibilityToString%> <%name%><%if (type != null) {%> : <%type.name%><%}%>" sizeComputationExpression="1"> + <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" domainClass="Class"> + <subNodeMappings name="CD_Attribute" preconditionExpression="aql:self.association = null" semanticCandidatesExpression="aql:self.attribute" domainClass="Property"> + <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="aql:self.visibilityToString() + ' ' + self.name + if self.type <> null then ' : ' + self.type.name else '' endif" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <subNodeMappings name="CD_Operation" semanticCandidatesExpression="<%getOperationsP%>" domainClass="Operation"> - <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="<%visibilityToString%> <%name%>(<%parametersToString%>)<%if (type != null) {%> : <%type.name%><%}%>" sizeComputationExpression="1"> + <subNodeMappings name="CD_Operation" semanticCandidatesExpression="aql:self.getOperationsP()" domainClass="Operation"> + <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="aql:self.visibilityToString() + ' ' + self.name + '(' + self.parametersToString() + ')' + if self.type <> null then ' : ' + self.type.name else '' endif" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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='dark_gray']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <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='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="CD_Interface" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" semanticCandidatesExpression="<%ownedType%>" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Attribute'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="CD_Interface" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" semanticCandidatesExpression="aql:self.ownedType" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Attribute'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class']"> + <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='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <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='dark_blue']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Package" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%nestedPackage%>" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PackageImport'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <containerMappings name="CD_Package" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.nestedPackage" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PackageImport'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </containerMappings> - <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType%>" domainClass="Enumeration" childrenPresentation="List"> + <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" domainClass="Enumeration" childrenPresentation="List"> <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="EnumerationLiteral"> - <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="<%name%><%if (specification != null) {%> = <%specification.valueSpecToString%><%}%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:SquareDescription" labelSize="10" labelExpression="aql:self.name + if self.specification <> null then ' = ' + self.specification.valueSpecToString() else '' endif" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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='dark_green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </containerMappings> - <containerMappings name="CD_PackageImport" deletionDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='delete']/@ownedTools[name='Delete_PackageImport']" semanticCandidatesExpression="<%packageImport.importedPackage%>" semanticElements="" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PackageImport']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%getQualifiedName%>"> + <containerMappings name="CD_PackageImport" deletionDescription="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@toolSections.0/@subSections[name='delete']/@ownedTools[name='Delete_PackageImport']" semanticCandidatesExpression="aql:self.packageImport.importedPackage" semanticElements="" domainClass="Package" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@containerMappings[name='CD_PackageImport']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.getQualifiedName()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -540,7 +543,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("Package").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -551,7 +554,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Class" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("Class").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(uml::Class)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -562,7 +565,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interface" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Interface<%eContainer().eContents().filter("Interface").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Interface' + self.eContainer().eContents()->filter(uml::Interface)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -573,7 +576,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Enumeration" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Enumeration<%eContainer.ownedType.filter("Enumeration").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Enumeration' + self.eContainer().ownedType->filter(uml::Enumeration)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -584,7 +587,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedAttribute"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Attribute<%eContainer().eContents().filter("Property").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Attribute' + self.eContainer().eContents()->filter(uml::Property)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -595,7 +598,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Operation" referenceName="ownedOperation"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Operation<%eContainer().eContents().filter("Operation").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Operation' + self.eContainer().eContents()->filter(uml::Operation)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -606,9 +609,9 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EnumerationLiteral" referenceName="ownedLiteral"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="EnumerationLiteral<%eContainer.ownedLiteral.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'EnumerationLiteral' + self.eContainer().ownedLiteral->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="LiteralInteger" referenceName="specification"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="value" valueExpression="<%eContainer.eContainer.eAllContents("EnumerationLiteral").nSize() - 1%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="value" valueExpression="aql:self.eContainer().eContainer().eAllContents(uml::EnumerationLiteral)->size() - 1"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -620,17 +623,17 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$target.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="<%memberEnd.nGet(1)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="aql:self.memberEnd->at(2)"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Association"/> </subModelOperations> </firstModelOperations> @@ -649,7 +652,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create a new Interface Realization" name="Interface Realization" precondition="<%$preSource.filter("Class").nSize > 0 && $preTarget.filter("Interface").nSize() > 0%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@edgeMappings[name='CD_Realization']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create a new Interface Realization" name="Interface Realization" precondition="aql:preSource.oclIsKindOf(uml::Class) and preTarget.oclIsKindOf(uml::Interface)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Class%20Diagram']/@defaultLayer/@edgeMappings[name='CD_Realization']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -668,7 +671,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Dependency" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="client" valueExpression="var:source"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="supplier" valueExpression="var:target"/> @@ -678,7 +681,7 @@ </ownedTools> </subSections> <subSections name="wizard"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="<%$containerView.target.filter("Package").nSize() == 1%>" forceRefresh="true" candidatesExpression="<%getRootContainer.eAllContents("Package") - ($containerView.eContainer("DDiagram").target.eAllContents("Package") + $containerView.target.packageImport.importedPackage + $containerView.target.ancestor.filter("Package"))%>" multiple="true" tree="true" rootExpression="<%(getRootContainer.eAllContents("Package") - ($containerView.eContainer("DDiagram").target.eAllContents("Package") + $containerView.target.packageImport.importedPackage + $containerView.target.ancestor.filter("Package"))).getRootPackages%>" childrenExpression="<%nestedPackage%>"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="aql:containerView.target->filter(uml::Package)->size() = 1" forceRefresh="true" candidatesExpression="aql:self.eResource().getContents()->first().eAllContents(uml::Package) - (containerView.eContainerOrSelf(diagram::DDiagram).target.eAllContents(uml::Package) + containerView.target.packageImport.importedPackage + containerView.target->ancestors()->filter(uml::Package))" multiple="true" tree="true" rootExpression="aql:(eResource().getContents()->first().eAllContents(ecore::Package) - (containerView.eContainerOrSelf(diagram::DDiagram).target.eAllContents(uml::Package) + containerView.target.packageImport.importedPackage + containerView.target->ancestors()->filter(uml::Package))).getRootPackages()" childrenExpression="aql:self.nestedPackage"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -701,7 +704,7 @@ <elementView name="view"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%element%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.element"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </firstModelOperations> </initialOperation> @@ -711,7 +714,7 @@ <elementView name="view"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target.packageImport[importedPackage==$element]%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target.packageImport->select( e | e.importedPackage=element)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </firstModelOperations> </initialOperation> @@ -722,33 +725,34 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Interface%20on%20canvas']" name="Component Diagram" domainClass="Package"> <defaultLayer name="Component Diagram"> - <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Interface")%>" createElements="false" domainClass="Interface"> - <style xsi:type="style:BundledImageDescription" labelFormat="italic" showIcon="false" shape="dot"> + <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Interface)" createElements="false" domainClass="Interface"> + <style xsi:type="style:BundledImageDescription" showIcon="false" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </nodeMappings> - <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> + <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </edgeMappings> - <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -756,13 +760,13 @@ </style> </edgeMappings> <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_Component']"> - <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -770,21 +774,21 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Component") - eAllContents("Component")%>" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']"> - <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']"> + <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -792,7 +796,7 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> @@ -827,7 +831,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Component%20Diagram']/@defaultLayer/@containerMappings[name='CO_ImportedComponent']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -878,37 +882,39 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="State Machine Diagram" domainClass="StateMachine"> <defaultLayer name="State Machine"> - <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='State%20Machine%20Diagram']/@defaultLayer/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='State%20Machine%20Diagram']/@defaultLayer/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="Transition" useDomainElement="true"> + <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='State%20Machine%20Diagram']/@defaultLayer/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='State%20Machine%20Diagram']/@defaultLayer/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="Transition" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%eContents().nSize > 0%>"> - <style> + <conditionnalStyles predicateExpression="aql:self.eContents()->size() > 0"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> <containerMappings name="SM_Region" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Region"> - <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%subvertex%>" domainClass="Vertex"> + <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.subvertex" domainClass="Vertex"> <style xsi:type="style:BundledImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="4"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> </style> - <conditionnalStyles predicateExpression="<%filter("Pseudostate").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::Pseudostate)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="ring"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%filter("FinalState").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::FinalState)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -916,8 +922,9 @@ </style> </conditionnalStyles> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -966,7 +973,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Region")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(uml::Region)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Transition" referenceName="transition"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Transition"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="var:source"/> @@ -975,9 +982,9 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="<%eContents.filter("StateMachine").nLast()%>"> + <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="aql:self.eContents()->filter(uml::StateMachine)->last())"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="StateMachine" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New StateMachine"/> </subModelOperations> @@ -992,20 +999,20 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Sequence Diagram" domainClass="Interaction"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Sequence Diagram"> - <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="<%lifeline%>" domainClass="Lifeline"> - <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="<%coveredBy%>" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> - <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="<%""%>" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.png"> + <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="aql:self.lifeline" domainClass="Lifeline"> + <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="aql:self.coveredBy" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> + <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:''" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.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> </borderedNodeMappings> - <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="<%6%>" labelPosition="node" resizeKind="NSEW" id="air.uml2.LifelineStyle"> + <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW" id="air.uml2.LifelineStyle"> <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> </nodeMappings> - <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%message%>" semanticElements="<%current + sendEvent + receiveEvent%>" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="<%receiveEvent.covered%>" sourceFinderExpression="<%sendEvent.covered%>" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.message" semanticElements="aql:OrderedSet{self , self.sendEvent , self.receiveEvent}" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="aql:self.receiveEvent.covered" sourceFinderExpression="aql:self.sendEvent.covered" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> + <style routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </edgeMappings> @@ -1028,25 +1035,25 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Message" referenceName="message"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Message"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:source"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1055,10 +1062,10 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="BehaviorExecutionSpecification" referenceName="fragment"/> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%($containerView + $containerView.ancestor)[target.filter("Lifeline").nSize() > 0].target%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="<%eContainer("Interaction").fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.ancestors()->including(containerView)->select( e | e.target.oclIsKdinfOf(uml::Lifeline)).target"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="aql:self.eContainerOrSelf(interactions::Interaction).fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1070,17 +1077,17 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Diagrams to show instances and relation between them." name="Object Diagram" domainClass="Package"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <defaultLayer name="Object Diagram"> - <edgeMappings name="OD_Slot" semanticCandidatesExpression="<%packagedElement.filter("InstanceSpecification").slot[value.filter("InstanceValue")]%>" semanticElements="<%current + definingFeature%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="<%value.filter("InstanceValue").instance%>" sourceFinderExpression="<%owningInstance%>" domainClass="Slot" useDomainElement="true"> - <style sizeComputationExpression="<%1%>"> + <edgeMappings name="OD_Slot" semanticCandidatesExpression="aql:self.packagedElement->filter(uml::InstanceSpecification).slot->select( e | e.value->filter(InstanceValue)->size() > 0)" semanticElements="aql:Sequence{self} + Sequence{self.definingFeature}" sourceMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis']/@ownedRepresentations[name='Object%20Diagram']/@defaultLayer/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="aql:self.value->filter(uml::InstanceValue).instance" sourceFinderExpression="aql:self.owningInstance" domainClass="Slot" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> - <centerLabelStyleDescription labelExpression="<%definingFeature.name%>"> + <centerLabelStyleDescription labelExpression="aql:self.definingFeature.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="<%packagedElement%>" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> - <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%slot[!values.filter("InstanceValue")]%>" domainClass="Slot"/> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelExpression="<%name%> : <%classifier.nGet(0).name%>"> + <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="aql:self.packagedElement" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> + <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.slot->select( e | e.values->filter(uml::InstanceValue)->size() = 0)" domainClass="Slot"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + ' : ' + self.classifier->first().name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -1100,7 +1107,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="InstanceSpecification" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="InstanceSpecification<%eContainer.packagedElement.filter("InstanceSpecification").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'InstanceSpecification' + self.eContainer().packagedElement->filter(uml::InstanceSpecification)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/bendpointStability2/bendpointsStability2.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/bendpointStability2/bendpointsStability2.odesign index 58856f3ced..eb795e509f 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/bendpointStability2/bendpointsStability2.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/reconnect/bendpointStability2/bendpointsStability2.odesign @@ -1,5 +1,5 @@ <?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" version="8.1.0"> +<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="10.1.3.201511131800"> <ownedViewpoints name="bendpointsStabilityViewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="bendpointsStabilityDiag" domainClass="EPackage"> <defaultLayer name="Default"> @@ -61,7 +61,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="LinkClass" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="LinkClass" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -86,15 +86,15 @@ </style> </edgeMappings> <containerMappings name="SuperContainer" semanticCandidatesExpression="[eSubpackages.eSuperPackage/]" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']"> - <subContainerMappings name="PackageContainer_2" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="PackageContainer_2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='bendpointsStabilityViewpoint']/@ownedRepresentations[name='bendpointsStabilityDiag']/@defaultLayer/@nodeMappings[name='ClassBorderedNode']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -103,14 +103,14 @@ </containerMappings> <containerMappings name="SuperContainer2" semanticCandidatesExpression="[self/]" domainClass="EPackage"> <subContainerMappings name="Package_List" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -118,7 +118,7 @@ </style> </containerMappings> <containerMappings name="SuperContainer3" semanticCandidatesExpression="[eSubpackages.eSuperPackage/]" domainClass="EPackage" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1950/VP-1950.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1950/VP-1950.odesign index d13f1c8324..ed0015c43c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1950/VP-1950.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1950/VP-1950.odesign @@ -1,19 +1,19 @@ <?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" 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="vp_1950" version="8.0.0"> +<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="vp_1950" version="10.1.3.201511131800"> <ownedViewpoints name="vp_1950" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP_1950_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> - <nodeMappings name="Nodes" deletionDescription="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='d1']" semanticCandidatesExpression="<%eAllContents("EClass")%>" domainClass="EClass"> + <nodeMappings name="Nodes" deletionDescription="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='d1']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)" domainClass="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" deletionDescription="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='d2']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" targetMapping="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" deletionDescription="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='d2']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" targetMapping="//@ownedViewpoints[name='vp_1950']/@ownedRepresentations[name='VP_1950_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -24,7 +24,7 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="eClassifiers" elementExpression="var:element"/> </firstModelOperations> </initialOperation> @@ -34,7 +34,7 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="eStructuralFeatures" elementExpression="var:element"/> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1966/VP-1966.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1966/VP-1966.odesign index 874849a014..428d79e8d2 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1966/VP-1966.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-1966/VP-1966.odesign @@ -1,5 +1,5 @@ <?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" 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="vp_1966" version="8.0.0"> +<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="vp_1966" version="10.1.3.201511131800"> <ownedViewpoints name="vp_1966" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP_1966_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> @@ -11,8 +11,8 @@ </style> </nodeMappings> <nodeMappings name="AbstractNodes" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty() and c.abstract)" domainClass="EClass"> - <borderedNodeMappings name="AttributeNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMapping" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <borderedNodeMappings name="AttributeNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMapping" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <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']"/> @@ -31,18 +31,18 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetMapping="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetMapping="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMapping'] //@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageCompartmentContainerMapping" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> - <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eClassifiers%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures%>" domainClass="EAttribute"> + <containerMappings name="PackageCompartmentContainerMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='vp_1966']/@ownedRepresentations[name='VP_1966_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> + <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -55,14 +55,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -70,8 +70,8 @@ </style> </containerMappings> <containerMappings name="EClassListContainerMapping" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty())" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="AttributeNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMapping" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <subNodeMappings name="AttributeNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMapping" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <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']"/> @@ -84,7 +84,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -105,7 +105,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedDiagramElements" elementExpression="var:elementView"/> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-3535/VP-3535.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-3535/VP-3535.odesign index abd2203524..538de45218 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-3535/VP-3535.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/VP-3535/VP-3535.odesign @@ -1,5 +1,5 @@ <?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" name="VP-3535" version="8.0.0"> +<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="VP-3535" version="10.1.3.201511131800"> <ownedViewpoints name="VP-3535_Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3535_Diagram" domainClass="ecore.EPackage"> <defaultLayer name="Default"> @@ -49,18 +49,18 @@ <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="[name+'WithGaugeStyle'/]" iconPath="/DesignerTestProject/image.bmp" 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']"/> - <sections maxValueExpression="<%90%>" valueExpression="<%50%>" label="FirstSection"> + <sections maxValueExpression="90" valueExpression="50" label="FirstSection"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </sections> - <sections maxValueExpression="<%30%>" valueExpression="<%15%>" label="SecondSection"> + <sections maxValueExpression="30" valueExpression="15" label="SecondSection"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </sections> </style> </nodeMappings> <nodeMappings name="EClassNodeWithWorkspaceImageStyle" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass"> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" sizeComputationExpression="-1" resizeKind="NSEW" workspacePath="/DesignerTestProject/image.bmp"> + <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" sizeComputationExpression="-1" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/DesignerTestProject/image.bmp"> <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> @@ -68,7 +68,7 @@ </defaultLayer> <additionalLayers name="layerOfContainerStyles"> <containerMappings name="EPackageWithFlatContainerStyle" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="[name+'WithFlatContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="[name+'WithFlatContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -76,14 +76,14 @@ </style> </containerMappings> <containerMappings name="EPackageWithShapeContainerStyle" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage"> - <style xsi:type="style:ShapeContainerStyleDescription" labelExpression="[name+'WithShapeContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="[name+'WithShapeContainerStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> <containerMappings name="EPackageWithWorkspaceImageDescription" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage"> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" labelPosition="node" workspacePath="/DesignerTestProject/image.bmp"> + <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="1" labelExpression="[name+'WithWorkspaceImageStyle'/]" iconPath="/DesignerTestProject/image.bmp" labelAlignment="LEFT" labelPosition="node" arcWidth="1" arcHeight="1" workspacePath="/DesignerTestProject/image.bmp"> <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> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/edgeRefreshAfterViewCreation.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/edgeRefreshAfterViewCreation.odesign index 18c17118a1..33d771e7c7 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/edgeRefreshAfterViewCreation.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/edgeRefreshAfterViewCreation.odesign @@ -1,33 +1,33 @@ <?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" 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" documentation="Ticket #2026 et #2253
" name="EdgeRefreshAfterViewCreation" version="8.1.0"> +<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" documentation="Ticket #2026 et #2253
" name="EdgeRefreshAfterViewCreation" version="10.1.3.201511131800"> <ownedViewpoints documentation="Ticket #2026" name="Test case for ticket #2026" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2026_Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style> + <edgeMappings name="Reference" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetMapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="ContainerPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> - <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="ContainerPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> + <borderedNodeMappings name="BorderClass2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="1" height="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <subContainerMappings name="Child Container" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="Child Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedBorderedNodeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']/@borderedNodeMappings[name='BorderClass2']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -35,7 +35,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="<%$preSource.filter("EPackage").nSize() == 1 && $preTarget.filter("EPackage").nSize() == 1%>" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@edgeMappings[name='Reference']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" name="TestNewRef" precondition="aql:preSource.oclIsKindOf(ecore::EPackage) and preTarget.oclIsKindOf(ecore::EPackage)" edgeMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@edgeMappings[name='Reference']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -49,7 +49,7 @@ <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sourceClass"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetClass"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -76,14 +76,14 @@ </ownedTools> <ownedTools xsi:type="tool:ContainerCreationDescription" name="Create Packages" forceRefresh="true" containerMappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']"> <variable name="container"> - <subVariables xsi:type="tool_1:SelectModelElementVariable" name="elements" candidatesExpression="<%eAllContents("EPackage")%>" multiple="true" message="Pick the good one..."/> + <subVariables xsi:type="tool_1:SelectModelElementVariable" name="elements" candidatesExpression="aql:self.eAllContents(ecore::EPackage)" multiple="true" message="Pick the good one..."/> </variable> <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:containerView"> - <subModelOperations xsi:type="tool_1:For" expression="<%$elements%>"> + <subModelOperations xsi:type="tool_1:For" expression="aql:elements"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:i"> - <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']" containerViewExpression="<%$containerView%>"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%232026']/@ownedRepresentations[name='TC2026_Container']/@defaultLayer/@containerMappings[name='ContainerPackage']" containerViewExpression="aql:containerView"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -110,8 +110,8 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNode']/@defaultLayer/@nodeMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,7 +119,7 @@ </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -131,7 +131,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -146,8 +146,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnNodeInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnNodeInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subNodeMappings[name='EPackageNode']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -169,7 +169,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -177,7 +177,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this container"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this container"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -189,7 +189,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -211,8 +211,8 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Node']/@defaultLayer/@nodeMappings[name='EClassNode']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -220,7 +220,7 @@ </style> </edgeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -235,8 +235,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-NodeInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@containerMappings[name='EPackage4']/@subNodeMappings[name='EClass4']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -244,14 +244,14 @@ </style> </edgeMappings> <containerMappings name="EPackage4" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-NodeInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20class']"> - <subNodeMappings name="EClass4" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EClass"> + <subNodeMappings name="EClass4" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -259,7 +259,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -271,7 +271,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -281,7 +281,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="<%eAllContents.filter("EClass")%>" selectedValuesMessage="Selected classes to add in this package"> + <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" selectedValuesMessage="Selected classes to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -303,8 +303,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-Container']/@defaultLayer/@containerMappings[name='EClassContainer']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -312,7 +312,7 @@ </style> </edgeMappings> <containerMappings name="EClassContainer" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_chocolate']"/> @@ -320,7 +320,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -335,8 +335,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@containerMappings[name='EPackage5']/@subContainerMappings[name='EClass5']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -344,15 +344,15 @@ </style> </edgeMappings> <containerMappings name="EPackage5" semanticCandidatesExpression="feature:eContents" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerInContainer']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20class']"> - <subContainerMappings name="EClass5" semanticCandidatesExpression="<%eAllContents()%>" createElements="false" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="EClass5" semanticCandidatesExpression="aql:self.eAllContents()" createElements="false" domainClass="EClass"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -360,7 +360,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -372,7 +372,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -382,7 +382,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="<%eAllContents.filter("EClass")%>" selectedValuesMessage="Selected classes to add in this package"> + <ownedTools xsi:type="tool_1:PaneBasedSelectionWizardDescription" name="InsertClassPane" label="Class insertion Pane" windowTitle="Pane Based Selection Wizard" choiceOfValuesMessage="Select the classes to add in this package" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" selectedValuesMessage="Selected classes to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -404,8 +404,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerList" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerList']/@defaultLayer/@containerMappings[name='EClassContainerList']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -413,7 +413,7 @@ </style> </edgeMappings> <containerMappings name="EClassContainerList" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_chocolate']"/> @@ -421,7 +421,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -436,8 +436,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-ContainerListInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-ContainerListInContainer']/@defaultLayer/@containerMappings[name='EPackage6']/@subContainerMappings[name='EClass6List']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -445,15 +445,15 @@ </style> </edgeMappings> <containerMappings name="EPackage6" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> - <subContainerMappings name="EClass6List" semanticCandidatesExpression="<%eAllContents()%>" createElements="false" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings name="EClass6List" semanticCandidatesExpression="aql:self.eAllContents()" createElements="false" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -461,7 +461,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -473,7 +473,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -488,8 +488,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainer']/@defaultLayer/@containerMappings[name='EPackage']/@borderedNodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -504,7 +504,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -512,7 +512,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this diagram"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this diagram"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -524,7 +524,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -539,8 +539,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi2253-borderedNodeOnContainerInContainer" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="<%eSuperTypes%>"> - <style> + <edgeMappings name="superType" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetMapping="//@ownedViewpoints[name='doremi2253']/@ownedRepresentations[name='doremi2253-borderedNodeOnContainerInContainer']/@defaultLayer/@containerMappings[name='EPackageContainer']/@subContainerMappings[name='EPackageContainerInContainer']/@borderedNodeMappings[name='EClass2']" targetFinderExpression="aql:self.eSuperTypes"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -556,14 +556,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -571,7 +571,7 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="<%eAllContents.filter("EPackage")%>" multiple="true" message="Select the package to add in this container"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertPackage" label="Package insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EPackage)" multiple="true" message="Select the package to add in this container"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -583,7 +583,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="<%eAllContents.filter("EClass")%>" multiple="true" message="Select the class to add in this package"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="InsertClass" label="Class insertion" candidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)" multiple="true" message="Select the class to add in this package"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/labelAlignment/VP-2033.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/labelAlignment/VP-2033.odesign index 129f30c376..06708af4f4 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/labelAlignment/VP-2033.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/labelAlignment/VP-2033.odesign @@ -1,5 +1,5 @@ <?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" 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="VP-2033" version="8.0.0"> +<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="VP-2033" version="10.1.3.201511131800"> <ownedViewpoints name="VP-2033" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2033_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> @@ -11,8 +11,8 @@ </style> </nodeMappings> <nodeMappings name="AbstractNodes" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty() and c.abstract)" domainClass="EClass"> - <borderedNodeMappings name="AttributeNodeMappingOfAbstractNodes" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfAbstractNodes" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <borderedNodeMappings name="AttributeNodeMappingOfAbstractNodes" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfAbstractNodes" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <style xsi:type="style:DotDescription" 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']"/> @@ -31,7 +31,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']" targetMapping="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']" targetMapping="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -39,9 +39,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage"> - <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eClassifiers%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures%>" domainClass="EAttribute"> + <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage"> + <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription" 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']"/> @@ -54,17 +54,17 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> - <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eClassifiers%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures%>" domainClass="EAttribute"> + <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='VP-2033']/@ownedRepresentations[name='VP-2033_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> + <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription" 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']"/> @@ -77,14 +77,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -92,8 +92,8 @@ </style> </containerMappings> <containerMappings name="EClassListContainerMapping" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty())" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="AttributeNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <subNodeMappings name="AttributeNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <style xsi:type="style:DotDescription" labelAlignment="RIGHT" 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 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -127,7 +127,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedDiagramElements" elementExpression="var:elementView"/> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedBorderedNodes" elementExpression="var:elementView"/> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/resizeKind/VP-2564/VP-2564.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/resizeKind/VP-2564/VP-2564.odesign index c8f781bfb1..7b7958bf49 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/resizeKind/VP-2564/VP-2564.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/resizeKind/VP-2564/VP-2564.odesign @@ -1,5 +1,5 @@ <?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" 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="VP-2564" version="8.0.0"> +<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="VP-2564" version="10.1.3.201511131800"> <ownedViewpoints name="VP-2564" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2564_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> @@ -11,8 +11,8 @@ </style> </nodeMappings> <nodeMappings name="AbstractNodes" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty() and c.abstract)" domainClass="EClass"> - <borderedNodeMappings name="AttributeNodeMappingOfAbstractNodes" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfAbstractNodes" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <borderedNodeMappings name="AttributeNodeMappingOfAbstractNodes" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfAbstractNodes" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <style xsi:type="style:DotDescription" 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']"/> @@ -31,7 +31,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']" targetMapping="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']" targetMapping="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ']/@subContainerMappings[name='SubPackageCompartmentContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingZ'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']/@subNodeMappings[name='AttributeNodeMappingOfEClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='AbstractNodes']/@borderedNodeMappings[name='AttributeNodeMappingOfAbstractNodes']/@borderedNodeMappings[name='EDataTypeBorderedNodeMappingOfAbstractNodes'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping'] //@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EClassAsBorderedNodeMapping']/@borderedNodeMappings[name='EAttributeAsBorderedNodeMapping']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -39,9 +39,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage"> - <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eClassifiers%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures%>" domainClass="EAttribute"> + <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage"> + <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription" 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']"/> @@ -54,17 +54,17 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> - <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eClassifiers%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eStructuralFeatures%>" domainClass="EAttribute"> + <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']" reusedContainerMappings="//@ownedViewpoints[name='VP-2564']/@ownedRepresentations[name='VP-2564_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> + <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="EClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> + <borderedNodeMappings name="EAttributeAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures" domainClass="EAttribute"> <style xsi:type="style:EllipseNodeDescription" 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']"/> @@ -77,14 +77,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -92,8 +92,8 @@ </style> </containerMappings> <containerMappings name="EClassListContainerMapping" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty())" domainClass="EClass" childrenPresentation="List"> - <subNodeMappings name="AttributeNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="<%self.eStructuralFeatures.filter("EAttribute")%>" domainClass="EAttribute"> - <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="<%self.eAttributeType%>" domainClass="EDataType"> + <subNodeMappings name="AttributeNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="aql:self.eStructuralFeatures->filter(ecore::EAttribute)" domainClass="EAttribute"> + <borderedNodeMappings name="EDataTypeBorderedNodeMappingOfEClassListContainerMapping" semanticCandidatesExpression="aql:self.eAttributeType" domainClass="EDataType"> <style xsi:type="style:DotDescription" labelAlignment="RIGHT" 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 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -127,7 +127,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedDiagramElements" elementExpression="var:elementView"/> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedBorderedNodes" elementExpression="var:elementView"/> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/roundedCorner/VP-2700.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/roundedCorner/VP-2700.odesign index fd72c5aff0..b295e2c806 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/roundedCorner/VP-2700.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/refresh/roundedCorner/VP-2700.odesign @@ -1,26 +1,26 @@ <?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" 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="VP-2700" version="8.0.0"> +<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="VP-2700" version="10.1.3.201511131800"> <ownedViewpoints name="VP-2700" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2700_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> - <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" labelAlignment="RIGHT"> + <containerMappings name="PackageCompartmentContainerMappingWithEClassAsBorderedNodeMapping" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-2700']/@ownedRepresentations[name='VP-2700_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> - <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" labelAlignment="RIGHT"> + <containerMappings name="PackageCompartmentContainerMappingZ" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-2700']/@ownedRepresentations[name='VP-2700_Diagram']/@defaultLayer/@containerMappings[name='EClassListContainerMapping']"> + <subContainerMappings name="SubPackageCompartmentContainerMapping" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -28,7 +28,7 @@ </style> </containerMappings> <containerMappings name="EClassListContainerMapping" semanticCandidatesExpression="ocl: self.eClassifiers->select(cl : EClassifier | cl.oclIsTypeOf(EClass))->collect(cl : EClassifier | cl.oclAsType(EClass))->select(c : EClass | not c.eStructuralFeatures->isEmpty())" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" labelAlignment="RIGHT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="100" arcHeight="100" borderSizeComputationExpression="1" labelAlignment="RIGHT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -49,7 +49,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.eContainer%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.eContainer()"> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedDiagramElements" elementExpression="var:elementView"/> <subModelOperations xsi:type="tool_1:Unset" featureName="ownedBorderedNodes" elementExpression="var:elementView"/> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/representationGroup/vp-2331/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/representationGroup/vp-2331/ecore.odesign index 9e46816884..1d6bee7177 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/representationGroup/vp-2331/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/representationGroup/vp-2331/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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: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']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name + ' class has more than 3 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +83,38 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +122,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -141,7 +144,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -150,7 +153,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -160,7 +163,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -207,7 +210,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -218,7 +221,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -231,7 +234,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -256,7 +259,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -271,7 +274,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -281,8 +284,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -296,28 +299,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -335,35 +338,35 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -382,19 +385,19 @@ <ownedTools xsi:type="tool_1:DirectEditLabel" name="Edit EAttribute Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" name="EReference Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" documentation="- "name" : change the name of the operation" name="Operation Name" forceRefresh="true"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> </toolSections> @@ -410,8 +413,8 @@ </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -419,7 +422,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -433,12 +436,12 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -449,7 +452,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -458,7 +461,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -473,7 +476,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -485,24 +488,25 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="Classes in <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="10"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="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="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -512,45 +516,46 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EReferenceServices"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Add support for archeypes-based modeling to the Entities modeler." name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -564,15 +569,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -582,15 +587,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -600,15 +605,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -618,15 +623,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -637,9 +642,9 @@ <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.ArchetypeServices"/> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representations to assess the quality of an Ecore model." name="Quality" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="Dependencies of package <%name%>" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="aql:'Dependencies of package ' + self.name" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -647,15 +652,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> <containerMappings name="Analyzed Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -674,22 +679,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -700,23 +705,25 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="Relations for class <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="aql:'Relations for class ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -735,15 +742,15 @@ </toolSections> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -751,7 +758,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -759,15 +766,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -777,15 +784,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="<%eAllStructuralFeatures.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eType%>" sourceFinderExpression="<%eContainer("EClass")%>" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eType" sourceFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -793,7 +800,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -801,15 +808,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -819,9 +826,9 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="Type hierarchy of <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="aql:'Type hierarchy of ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -829,7 +836,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -839,36 +846,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -891,8 +900,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -901,19 +911,19 @@ </ownedRepresentationExtensions> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representation to document and review Ecore models." name="Review" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="Documentation for <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="aql:'Documentation for ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -930,19 +940,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -953,21 +963,21 @@ </ownedViewpoints> <ownedViewpoints endUserDocumentation="Adds support for EMF GenModel configuration." name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </backgroundConditionalStyle> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Category" headerLabelExpression="Category" canEdit="<%self.filter("GenFeature")%>" featureName="propertyCategory" labelExpression="<%if (self.filter("GenFeature")){%><%self.propertyCategory%><%}else{%><%""%><%}%>"/> - <ownedColumnMappings name="Decription" headerLabelExpression="Description" canEdit="<%self.filter("GenFeature")%>" featureName="propertyDescription" labelExpression="<%if (self.filter("GenFeature")){%><%self.propertyDescription%><%}else{%><%""%><%}%>"/> + <ownedColumnMappings name="Category" headerLabelExpression="Category" canEdit="aql:self->filter(genmodel::GenFeature)" featureName="propertyCategory" labelExpression="aql:if self.oclIsKindOf(genmodel::GenFeature) then self.propertyCategory else '' endif"/> + <ownedColumnMappings name="Decription" headerLabelExpression="Description" canEdit="aql:self->filter(genmodel::GenFeature)" featureName="propertyDescription" labelExpression="aql:if self.oclIsKindOf(genmodel::GenFeature) then self.propertyDescription else '' endif"/> </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/routing/change_routing_style/My.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/routing/change_routing_style/My.odesign index 444f00d7c3..eb1b8ee38c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/routing/change_routing_style/My.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/routing/change_routing_style/My.odesign @@ -1,41 +1,42 @@ <?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" 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="Ecore Editing Workbench V4.6" version="8.0.0"> +<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="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="<html>
<head>
</head>
<body>
<p>Provides graphical and tabular representation to design an Ecore model.</p>
<br>
<img src="/doc/screenshots/entities.png"/>
<img src="/doc/screenshots/classes.png"/>
</body>
</html>


" name="ChangeRoutingStyleOnReconnect" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@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" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@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" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEReference']"> + <style routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -43,7 +44,7 @@ </conditionnalStyles> </containerMappings> <toolSections name="Relation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -57,7 +58,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -72,28 +73,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -106,8 +107,8 @@ </toolSections> </defaultLayer> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -115,7 +116,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -129,12 +130,12 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -145,7 +146,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" precondition="<%true%>" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" precondition="aql:true" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -154,7 +155,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EPackage into EPackage" precondition="<%true%>" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EPackage into EPackage" precondition="aql:true" mappings="//@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='ChangeRoutingStyleOnReconnect']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/selection/duplication/doremi-2440_nodes.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/selection/duplication/doremi-2440_nodes.odesign index f1c75d124b..82fabf3a1b 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/selection/duplication/doremi-2440_nodes.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/selection/duplication/doremi-2440_nodes.odesign @@ -1,8 +1,8 @@ <?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" version="8.0.0"> +<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="10.1.3.201511131800"> <ownedViewpoints name="Nodes"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Nodes" domainClass="EPackage"> - <nodeMappings name="Node" label="Node" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="Node" label="Node" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:EllipseNodeDescription"> <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/sequence/message_extension/message-extension.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/message_extension/message-extension.odesign index 903ad72465..e899a34d44 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/message_extension/message-extension.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/message_extension/message-extension.odesign @@ -1,17 +1,17 @@ <?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/diagram/sequence/description/2.0.0" name="Group" version="8.0.0"> +<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/diagram/sequence/description/2.0.0" name="Group" version="10.1.3.201511131800"> <ownedViewpoints name="Scenario Etendus"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="message-extension" viewpointURI="viewpoint:/org.eclipse.sirius.sample.interactions.design/Interactions" representationName="Sequence Diagram on Interaction"> <layers name="Extension Scenario"> <edgeMappingImports name="extendedMapping"> <importedMapping xsi:type="description_2:BasicMessageMapping" href="platform:/plugin/org.eclipse.sirius.sample.interactions.design/description/interaction.odesign#//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@edgeMappings[name='Call%20Message']"/> <conditionnalStyles predicateExpression="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <beginLabelStyleDescription labelSize="6" showIcon="false" labelExpression="begin"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelExpression="<%name%>_extended"> + <centerLabelStyleDescription labelExpression="aql:self.name + '_extended'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </centerLabelStyleDescription> <endLabelStyleDescription labelSize="6" showIcon="false" labelExpression="end"> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign index 4945c38b4b..f20a642348 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/sequence/vp-1546/interactionVP1546.odesign @@ -1,26 +1,26 @@ <?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/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Interaction" version="8.0.0"> +<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/sequence/description/2.0.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="Interaction" version="10.1.3.201511131800"> <ownedViewpoints name="Interactions-VP-1546" label="Interactions" modelFileExtension="interactions"> - <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" name="Sequence Diagram Example with Combined Fragments Support" label="Sequence Diagram with Combined Fragments" titleExpression="Sequence Diagram with Combined Fragments on <%name%>" domainClass="interactions.Interaction" endsOrdering="<%ends%>"> + <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" name="Sequence Diagram Example with Combined Fragments Support" label="Sequence Diagram with Combined Fragments" titleExpression="aql:'Sequence Diagram with Combined Fragments on ' + self.name" domainClass="interactions.Interaction" endsOrdering="aql:self.ends"> <defaultLayer name="Default"> - <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" semanticCandidatesExpression="<%participants%>" semanticElements="var:self" domainClass="interactions.Participant"> + <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" semanticCandidatesExpression="aql:self.participants" semanticElements="var:self" domainClass="interactions.Participant"> <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self"> - <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" semanticCandidatesExpression="<%currentParticipant.getDirectEventsOn(self)%>" semanticElements="<%self + start + end + currentParticipant%>" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%end%>"> + <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" semanticCandidatesExpression="aql:currentParticipant().getDirectEventsOn(self)" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end"> <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="" labelAlignment="LEFT" resizeKind="NORTH_SOUTH" width="2" height="5" color="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </borderedNodeMappings> - <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" semanticCandidatesExpression="<%currentParticipant.getDirectEventsOn(self)%>" semanticElements="<%self + start + end + currentParticipant%>" domainClass="interactions.State" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%end%>"> + <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" semanticCandidatesExpression="aql:currentParticipant().getDirectEventsOn(self)" semanticElements="aql:OrderedSet{self}->including(self.start)->including(self.end)->including(self.currentParticipant())" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end"> <style xsi:type="style:EllipseNodeDescription" borderColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']" labelSize="15" showIcon="false" labelColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']" labelAlignment="LEFT" labelPosition="node" resizeKind="NORTH_SOUTH" color="//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"/> </borderedNodeMappings> - <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="<%eContainer("Interaction").messages.filter("DestroyParticipantMessage").receivingEnd[context == current("Participant")]%>" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant"> - <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" labelAlignment="LEFT" sizeComputationExpression="5" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.png"> + <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="EOL" preconditionExpression="aql:self.eContainerOrSelf(interactions::Interaction).messages->filter(interactions::DestroyParticipantMessage).receivingEnd->select( e | e.context = self)->size() > 0" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant"> + <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" labelAlignment="LEFT" sizeComputationExpression="5" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.sample.interactions.design/description/eol.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> </borderedNodeMappings> - <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="redimEOL" preconditionExpression="<%eContainer("Interaction").messages.filter("DestroyParticipantMessage").receivingEnd[context == current("Participant")].nSize==0%>" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant"> + <borderedNodeMappings xsi:type="description_1:EndOfLifeMapping" name="redimEOL" preconditionExpression="aql:self.eContainerOrSelf(interactions::Interaction).messages->filter(interactions::DestroyParticipantMessage).receivingEnd->select( e | e.context = self)->size()=0" semanticCandidatesExpression="var:self" semanticElements="var:self" domainClass="interactions.Participant"> <style xsi:type="style:DotDescription" labelExpression="" labelAlignment="LEFT" sizeComputationExpression="1" strokeSizeComputationExpression="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']"/> @@ -33,62 +33,63 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelSize="12" labelFormat="bold" showIcon="false" labelExpression="<%name%> : <%type.name%>" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5"> + <style xsi:type="style:SquareDescription" labelSize="12" showIcon="false" labelExpression="aql:self.name + ' : ' + self.type.name" sizeComputationExpression="" labelPosition="node" resizeKind="NSEW" width="12" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" semanticCandidatesExpression="<%messages%>" semanticElements="<%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="<%getReceivingContext%>" sourceFinderExpression="<%getSendingContext%>" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%name%> (read <%getReceivingContext.currentParticipant.name%>.<%feature.name%>)"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name + ' (read ' + self.getReceivingContext().currentParticipant().name + '.' + self.feature.name + ')'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%isWrite%>"> - <style sizeComputationExpression="<%2%>"> + <conditionnalStyles predicateExpression="aql:self.isWrite"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%name%> (write <%getReceivingContext.currentParticipant.name%>.<%feature.name%>)"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name + ' (write ' + self.getReceivingContext().currentParticipant().name + '.' self.feature.name + ')'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" semanticCandidatesExpression="<%messages%>" semanticElements="<%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="<%getReceivingContext%>" sourceFinderExpression="<%getSendingContext%>" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%name%> (call <%getReceivingContext.currentParticipant.name%>.<%operation.name%>)"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name + ' (call ' + self.getReceivingContext().currentParticipant().name + '.' + self.operation.name + ')'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" semanticCandidatesExpression="<%messages%>" semanticElements="<%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="<%getReceivingContext%>" sourceFinderExpression="<%getSendingContext%>" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:CreationMessageMapping" name="Create Participant Message" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd"> + <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%name%> (new <%receivingEnd.context.name%>)"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.name + ' (new ' + self.receivingEnd.context.name + ')'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" semanticCandidatesExpression="<%messages%>" semanticElements="<%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="<%getReceivingContext%>" sourceFinderExpression="<%getSendingContext%>" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:DestructionMessageMapping" name="Destroy Participant Message" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd"> + <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" semanticCandidatesExpression="<%messages%>" semanticElements="<%self + sendingEnd + receivingEnd + getSendingContext + getReceivingContext%>" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="<%getReceivingContext%>" sourceFinderExpression="<%getSendingContext%>" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>" invocationMessageFinderExpression="<%self.invocationMessage%>"> - <style lineStyle="dot"> + <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" semanticCandidatesExpression="aql:self.messages" semanticElements="aql:self->asOrderedSet()->including(self.sendingEnd)->including(self.receivingEnd)->including(self.getSendingContext())->including(self.getReceivingContext())" sourceMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions-VP-1546']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="aql:self.getReceivingContext()" sourceFinderExpression="aql:self.getSendingContext()" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="aql:self.sendingEnd" receivingEndFinderExpression="aql:self.receivingEnd" invocationMessageFinderExpression="aql:self.invocationMessage"> + <style lineStyle="dot" sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="<%coveredParticipants.nSize > 0%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + interaction%>" domainClass="interactions.InteractionUse" startingEndFinderExpression="<%startingEnd%>" finishingEndFinderExpression="<%finishingEnd%>" coveredLifelinesExpression="<%coveredParticipants%>" centerLabelExpression="call(<%interaction.name%>)"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%type%>" labelAlignment="LEFT"> + <containerMappings xsi:type="description_1:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + Sequence{self.interaction}" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finishingEnd" coveredLifelinesExpression="aql:self.coveredParticipants" centerLabelExpression="aql:'call(' + self.interaction.name + ')'"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.type" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -96,11 +97,11 @@ <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> </style> </containerMappings> - <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="<%coveredParticipants.nSize > 0%>" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self%" domainClass="interactions.CombinedFragment" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%finish%>" coveredLifelinesExpression="<%coveredParticipants%>"> - <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" semanticCandidatesExpression="<%ownedOperands%>" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%getFinishingEnd()%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> + <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="<%operator%>" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> </style> </containerMappings> @@ -130,7 +131,7 @@ <entries xsi:type="description:UserFixedColor" red="166" green="227" blue="187" name="Watery Green"/> <entries xsi:type="description:UserFixedColor" red="186" green="250" blue="158" name="Gentler Spring"/> <entries xsi:type="description:UserFixedColor" red="16" green="120" blue="103" name="Flabber Green"/> - <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="<%computeCombinedFragmentDepth()%>"> + <entries xsi:type="description:InterpolatedColor" name="Interpolated green for Combined Fragments" colorValueComputationExpression="aql:self.computeCombinedFragmentDepth()"> <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']"/> <colorSteps associatedValue="5" associatedColor="//@userColorsPalettes[name='Greens']/@entries[name='Flabber%20Green']"/> </entries> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore.odesign index 9a845190f1..4484884672 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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: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='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@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" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@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" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 3 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name + ' class has more than 3 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%render%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:self.render()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +83,38 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +122,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -141,7 +144,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -150,7 +153,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -160,7 +163,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -207,7 +210,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -218,7 +221,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -231,7 +234,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -256,7 +259,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -271,7 +274,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -281,8 +284,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -296,28 +299,28 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$otherEnd.getTarget()%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:otherEnd.getTarget()"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="var:element"/> </subModelOperations> @@ -335,35 +338,35 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $sourceView%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd == $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = sourceView"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd = edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:element"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $edgeView.targetNode%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> edgeView.targetNode"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$otherEnd != $sourceView%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:otherEnd <> sourceView"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -382,19 +385,19 @@ <ownedTools xsi:type="tool_1:DirectEditLabel" name="Edit EAttribute Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" name="EReference Name"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> <ownedTools xsi:type="tool_1:DirectEditLabel" documentation="- "name" : change the name of the operation" name="Operation Name" forceRefresh="true"> <mask mask="{0}"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%self.performEdit($0)%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.performEdit(arg0)"/> </initialOperation> </ownedTools> </toolSections> @@ -410,24 +413,25 @@ </toolSections> </defaultLayer> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="Classes in <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="10"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="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="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -437,34 +441,35 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Class" domainClass="EClass"> <defaultLayer name="Default"> <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%render%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -474,7 +479,7 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" domainClass="EPackage"> - <subItemMappings name="Tree_Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <subItemMappings name="Tree_Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -483,8 +488,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramImportDescription" name="Import" label="Import" domainClass="EPackage" importedDiagram="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <additionalLayers endUserDocumentation="Add support for sub-packages." name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -492,7 +497,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -506,12 +511,12 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -522,7 +527,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -531,7 +536,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EPackage into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Import']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -546,7 +551,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -569,11 +574,12 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="WithoutSemanticElement" domainClass="EAttribute"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EReferenceServices"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representations to assess the quality of an Ecore model." name="Quality" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="Dependencies of package <%name%>" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" titleExpression="aql:'Dependencies of package ' + self.name" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package'] //@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Analyzed%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -581,15 +587,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='External%20Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> <containerMappings name="Analyzed Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Package%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -608,22 +614,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -634,23 +640,25 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="Relations for class <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Relations" titleExpression="aql:'Relations for class ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -669,15 +677,15 @@ </toolSections> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -685,7 +693,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -693,15 +701,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -711,15 +719,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="<%eAllStructuralFeatures.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eType%>" sourceFinderExpression="<%eContainer("EClass")%>" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eType" sourceFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -727,7 +735,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -735,15 +743,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -753,9 +761,9 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="Type hierarchy of <%name%>" domainClass="EClass"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" titleExpression="aql:'Type hierarchy of ' + self.name" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -763,7 +771,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -773,36 +781,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -825,8 +835,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" reusedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -835,19 +846,19 @@ </ownedRepresentationExtensions> </ownedViewpoints> <ownedViewpoints endUserDocumentation="Provides representation to document and review Ecore models." name="Review" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="Documentation for <%name%> package" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedRepresentations xsi:type="description_2:CrossTableDescription" endUserDocumentation="Document the concepts in a package." name="Documentation" titleExpression="aql:'Documentation for ' + self.name + ' package'" domainClass="EPackage"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -864,19 +875,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -886,7 +897,7 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore_extension.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore_extension.odesign index 99bbd8b8bd..8296e29bed 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore_extension.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/representationCreation/ecore_extension.odesign @@ -1,18 +1,18 @@ <?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" 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="Ecore documentation extension" version="8.0.0"> +<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="Ecore documentation extension" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="Contributes a layer to manage documentation annotations in the Entities modeler." name="Documentation" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities2" viewpointURI="viewpoint:/2237/Design" representationName="Entities2"> <layers endUserDocumentation="Add support for documentation annotations." name="Documentation"> - <nodeMappings name="EC Doc Annotation" labelDirectEdit="//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities2']/@layers[name='Documentation']/@toolSections.0/@ownedTools[name='Edit%20Detail']" semanticCandidatesExpression="<%(eClassifiers.eAnnotations+ eAnnotations).details.filter("EStringToStringMapEntry")[key == "documentation"]%>" domainClass="EStringToStringMapEntry"> - <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="<%value%>" sizeComputationExpression="5" labelPosition="node" resizeKind="NSEW"> + <nodeMappings name="EC Doc Annotation" labelDirectEdit="//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities2']/@layers[name='Documentation']/@toolSections.0/@ownedTools[name='Edit%20Detail']" semanticCandidatesExpression="aql:(self.eClassifiers.eAnnotations+ eAnnotations).details->filter(ecore::EStringToStringMapEntry)->select( e | e.key = 'documentation')" domainClass="EStringToStringMapEntry"> + <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="aql:self.value" sizeComputationExpression="5" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> </nodeMappings> - <edgeMappings name="EC Doc Assignment" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities2']/@layers[name='Documentation']/@nodeMappings[name='EC%20Doc%20Annotation']" targetFinderExpression="<%eContainer("EClass")%>"> + <edgeMappings name="EC Doc Assignment" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities2']/@layers[name='Documentation']/@nodeMappings[name='EC%20Doc%20Annotation']" targetFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)"> <targetMapping xsi:type="description_1:ContainerMapping" href="ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> - <style lineStyle="dot" sizeComputationExpression="1"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -22,9 +22,10 @@ <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List"> <reusedNodeMappings href="ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> <reusedNodeMappings href="ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> - <conditionnalStyles predicateExpression="<%eAnnotations.details.filter("EStringToStringMapEntry")[key == "documentation"].nSize == 0%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.eAnnotations.details->filter(ecore::EStringToStringMapEntry)->select( e | e.key = 'documentation')->size() = 0"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -38,18 +39,18 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%!eAnnotations[source =="http://www.eclipse.org/emf/2002/GenModel"]%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.eAnnotations->select( e | e.source ='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations"> <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eAnnotations[source == "http://www.eclipse.org/emf/2002/GenModel"].nFirst%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%!details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source = 'http://www.eclipse.org/emf/2002/GenModel')->first()"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool_1:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%details[key=="documentation"].nFirst%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.details->select( e | e.key='documentation')->first()"> <subModelOperations xsi:type="tool_1:SetValue" featureName="value" valueExpression="New documentation note"/> </subModelOperations> </subModelOperations> @@ -68,7 +69,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("EAnnotation")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(ecore::EAnnotation)"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="eAnnotations"/> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/vsmChange/diagram.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/vsmChange/diagram.odesign index b419286964..1482f8cd46 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/vsmChange/diagram.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/session/vsmChange/diagram.odesign @@ -1,49 +1,51 @@ <?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="Ecore Editing Workbench V4.6" version="8.0.0"> +<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="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Diagram" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Diagram']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -51,37 +53,39 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="RIGHT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.name " labelAlignment="RIGHT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="<%name%><%if (eParameters.nSize()>0) {%> (<%eParameters.getParameterLabel().sep(", ")%>)<%}%> : <%eType.name%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="aql:self.name + if self.eParameters->size() > 0 then ' (' + self.eParameters().name->sep(',') + ')' else '' endif + ' : '+ self.eType.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="6" labelSize="20" labelFormat="italic" labelExpression="<%name%>TT" labelAlignment="RIGHT" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="6" labelSize="20" labelExpression="aql:self.name + 'TT'" labelAlignment="RIGHT" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -89,15 +93,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/showTypeActionButton/vp-2317/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/showTypeActionButton/vp-2317/ecore.odesign index a120316c18..e1473b7b1c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/showTypeActionButton/vp-2317/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/showTypeActionButton/vp-2317/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +83,39 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="RIGHT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.name " labelAlignment="RIGHT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="<%name%><%if (eParameters.nSize()>0) {%> (<%eParameters.getParameterLabel().sep(", ")%>)<%}%> : <%eType.name%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="aql:self.name + if self.eParameters->size() > 0 then ' (' + self.eParameters().name->sep(',') + ')' else '' endif + ' : '+ self.eType.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="6" labelSize="20" labelFormat="italic" labelExpression="<%name%>TT" labelAlignment="RIGHT" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="6" labelSize="20" labelExpression="aql:self.name + 'TT'" labelAlignment="RIGHT" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +123,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -135,7 +139,7 @@ </style> </containerMappings> <containerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -149,7 +153,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -158,7 +162,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -168,7 +172,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -217,7 +221,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -242,7 +246,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -257,7 +261,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -267,8 +271,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -282,12 +286,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -304,18 +308,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -334,9 +338,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -345,9 +349,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -355,26 +359,26 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getOperationNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%createParameterFromString($0)%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <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']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -388,7 +392,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -397,7 +401,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -410,23 +414,24 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="15" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -436,7 +441,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -446,7 +451,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -459,45 +464,45 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference)->select( e | e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> + <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -505,9 +510,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -520,22 +525,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EEnum")%>" createElements="false" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EEnum)" createElements="false" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -543,15 +549,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EDataType")%>" createElements="false" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EDataType)" createElements="false" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -564,7 +570,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -593,7 +599,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -607,12 +613,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -632,7 +638,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -681,9 +687,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -693,12 +699,12 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -715,12 +721,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -737,18 +743,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -758,8 +764,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Blank Layer Package" activeByDefault="true"> - <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -767,7 +773,7 @@ </style> </containerMappings> <containerMappings name="Blank Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -781,7 +787,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -791,7 +797,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -802,18 +808,20 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultStyle> <conditionalStyles> - <style labelFormat="bold" showIcon="false"> + <style showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </conditionalStyles> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -829,41 +837,42 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" domainClass="EPackage"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -877,15 +886,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -895,15 +904,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -913,15 +922,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -931,15 +940,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -951,7 +960,7 @@ <ownedViewpoints name="Quality" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -959,8 +968,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%self + eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:Sequence{self} + self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -970,22 +979,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1000,19 +1009,21 @@ <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1021,15 +1032,15 @@ </containerMappings> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1037,7 +1048,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1045,15 +1056,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1063,15 +1074,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eType%>" sourceFinderExpression="" domainClass="EReference"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eType" sourceFinderExpression="" domainClass="EReference"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1079,7 +1090,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1087,15 +1098,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1107,7 +1118,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1115,7 +1126,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1125,36 +1136,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1167,8 +1180,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -1178,21 +1192,22 @@ </ownedViewpoints> <ownedViewpoints name="Review" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30"> - <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> - <defaultForeground labelSize="8" labelFormat="bold"> + <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> + <defaultForeground labelSize="8"> + <labelFormat>bold</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultForeground> - <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"/> + <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/> </ownedLineMappings> - <ownedColumnMappings name="Available Tags" headerLabelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="<%getRootContainer.eAnnotations[source=="Tags"].details%>"/> - <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="<%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="TagValues"]%>" domainClass="EAnnotation"> + <ownedColumnMappings name="Available Tags" headerLabelExpression="aql:if self->oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.key" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAnnotations->select( e | e.source='Tags').details"/> + <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="aql:self.eAllContents(EAnnotation)->select( e | e.source='TagValues')" domainClass="EAnnotation"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/> <variables name="root" documentation="The semantic element of the table."/> - <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$0.nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:arg0->size() = 0"> <subModelOperations xsi:type="tool:Unset" featureName="references" elementExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> @@ -1203,29 +1218,29 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="TagValues"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='TagValues')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="TagValues"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> <subModelOperations xsi:type="tool:SetValue" featureName="references" valueExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> <mask mask="{0}"/> </create> </intersection> - <createColumn name="New Tag" forceRefresh="true" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> + <createColumn name="New Tag" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> <variables name="root" documentation="The semantic element of the table."/> <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="<%getRootContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="Tags"].nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='Tags')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eAnnotations[source=="Tags"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source='Tags')"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="NEWTAG"/> </subModelOperations> @@ -1234,18 +1249,18 @@ </createColumn> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -1262,19 +1277,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -1282,12 +1297,13 @@ </create> </intersection> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> @@ -1299,7 +1315,7 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/002/STD-TEST-002.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/002/STD-TEST-002.odesign index 8f75417366..77d402ee15 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/002/STD-TEST-002.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/002/STD-TEST-002.odesign @@ -1,9 +1,9 @@ <?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="STD002Group" version="8.0.0"> +<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="STD002Group" version="10.1.3.201511131800"> <ownedViewpoints name="STD-VP-002" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="STD002-Diag" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="C_EClass" semanticCandidatesExpression="<%getEClassifiers()%>" domainClass="EClass"> + <nodeMappings name="C_EClass" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelExpression="ocl:name"> <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/std/009/STD-TEST-009.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/009/STD-TEST-009.odesign index 5fbaf77e56..bfb14f1529 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/009/STD-TEST-009.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/009/STD-TEST-009.odesign @@ -1,5 +1,5 @@ <?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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="8.0.0"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" documentation="uml2 modeler" name="uml2 modeler" version="10.1.3.201511131800"> <ownedViewpoints documentation="Initialize an UML Analysis" name="UML Analysis workspace" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Fake ViewPointDescription - factorize elements" name="Reused Description" domainClass="Model"> <toolSection documentation="reused tools" name="reused tools"> @@ -25,11 +25,11 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="<%current.ownedBehavior.filter("Interaction").nLast%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Sequence Diagram" browseExpression="aql:self.ownedBehavior->filter(interactions::Interaction)->last()" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interaction" referenceName="ownedBehavior"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer.name%> Interaction <%eContainer.ownedBehavior.filter("Interaction").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainer().name + ' Interaction ' +self.eContainer().ownedBehavior->filter(interactions::Interaction)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -40,8 +40,8 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" documentation="Diagram for Packages" name="Package Diagram" domainClass="Model" preconditionExpression=""> - <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Package")%>" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <containerMappings name="PD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" documentation="Mapping to create packages." domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='PD_D%26D_Package']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -56,14 +56,14 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> </subSections> <subSections name="drag & drop"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="PD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="PD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Diagram']/@containerMappings[name='PD_Package']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -85,14 +85,14 @@ <ownedConcernDescriptions name="Default"/> <ownedConcernDescriptions name="Show Imports" filters="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@filters[name='Hide%20containment']"/> </concerns> - <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="<%eContents().filter("Package")%>" nodeMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']"/> + <layout xsi:type="description_1:OrderedTreeLayout" childrenExpression="aql:self.eContents()->filter(uml::Package)" nodeMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']"/> <nodeMappings name="PH_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@toolSection/@ownedTools[name='StateMachine'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Package"> <style xsi:type="style:BundledImageDescription" labelSize="10" sizeComputationExpression="4"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%eContents.filter("Classifier").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.eContents()->filter(uml::Classifier)->size() > 0"> <style xsi:type="style:BundledImageDescription" labelSize="10"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -101,14 +101,15 @@ </conditionnalStyles> </nodeMappings> <edgeMappings name="PH_Containment" deletionDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@toolSection/@ownedTools[name='Delete%20a%20contained%20in%20edge']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="feature:eContainer"> - <style lineStyle="dash" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style lineStyle="dash" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="<%importedPackage%>" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="PH_Import" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']/@nodeMappings[name='PH_Package']" targetFinderExpression="aql:self.importedPackage" sourceFinderExpression="feature:eContainer" domainClass="PackageImport" useDomainElement="true"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelFormat="bold" showIcon="false"> + <centerLabelStyleDescription showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -119,7 +120,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New package <%eContainer.eContents.filter("Package").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New package ' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -140,7 +141,7 @@ <containerView/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%eContainer("Model")%>" featureName="packagedElement"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:self.eContainerOrSelf(uml::Model)" featureName="packagedElement"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -157,7 +158,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="<%eContainer == null%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="aql:self.eContainer() = null" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Package%20Hierarchy']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -166,46 +167,46 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_Actor']" documentation="Diagram for Use Cases" name="Use Case Diagram" initialisation="true" domainClass="Package"> <nodeMappings name="UCD_Actor" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" documentation="Mapping to create actors" domainClass="Actor"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/Actor.png"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/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> </nodeMappings> - <edgeMappings name="UCD_Association" semanticCandidatesExpression="<%getRootContainer().eAllContents("Association")%>" semanticElements="<%memberEnd + current%>" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%memberEnd.type%>" sourceFinderExpression="<%memberEnd.type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Association" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Association)" semanticElements="aql:OrderedSet{self.memberEnd,self}" documentation="Mapping to create associations between actors and use cases" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.memberEnd.type" sourceFinderExpression="aql:self.memberEnd.type" targetExpression="var:self" domainClass="Association" useDomainElement="true"> + <style targetArrow="NoDecoration" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Extend" semanticCandidatesExpression="<%getRootContainer().eAllContents("Extend")%>" semanticElements="<%current + extension + extendedCase%>" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%extendedCase%>" sourceFinderExpression="<%extension%>" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Extend" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Extend)" semanticElements="aql:OrderedSet{self,self.extension,self.extendedCase}" documentation="Mapping to create Extends" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.extendedCase" sourceFinderExpression="aql:self.extension" targetExpression="var:self" domainClass="Extend" useDomainElement="true" pathExpression=""> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« extend »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="aql:'« extend »'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Include" semanticCandidatesExpression="<%getRootContainer().eAllContents("Include")%>" semanticElements="<%current + includingCase + addition%>" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="<%addition%>" sourceFinderExpression="<%includingCase%>" targetExpression="var:self" domainClass="Include" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="UCD_Include" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Include)" semanticElements="aql:OrderedSet{self ,self.includingCase ,self.addition}" documentation="Mapping to create includes" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']" targetFinderExpression="aql:self.addition" sourceFinderExpression="aql:self.includingCase" targetExpression="var:self" domainClass="Include" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="<%"« include »"%>"> + <centerLabelStyleDescription labelSize="10" showIcon="false" labelExpression="« include »"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="<%getRootContainer().eAllContents("Actor").generalization%>" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="UCD_Generalization" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Actor).generalization" semanticElements="" documentation="Mapping to create generalizations" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="var:self" domainClass="Generalization" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="UCD_Subject" preconditionExpression="<%$container == eContainer()%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> - <subNodeMappings name="UCD_UseCase" preconditionExpression="<%subject.nContains($container)%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%nPut("e").nGet("e").getRootContainer().eAllContents("UseCase")[subject.nContains(current(1))]%>" documentation="Mapping to create Use Cases" domainClass="UseCase"> - <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.png"> + <containerMappings name="UCD_Subject" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" documentation="Display subjects of this diagram." domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='UC_D%26D_UseCase']"> + <subNodeMappings name="UCD_UseCase" preconditionExpression="aql:self.subject->includes(container)" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::UseCase)->select( e | e.subject->includes(self))" documentation="Mapping to create Use Cases" domainClass="UseCase"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" sizeComputationExpression="14" labelPosition="node" resizeKind="NSEW" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/UseCase.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> @@ -213,7 +214,7 @@ </containerMappings> <toolSection name="use case tools"> <subSections name="drag & drop"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="A Drag & Drop tool to add actors" name="UC_D&D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="A Drag & Drop tool to add actors" name="UC_D&D_Actor" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@nodeMappings[name='UCD_Actor']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -222,14 +223,14 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newSemanticContainer"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to drag & drop a use case" name="UC_D&D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to drag & drop a use case" name="UC_D&D_UseCase" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@containerMappings[name='UCD_Subject']/@subNodeMappings[name='UCD_UseCase']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:For" expression="<%current.filter("UseCase")[!subject.nContains($newSemanticContainer)]%>"> + <subModelOperations xsi:type="tool_1:For" expression="aql:current->filter(uml::UseCase)->select( e | not e.subject->includes(newSemanticContainer))"> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:newSemanticContainer"/> </subModelOperations> </firstModelOperations> @@ -243,7 +244,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Actor" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Actor<%eContainer.eContents.filter("Actor").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Actor' + self.eContainer().eContents()->filter(uml::Actor)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -252,9 +253,9 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(uml::Package)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="UseCase" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="UseCase<%eContainer("Package").name%><%eContainer("Package").eContents().filter("UseCase").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'UseCase' + self.eContainerOrSelf(uml::Package).name + self.eContainerOrSelf(uml::Package).eContents()->filter(uml::UseCase)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="subject" valueExpression="var:container"/> </subModelOperations> </firstModelOperations> @@ -266,18 +267,18 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Component" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%eContainer("Package").name%> Subject"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.eContainerOrSelf(Package).name + ' Subject'"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="<%$preSource.filter("Actor").nSize() > 0 && $preTarget.filter("UseCase").nSize() > 0%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Association']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create an Association between an Actor and an Use Case." name="Association" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Association']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> @@ -285,12 +286,12 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Association_<%$source.name%>_to_<%$target.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Association_' + source.name + '_to_' + target.name"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Extend']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Extend" name="Extend" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Extend']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -304,7 +305,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="<%($preSource + $preTarget).filter("UseCase").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Include']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Create an Include" name="Include" precondition="preSource.oclIsKindOf(uml::UseCase) and preTarget.oclIsKindOf(uml::UseCase)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Include']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -318,7 +319,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="<%($preSource + $preTarget).filter("Actor").nSize() == 2%>" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Generalization']"> + <ownedTools xsi:type="tool:EdgeCreationDescription" documentation="Tool to create a Generalization" name="Generalization" precondition="aql:preSource.oclIsKindOf(uml::Actor) and preTarget.oclIsKindOf(uml::Actor)" edgeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Use%20Case%20Diagram']/@edgeMappings[name='UCD_Generalization']"> <sourceVariable name="source"/> <targetVariable name="target"/> <sourceViewVariable name="sourceView"/> @@ -334,113 +335,116 @@ </subSections> </toolSection> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package']" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="<%filter("Model").nSize() > 0%>"> - <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package']" documentation="Description to edit class diagrams" name="Class Diagram" initialisation="true" domainClass="Package" preconditionExpression="aql:self.oclIsKindOf(uml::Model)"> + <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).generalization" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> + <edgeMappings name="CD_Generalization_Interface_To_Interface" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).generalization" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.general" sourceFinderExpression="aql:self.specific" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").interfaceRealization%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%contract%>" sourceFinderExpression="<%implementingClassifier%>" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).interfaceRealization" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.contract" sourceFinderExpression="aql:self.implementingClassifier" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Class").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Class).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="<%filter("InterfaceRealization").nSize == 0%>" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Interface").clientDependency%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="<%client%>" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> - <style lineStyle="dash" sizeComputationExpression="<%1%>"> + <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Interface).clientDependency" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%(eContents.filter("Package") + packageImport.importedPackage).nMinimize%>" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="CD_Package" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram']" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:(self.eContents()->filter(uml::Package) + self.packageImport.importedPackage)->asSet()" documentation="Mapping to create packages" domainClass="Package" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@toolSection/@subSections[name='drag%20%26%20drop']/@ownedTools[name='CD_D%26D_Class']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="<%(filter("Class") + filter("DataType")).nSize() > 0%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType - ownedType.filter("Component")%>" documentation="Mapping to create classes" domainClass="Class"> - <subNodeMappings name="CD_Property" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%name%>" documentation="Mapping to create attributes" domainClass="Property"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%visibility.visibilityToString%> <%name%> : <%type.name%>" sizeComputationExpression="<%2%>"> + <containerMappings name="CD_Class" detailDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Sequence%20Diagram']" preconditionExpression="aql:self.oclIsKindOf(uml::Class) or self.oclIsKindOf(uml::DataType)" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType->asSet() - self.ownedType->filter(uml::Component)" documentation="Mapping to create classes" domainClass="Class"> + <subNodeMappings name="CD_Property" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.name" documentation="Mapping to create attributes" domainClass="Property"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.visibility.visibilityToString() + ' ' + self.name + ' : ' + self.type.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="CD_Operation" preconditionExpression="<%$container == eContainer%>" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedOperation%>" domainClass="Operation"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>(<%parametersToString%>) : <%type.name%>" sizeComputationExpression="2"> + <subNodeMappings name="CD_Operation" preconditionExpression="aql:container = self.eContainer()" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedOperation" domainClass="Operation"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + '(' +self.parametersToString() + ') : ' + self.type.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType%>" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="CD_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType" documentation="Mapping to create interfaces" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedType.filter("Enumeration")%>" semanticElements="" domainClass="Enumeration" childrenPresentation="List"> - <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedLiteral%>" domainClass="EnumerationLiteral"> - <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="<%2%>"> + <containerMappings name="CD_Enumeration" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedType->filter(uml::Enumeration)" semanticElements="" domainClass="Enumeration" childrenPresentation="List"> + <subNodeMappings name="CD_EnumerationLiteral" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedLiteral" domainClass="EnumerationLiteral"> + <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -455,7 +459,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Package" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("Package").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(uml::Package)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -466,7 +470,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Class" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("Class").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(uml::Class)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -477,7 +481,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Interface" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Interface<%eContainer().eContents().filter("Interface").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Interface' + self.eContainer().eContents()->filter(uml::Interface)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -488,7 +492,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Enumeration" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Enumeration<%eContainer.ownedType.filter("Enumeration").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Enumeration' + self.eContainer().ownedType->filter(uml::Enumeration)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -499,7 +503,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedAttribute"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Attribute<%eContainer().eContents().filter("Property").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Attribute' + self.eContainer().eContents()->filter(uml::Property)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -510,7 +514,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Operation" referenceName="ownedOperation"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Operation<%eContainer().eContents().filter("Operation").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Operation' + self.eContainer().eContents()->filter(uml::Operation)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -521,7 +525,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EnumerationLiteral" referenceName="ownedLiteral"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="EnumerationLiteral<%eContainer.ownedLiteral.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'EnumerationLiteral' + self.eContainer().ownedLiteral->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -532,17 +536,17 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Association" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$target.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:target"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name.toL1Case%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLowerFirst()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="var:source"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="<%memberEnd.nGet(0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="aql:self.memberEnd->first()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Association"/> </subModelOperations> </firstModelOperations> @@ -580,7 +584,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Package")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer(ecore::EPackage)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Dependency" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="client" valueExpression="var:source"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="supplier" valueExpression="var:target"/> @@ -590,7 +594,7 @@ </ownedTools> </subSections> <subSections name="wizard"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="<%$containerView.target.filter("Package").nSize() == 1%>" forceRefresh="true" candidatesExpression="<%getRootContainer.eAllContents("Package") - ($containerView.eContainer("ViewPoint").target.eAllContents("Package") + $containerView.target.packageImport.getImportedPackage + $containerView.target.ancestor.filter("Package"))%>" multiple="true"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Imports one or many packages." name="Import Package" precondition="aql:containerView.target->filter(uml::Package)->size() = 1" forceRefresh="true" candidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Package) - (containerView.eContainerOrSelf(ViewPoint).target.eAllContents(uml::Package) + containerView.target.packageImport.getImportedPackage + containerView.target.ancestors()->filter(uml::Package))" multiple="true"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -608,7 +612,7 @@ </ownedTools> </subSections> <subSections name="drag & drop"> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="CD_D&D_Class" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="CD_D&D_Class" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Class']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -619,7 +623,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="CD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"> + <ownedTools xsi:type="tool:ContainerDropDescription" documentation="Tool to Drag & Drop a Package" name="CD_D&D_Package" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Package']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -630,7 +634,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="CD_D&D_Interface" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" moveEdges="true"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="CD_D&D_Interface" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface']" moveEdges="true"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -645,47 +649,48 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='Drop%20Interface%20on%20canvas']" name="Component Diagram" domainClass="Package"> - <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Interface")%>" createElements="false" domainClass="Interface"> - <style xsi:type="style:BundledImageDescription" labelFormat="italic" showIcon="false" shape="dot"> + <nodeMappings name="CO_Interface" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Interface)" createElements="false" domainClass="Interface"> + <style xsi:type="style:BundledImageDescription" showIcon="false" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> + <edgeMappings name="CO_Usage" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="Usage" useDomainElement="true"> <style lineStyle="dot" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="<%supplier%>" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CO_Realization" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface']" targetFinderExpression="aql:self.supplier" sourceFinderExpression="feature:eContainer" domainClass="InterfaceRealization" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_Redefined" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="<%redefinedPort%>" sourceFinderExpression="var:self" domainClass="Port"> - <style lineStyle="dot" sizeComputationExpression="1"> + <edgeMappings name="CO_RedefinedImport" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']/@borderedNodeMappings[name='CO_PortImport']" targetFinderExpression="aql:self.redefinedPort" sourceFinderExpression="var:self" domainClass="Port"> + <style lineStyle="dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='CO_D%26D_Drop_Port']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"> - <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Component)" domainClass="Component" dropDescriptions="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@toolSection/@ownedTools[name='CO_D%26D_Drop_Port']" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']"> + <borderedNodeMappings name="CO_Port" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -693,21 +698,21 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="<%eContainer("Model").eAllContents("Component") - eAllContents("Component")%>" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> - <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Port"> + <containerMappings name="CO_ImportedComponent" semanticCandidatesExpression="aql:self.eContainerOrSelf(uml::Model).eAllContents(uml::Component) - self.eAllContents(uml::Component)" createElements="false" domainClass="Component" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> + <borderedNodeMappings name="CO_PortImport" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Port"> <style xsi:type="style:BundledImageDescription" showIcon="false" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%redefinedPort.nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.redefinedPort->size() > 0"> <style xsi:type="style:BundledImageDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -715,7 +720,7 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -750,7 +755,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -796,51 +801,53 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="CO_D&D_Drop_Port" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="CO_D&D_Drop_Port" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_Component']/@borderedNodeMappings[name='CO_Port']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%newSemanticContainer%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="ownedPort" valueExpression="<%element%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:newSemanticContainer"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="ownedPort" valueExpression="aql:self.element"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="State Machine Diagram" domainClass="StateMachine"> - <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="Transition" useDomainElement="true"> + <edgeMappings name="SM_Transition" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']/@containerMappings[name='SM_Region']/@subNodeMappings[name='SM_State']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="Transition" useDomainElement="true"> <style sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%eContents().nSize > 0%>"> - <style> + <conditionnalStyles predicateExpression="aql:self.eContents()->size() > 0"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelSize="10" labelFormat="italic"> + <centerLabelStyleDescription labelSize="10"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> <containerMappings name="SM_Region" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Region"> - <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%subvertex%>" domainClass="Vertex"> + <subNodeMappings name="SM_State" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.subvertex" domainClass="Vertex"> <style xsi:type="style:BundledImageDescription" labelSize="10" showIcon="false" sizeComputationExpression="4"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> - <conditionnalStyles predicateExpression="<%filter("Pseudostate").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::Pseudostate)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="ring"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%filter("FinalState").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::FinalState)"> <style xsi:type="style:BundledImageDescription" labelSize="10" shape="dot"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -848,8 +855,9 @@ </style> </conditionnalStyles> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -898,7 +906,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Region")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(uml::Region)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Transition" referenceName="transition"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Transition"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="var:source"/> @@ -907,9 +915,9 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="<%eContents.filter("StateMachine").nLast()%>" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" documentation="Create a new StateMachine" name="StateMachine" browseExpression="aql:self.eContents()->filter(uml::StateMachine)->last())" diagramDescription="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='State%20Machine%20Diagram']"> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$containerView.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="StateMachine" referenceName="packagedElement"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New StateMachine"/> </subModelOperations> @@ -921,20 +929,20 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Sequence Diagram" domainClass="Interaction"> - <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="<%lifeline%>" domainClass="Lifeline"> - <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="<%coveredBy%>" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> - <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="<%""%>" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.png"> + <nodeMappings name="SD_Lifeline" semanticCandidatesExpression="aql:self.lifeline" domainClass="Lifeline"> + <borderedNodeMappings name="SD_ExecutionSpecification" semanticCandidatesExpression="aql:self.coveredBy" domainClass="BehaviorExecutionSpecification" reusedBorderedNodeMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']/@borderedNodeMappings[name='SD_ExecutionSpecification']"> + <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="aql:''" sizeComputationExpression="1" labelPosition="node" resizeKind="NORTH_SOUTH" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.swtbot/images/es.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> </borderedNodeMappings> - <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="<%6%>" labelPosition="node" resizeKind="NSEW" id="air.uml2.LifelineStyle"> + <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="6" labelPosition="node" resizeKind="NSEW" id="air.uml2.LifelineStyle"> <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> </nodeMappings> - <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%message%>" semanticElements="<%current + sendEvent + receiveEvent%>" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="<%receiveEvent.covered%>" sourceFinderExpression="<%sendEvent.covered%>" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="SD_Message_Lifeline_To_Lifeline" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:self.message" semanticElements="aql:OrderedSet{self , self.sendEvent , self.receiveEvent}" documentation="Show all messages between two lifelines." sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Sequence%20Diagram']/@nodeMappings[name='SD_Lifeline']" targetFinderExpression="aql:self.receiveEvent.covered" sourceFinderExpression="aql:self.sendEvent.covered" targetExpression="var:self" domainClass="Message" useDomainElement="true" pathExpression=""> + <style routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> @@ -957,25 +965,25 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Message" referenceName="message"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Message"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:source"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="sendEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MessageOccurrenceSpecification" referenceName="fragment"> <subModelOperations xsi:type="tool_1:SetValue" featureName="covered" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="<%$source.eContainer("Interaction").message.nLast%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="aql:source.eContainerOrSelf(interactions::Interaction).message->last()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive event"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%message.nLast%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="<%interaction.fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.message->last()"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="receiveEvent" valueExpression="aql:self.interaction.fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -984,10 +992,10 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="BehaviorExecutionSpecification" referenceName="fragment"/> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%($containerView + $containerView.ancestor)[target.filter("Lifeline").nSize() > 0].target%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="<%eContainer("Interaction").fragment.nLast%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.ancestors()->including(containerView)->select( e | e.target.oclIsKdinfOf(uml::Lifeline)).target"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredBy" valueExpression="aql:self.eContainerOrSelf(interactions::Interaction).fragment->last()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -996,17 +1004,17 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Diagrams to show instances and relation between them." name="Object Diagram" domainClass="Package"> - <edgeMappings name="OD_Slot" semanticCandidatesExpression="<%packagedElement.filter("InstanceSpecification").slot[value.filter("InstanceValue")]%>" semanticElements="<%current + definingFeature%>" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="<%value.filter("InstanceValue").instance%>" sourceFinderExpression="<%owningInstance%>" domainClass="Slot" useDomainElement="true"> - <style sizeComputationExpression="<%1%>"> + <edgeMappings name="OD_Slot" semanticCandidatesExpression="aql:self.packagedElement->filter(uml::InstanceSpecification).slot->select( e | e.value->filter(InstanceValue)->size() > 0)" semanticElements="aql:Sequence{self} + Sequence{self.definingFeature}" sourceMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetMapping="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Object%20Diagram']/@containerMappings[name='OD_InstanceSpecification']" targetFinderExpression="aql:self.value->filter(uml::InstanceValue).instance" sourceFinderExpression="aql:self.owningInstance" domainClass="Slot" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%definingFeature.name%>"> + <centerLabelStyleDescription labelExpression="aql:self.definingFeature.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="<%packagedElement%>" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> - <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%slot[!values.filter("InstanceValue")]%>" domainClass="Slot"/> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelExpression="<%name%> : <%classifier.nGet(0).name%>"> + <containerMappings name="OD_InstanceSpecification" semanticCandidatesExpression="aql:self.packagedElement" semanticElements="" domainClass="InstanceSpecification" childrenPresentation="List"> + <subNodeMappings name="OD_SimpleSlot" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.slot->select( e | e.values->filter(uml::InstanceValue)->size() = 0)" domainClass="Slot"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + ' : ' + self.classifier->first().name"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1026,7 +1034,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="InstanceSpecification" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="InstanceSpecification<%eContainer.packagedElement.filter("InstanceSpecification").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'InstanceSpecification' + self.eContainer().packagedElement->filter(uml::InstanceSpecification)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/011/STD-TEST-011.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/011/STD-TEST-011.odesign index 6b1b46b16e..858a694c69 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/011/STD-TEST-011.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/011/STD-TEST-011.odesign @@ -1,5 +1,5 @@ <?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="TC1852" version="8.0.0"> +<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="TC1852" version="10.1.3.201511131800"> <ownedViewpoints name="Design TC1852" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Nodes Target" domainClass="EPackage"> <defaultLayer name="Default"> @@ -11,7 +11,7 @@ </style> </nodeMappings> <edgeMappings name="NT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Target']/@defaultLayer/@nodeMappings[name='NT%20Package']" targetFinderExpression="feature:eContainer" targetExpression=""> - <style sourceArrow="OutputArrow" targetArrow="Diamond" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style sourceArrow="OutputArrow" targetArrow="Diamond" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -23,7 +23,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Target" domainClass="EPackage"> <defaultLayer name="Default"> <edgeMappings name="CT subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Target']/@defaultLayer/@containerMappings[name='CT%20Package']" targetFinderExpression="feature:eContainer" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="TARGET"> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="TARGET"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -31,7 +31,7 @@ </style> </edgeMappings> <containerMappings name="CT Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -49,8 +49,8 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </nodeMappings> - <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="<%eContents.filter("EPackage")%>" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <edgeMappings name="NS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Nodes%20Source']/@defaultLayer/@nodeMappings[name='NS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression=""> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -61,8 +61,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Package Hierarchy With Containers Source" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="<%eContents.filter("EPackage")%>" targetExpression=""> - <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <edgeMappings name="CS subPackage" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetMapping="//@ownedViewpoints[name='Design%20TC1852']/@ownedRepresentations[name='Package%20Hierarchy%20With%20Containers%20Source']/@defaultLayer/@containerMappings[name='CS%20Package']" targetFinderExpression="aql:self.eContents()->filter(ecore::EPackage)" targetExpression=""> + <style sourceArrow="InputArrow" targetArrow="NoDecoration" routingStyle="tree" foldingStyle="SOURCE"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -70,7 +70,7 @@ </style> </edgeMappings> <containerMappings name="CS Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/047/STD-TEST-047.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/047/STD-TEST-047.odesign index 369962a206..ac980f5933 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/047/STD-TEST-047.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/std/047/STD-TEST-047.odesign @@ -1,9 +1,9 @@ <?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" version="8.0.0"> +<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="10.1.3.201511131800"> <ownedViewpoints name="STD-TEST-047-VIEWPOINT" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="STD-TEST-047-DIAGRAMME" domainClass="EPackage"> <defaultLayer name="Defaut"> - <nodeMappings name="N_Class" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <nodeMappings name="N_Class" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> <style xsi:type="style:SquareDescription" tooltipExpression="Defaut"> <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/style/tc2225.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2225.odesign index c6687680a1..063b8e6c50 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2225.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2225.odesign @@ -1,65 +1,65 @@ <?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="tc2225" version="10.1.0.201507271600"> +<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="tc2225" version="10.1.3.201511131800"> <ownedViewpoints name="Design2225" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities2225" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities2225" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <nodeMappings name="EC Class Node" semanticCandidatesExpression="<%eContents.filter("EClass")%>" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>Node" sizeComputationExpression="6" resizeKind="NSEW"> + <nodeMappings name="EC Class Node" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + 'Node'" sizeComputationExpression="6" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <nodeMappings name="EC Class Node 2" semanticCandidatesExpression="<%eContents.filter("EClass")%>" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%>Node2" sizeComputationExpression="6" resizeKind="NSEW"> + <nodeMappings name="EC Class Node 2" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name + 'Node2'" sizeComputationExpression="6" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> - <nodeMappings name="EC Class Node WithBundleImage" semanticCandidatesExpression="<%eContents.filter("EClass")%>" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20Class%20WithBundleImage']/@subNodeMappings[name='EC%20EAttribute']"> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="<%name%>Node_BI" workspacePath="/DesignerTestProject/missingImage.jpg"> + <nodeMappings name="EC Class Node WithBundleImage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" synchronizationLock="true" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20Class%20WithBundleImage']/@subNodeMappings[name='EC%20EAttribute']"> + <style xsi:type="style:WorkspaceImageDescription" labelExpression="aql:self.name + 'Node_BI'" workspacePath="/DesignerTestProject/missingImage.jpg"> <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> </nodeMappings> - <containerMappings name="EC EClass Liste" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="<%name%>List" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EClass Liste" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20EClass%20']/@subNodeMappings[name='EC%20EAttribute']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + 'List'" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="EC EClass " semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="EC EClass " semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%name%><%$view.eContainer.name%>" resizeKind="NSEW"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:self.name +view.eContainer().name" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="<%name%>Container" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.name + 'Container'" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="EC EClass Liste WithBundleImage" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20Class%20WithBundleImage']/@subNodeMappings[name='EC%20EAttribute']" childrenPresentation="List"> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="<%name%>List_BI" workspacePath="/DesignerTestProject/missingImage.jpg"> + <containerMappings name="EC EClass Liste WithBundleImage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='Design2225']/@ownedRepresentations[name='Entities2225']/@defaultLayer/@containerMappings[name='EC%20Class%20WithBundleImage']/@subNodeMappings[name='EC%20EAttribute']" childrenPresentation="List"> + <style xsi:type="style:WorkspaceImageDescription" labelExpression="aql:self.name + 'List_BI'" workspacePath="/DesignerTestProject/missingImage.jpg"> <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="EC Class WithBundleImage" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="EC Class WithBundleImage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="<%name%><%$view.eContainer.name%>" workspacePath="/DesignerTestProject/missingImage.jpg"> + <style xsi:type="style:WorkspaceImageDescription" labelExpression="aql:self.name +view.eContainer().name" workspacePath="/DesignerTestProject/missingImage.jpg"> <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> </subNodeMappings> - <style xsi:type="style:WorkspaceImageDescription" labelExpression="<%name%>Container_BI" workspacePath="/DesignerTestProject/missingImage.jpg"> + <style xsi:type="style:WorkspaceImageDescription" labelExpression="aql:self.name + 'Container_BI'" workspacePath="/DesignerTestProject/missingImage.jpg"> <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> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2262_2.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2262_2.odesign index c5d6629878..36d22380d0 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2262_2.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/style/tc2262_2.odesign @@ -1,72 +1,72 @@ <?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="description" version="8.0.0"> +<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="description" version="10.1.3.201511131800"> <ownedViewpoints name="bug.test" label="TC2262" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2262" label="tc2262" domainClass="EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default" label="default"> - <nodeMappings name="EAttributeMapping" label="EAttributeMapping" semanticCandidatesExpression="<%eAllContents.filter("EAttribute")%>" domainClass="EAttribute"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <nodeMappings name="EAttributeMapping" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAttribute)" domainClass="EAttribute"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </nodeMappings> - <nodeMappings name="EOperationMapping" label="EOperationMapping" semanticCandidatesExpression="<%eAllContents.filter("EOperation")%>" domainClass="EOperation"> - <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <nodeMappings name="EOperationMapping" label="EOperationMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EOperation)" domainClass="EOperation"> + <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </nodeMappings> - <nodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="<%eAllContents.filter("EReference")%>" domainClass="EReference"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="<%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <nodeMappings name="EReferenceMapping" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EReference)" domainClass="EReference"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </nodeMappings> - <nodeMappings name="EClassNodeMapping" label="EClassMapping" semanticCandidatesExpression="<%eClassifiers.filter("EClass")%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EAttributeMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EOperationMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EReferenceMapping']"> + <nodeMappings name="EClassNodeMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EAttributeMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EOperationMapping'] //@ownedViewpoints[name='bug.test']/@ownedRepresentations[name='tc2262']/@defaultLayer/@nodeMappings[name='EReferenceMapping']"> <style xsi:type="style:SquareDescription" sizeComputationExpression="6"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="<%eClassifiers.filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="<%eAttributes%>" domainClass="EAttribute"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="EAttributeMapping2" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </borderedNodeMappings> - <borderedNodeMappings name="EOperationMapping2" label="EOperationMapping" semanticCandidatesExpression="<%eOperations%>" domainClass="EOperation"> - <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <borderedNodeMappings name="EOperationMapping2" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation"> + <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </borderedNodeMappings> - <borderedNodeMappings name="EReferenceMapping2" label="EReferenceMapping" semanticCandidatesExpression="<%eReferences%>" domainClass="EReference"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="<%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <borderedNodeMappings name="EReferenceMapping2" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </borderedNodeMappings> - <subNodeMappings name="EAttributeMapping3" label="EAttributeMapping" semanticCandidatesExpression="<%eAttributes%>" domainClass="EAttribute"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <subNodeMappings name="EAttributeMapping3" label="EAttributeMapping" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </subNodeMappings> - <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="<%eOperations%>" domainClass="EOperation"> - <style xsi:type="style:WorkspaceImageDescription" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <subNodeMappings name="EOperationMapping3" label="EOperationMapping" semanticCandidatesExpression="aql:self.eOperations" domainClass="EOperation"> + <style xsi:type="style:WorkspaceImageDescription" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </subNodeMappings> - <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="<%eReferences%>" domainClass="EReference"> - <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="<%-1%>" workspacePath="/org.eclipse.sirius.tests.junit/images/es.png"> + <subNodeMappings name="EReferenceMapping3" label="EReferenceMapping" semanticCandidatesExpression="aql:self.eReferences" domainClass="EReference"> + <style xsi:type="style:WorkspaceImageDescription" sizeComputationExpression="-1" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/es.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> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/contextMenuTable/vp-2270/2270.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/contextMenuTable/vp-2270/2270.odesign index 175d4baaeb..3089c23dbe 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/contextMenuTable/vp-2270/2270.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/contextMenuTable/vp-2270/2270.odesign @@ -1,24 +1,25 @@ <?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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2270 Group" version="8.0.0"> +<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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2270 Group" version="10.1.3.201511131800"> <ownedViewpoints name="2270" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Table" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="15" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -28,7 +29,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -38,11 +39,12 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/deleteSeveralLines/vp-2272/2272.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/deleteSeveralLines/vp-2272/2272.odesign index 922e818939..5ee22d21f8 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/deleteSeveralLines/vp-2272/2272.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/deleteSeveralLines/vp-2272/2272.odesign @@ -1,24 +1,25 @@ <?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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2272 Group" version="8.0.0"> +<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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2272 Group" version="10.1.3.201511131800"> <ownedViewpoints name="2272" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Table" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="15" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -28,7 +29,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -38,11 +39,11 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_2:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default" icon=""> - <containerMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> <style xsi:type="style:BundledImageDescription" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -50,22 +51,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -75,23 +77,24 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" reusedTreeItemMappings="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='2272']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> + <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='2272']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='2272']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self"> - <defaultStyle labelExpression="<%name%> Categorie"> + <defaultStyle labelExpression="aql:self.name + ' Categorie'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -105,7 +108,7 @@ <variables name="element" documentation="The currently edited element."/> <variables name="root" documentation="The semantic element corresponding to the current table."/> </delete> - <create name="my create tool"> + <create name="my create tool" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> @@ -131,16 +134,17 @@ <variables name="container" documentation="The semantic element corresponding to the view container."/> </create> </subItemMappings> - <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>"> + <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/selectionOnCreation/428545.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/selectionOnCreation/428545.odesign index 29db98f45f..af262be300 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/selectionOnCreation/428545.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/selectionOnCreation/428545.odesign @@ -1,18 +1,18 @@ <?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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.0.201507271600"> +<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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Classes" domainClass="EPackage"> <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="feature:eClassifiers"> <ownedSubLines name="Feature" domainClass="EStructuralFeature" semanticCandidatesExpression="feature:eStructuralFeatures"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="feature:eSubpackages" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="feature:eSubpackages" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="feature:eClassifiers"> <ownedSubLines name="Feature" domainClass="EStructuralFeature" semanticCandidatesExpression="feature:eStructuralFeatures"/> </ownedSubLines> - <ownedSubLines name="Package" domainClass="EPackage" semanticCandidatesExpression="feature:eSubpackages" headerLabelExpression="<%name%>"> + <ownedSubLines name="Package" domainClass="EPackage" semanticCandidatesExpression="feature:eSubpackages" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> @@ -41,7 +41,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/setPropertyTable/vp-1896/1896.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/setPropertyTable/vp-1896/1896.odesign index fdea3de253..5d2851f2ba 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/setPropertyTable/vp-1896/1896.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/table/setPropertyTable/vp-1896/1896.odesign @@ -1,10 +1,11 @@ <?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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-1896 Group" version="8.0.0"> +<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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-1896 Group" version="10.1.3.201511131800"> <ownedViewpoints name="1896" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Table" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <foregroundConditionalStyle predicateExpression="feature:abstract"> - <style labelSize="15" labelFormat="italic"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> @@ -14,11 +15,11 @@ <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -28,7 +29,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Table']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -38,11 +39,11 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_2:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default" icon=""> - <containerMappings name="EC EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> <style xsi:type="style:BundledImageDescription" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -50,22 +51,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + eParameters%>" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="<%render%>" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <subNodeMappings name="Operation" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + self.eParameters" domainClass="EOperation"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelExpression="aql:self.render()" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> <conditionnalStyles predicateExpression="feature:abstract"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -75,23 +77,24 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" reusedTreeItemMappings="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='1896']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> + <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='1896']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='1896']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self"> - <defaultStyle labelExpression="<%name%> Categorie"> + <defaultStyle labelExpression="aql:self.name + ' Categorie'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -105,7 +108,7 @@ <variables name="element" documentation="The currently edited element."/> <variables name="root" documentation="The semantic element corresponding to the current table."/> </delete> - <create name="my create tool"> + <create name="my create tool" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> @@ -131,16 +134,17 @@ <variables name="container" documentation="The semantic element corresponding to the view container."/> </create> </subItemMappings> - <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>"> + <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tc-2185_edge_creation_position/description/tc-2185.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tc-2185_edge_creation_position/description/tc-2185.odesign index 5c7a49076d..042c126315 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tc-2185_edge_creation_position/description/tc-2185.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tc-2185_edge_creation_position/description/tc-2185.odesign @@ -1,17 +1,17 @@ <?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" 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="TC2185" version="10.1.0.201507101000"> +<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="TC2185" version="10.1.3.201511131800"> <ownedViewpoints name="TC2185" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 Node" domainClass="EPackage"> <defaultLayer name="Default"> <nodeMappings name="NM_EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="Node_BNM_EClass_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Node_BNM_EClass_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="Node_BNM_EClass_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Node_BNM_EClass_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -24,12 +24,12 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Node_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Node_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Node_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']/@borderedNodeMappings[name='Node_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']/@borderedNodeMappings[name='Node_BNM_EClass_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Node_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']/@borderedNodeMappings[name='Node_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node']/@defaultLayer/@nodeMappings[name='NM_EClass']/@borderedNodeMappings[name='Node_BNM_EClass_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -67,25 +67,25 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Container_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Container_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Container_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']/@borderedNodeMappings[name='Container_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']/@borderedNodeMappings[name='Container_BNM_EClass_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Container_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']/@borderedNodeMappings[name='Container_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container']/@defaultLayer/@containerMappings[name='CM_EClass']/@borderedNodeMappings[name='Container_BNM_EClass_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="CM_EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="Container_BNM_EClass_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Container_BNM_EClass_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="Container_BNM_EClass_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Container_BNM_EClass_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -132,25 +132,25 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 List" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="List_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="List_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']/@borderedNodeMappings[name='List_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']/@borderedNodeMappings[name='List_BNM_EClass_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="List_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']/@borderedNodeMappings[name='List_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20List']/@defaultLayer/@containerMappings[name='List_LM_EClass']/@borderedNodeMappings[name='List_BNM_EClass_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="List_LM_EClass" semanticCandidatesExpression="feature:eContents" domainClass="EClass" childrenPresentation="List"> - <borderedNodeMappings name="List_BNM_EClass_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="List_BNM_EClass_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="List_BNM_EClass_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="List_BNM_EClass_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -197,26 +197,26 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 Container in Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="CIC_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="CIC_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="CIC_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']/@borderedNodeMappings[name='CIC_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']/@borderedNodeMappings[name='CIC_BNM_EClass_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="CIC_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']/@borderedNodeMappings[name='CIC_BNM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Container%20in%20Container']/@defaultLayer/@containerMappings[name='CIC_CM_EPackage']/@subContainerMappings[name='CIC_CM_EClass_in_pkg']/@borderedNodeMappings[name='CIC_BNM_EClass_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="CIC_CM_EPackage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <subContainerMappings name="CIC_CM_EClass_in_pkg" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="CIC_BNM_EClass_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="CIC_BNM_EClass_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="CIC_BNM_EClass_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="CIC_BNM_EClass_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -270,26 +270,26 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 Node in Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="NIC_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="NIC_EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="NIC_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']/@borderedNodeMappings[name='NIC_NM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']/@borderedNodeMappings[name='NIC_NM_EClass_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="NIC_EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']/@borderedNodeMappings[name='NIC_NM_EClass_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Node%20in%20Container']/@defaultLayer/@containerMappings[name='NIC_CM_EPackage']/@subNodeMappings[name='NIC_NM_Class']/@borderedNodeMappings[name='NIC_NM_EClass_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="NIC_CM_EPackage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <subNodeMappings name="NIC_NM_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="NIC_NM_EClass_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NIC_NM_EClass_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="NIC_NM_EClass_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NIC_NM_EClass_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -342,26 +342,26 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC2185 Bordered Node on Container" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EM_Supertype" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']/@borderedNodeMappings[name='NM_Class_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']/@borderedNodeMappings[name='NM_Class_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EM_SupertypeBn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']/@borderedNodeMappings[name='NM_Class_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Container']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='NM_Class']/@borderedNodeMappings[name='NM_Class_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="CM_EPackage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <borderedNodeMappings name="NM_Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="NM_Class_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NM_Class_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="NM_Class_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NM_Class_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -416,14 +416,14 @@ <defaultLayer name="Default"> <nodeMappings name="NM_EPackage" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <borderedNodeMappings name="NM_Class2" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> - <borderedNodeMappings name="NM_Class2_Out" preconditionExpression="<%eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NM_Class2_Out" preconditionExpression="aql:self.eSuperTypes->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="NM_Class2_In" preconditionExpression="<%~eSuperTypes.nSize != 0%>" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="NM_Class2_In" preconditionExpression="aql:self.eInverse('eSuperTypes')->size() <> 0" semanticCandidatesExpression="var:self" createElements="false" domainClass="EClass"> <style xsi:type="style:SquareDescription" hideLabelByDefault="true" 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']"/> @@ -442,12 +442,12 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EM_Supertype2" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EM_Supertype2" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="EM_Supertype2Bn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']/@borderedNodeMappings[name='NM_Class2_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']/@borderedNodeMappings[name='NM_Class2_In']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="EM_Supertype2Bn" createElements="false" sourceMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']/@borderedNodeMappings[name='NM_Class2_Out']" targetMapping="//@ownedViewpoints[name='TC2185']/@ownedRepresentations[name='TC2185%20Bordered%20Node%20on%20Node']/@defaultLayer/@nodeMappings[name='NM_EPackage']/@borderedNodeMappings[name='NM_Class2']/@borderedNodeMappings[name='NM_Class2_In']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/toolWizard/toolWizard.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/toolWizard/toolWizard.odesign index baa960bb12..6979e74622 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/toolWizard/toolWizard.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/toolWizard/toolWizard.odesign @@ -1,47 +1,48 @@ <?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" 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="Ecore Editing Workbench V4.6" version="8.0.0"> +<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="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="DesignWithWizard" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="EntitiesTest" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="EntitiesTest" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eAllContents("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select(e| e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="10" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" showIcon="false" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -49,23 +50,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.3/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.3/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -79,7 +80,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -88,7 +89,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new AbstractClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="abstract" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -98,7 +99,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'new Interface ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="interface" valueExpression="true"/> </firstModelOperations> </initialOperation> @@ -128,14 +129,14 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -150,9 +151,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -212,7 +213,7 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -226,12 +227,12 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name.toLower()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceSource"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:instanceTarget"> @@ -251,7 +252,7 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:target"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="new EReference"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -261,8 +262,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -277,20 +278,20 @@ </ownedTools> </toolSections> <toolSections name="Navigation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='DesignWithWizard']/@ownedRepresentations[name='EntitiesTest']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> </toolSections> <toolSections name="Tools"> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="Change name" forceRefresh="true" candidatesExpression="<%getRootContainer().eAllContents("EClass")%>" message="Please select a new name" windowTitle="Name selection"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="Change name" forceRefresh="true" candidatesExpression="aql:self.eResource().getContents()->first().eAllContents(ecore::EClass)" message="Please select a new name" windowTitle="Name selection"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$element.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:element.name"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/DoubleClick__NavigationOperation/Viewpoint1054/tc1054.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/DoubleClick__NavigationOperation/Viewpoint1054/tc1054.odesign index f10d9b9801..264b10bcaa 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/DoubleClick__NavigationOperation/Viewpoint1054/tc1054.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/DoubleClick__NavigationOperation/Viewpoint1054/tc1054.odesign @@ -1,17 +1,17 @@ <?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="Ticket #1054" version="8.0.0"> +<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="Ticket #1054" version="10.1.3.201511131800"> <ownedViewpoints name="Test case for ticket #1054" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']" name="TC1054 representation 1" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <containerMappings name="Container EPackage R1" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R1']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']"> - <subNodeMappings name="Node EPackage R1" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R1']" domainClass="EPackage"> + <containerMappings name="Container EPackage R1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R1']" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Drag%20%26%20Drop%20R1']"> + <subNodeMappings name="Node EPackage R1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R1']" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -25,16 +25,16 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eSubpackages"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:newSemanticContainer" featureName="eSubpackages"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:DoubleClickDescription" name="Double click R1" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']"> + <ownedTools xsi:type="tool:DoubleClickDescription" name="Double click R1" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']/@subNodeMappings[name='Node%20EPackage%20R1'] //@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']/@defaultLayer/@containerMappings[name='Container%20EPackage%20R1']"> <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:Navigation" createIfNotExistent="true" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']"/> + <firstModelOperations xsi:type="tool:Navigation" createIfNotExistent="true" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']"/> </initialOperation> </ownedTools> </toolSections> @@ -42,7 +42,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="TC1054 representation 2" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> - <nodeMappings name="Node EPackage R3" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@toolSections.0/@ownedTools[name='Navigation']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R2']" domainClass="EPackage"> + <nodeMappings name="Node EPackage R3" detailDescriptions="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@toolSections.0/@ownedTools[name='Navigation']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" doubleClickDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@toolSections.0/@ownedTools[name='Double%20click%20R2']" domainClass="EPackage"> <style xsi:type="style:SquareDescription" sizeComputationExpression="7" labelPosition="node" resizeKind="NORTH_SOUTH"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -50,16 +50,16 @@ </style> </nodeMappings> <toolSections> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Navigation" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Navigation" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool_1:DoubleClickDescription" name="Double click R2" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@nodeMappings[name='Node%20EPackage%20R3']"> + <ownedTools xsi:type="tool:DoubleClickDescription" name="Double click R2" mappings="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%202']/@defaultLayer/@nodeMappings[name='Node%20EPackage%20R3']"> <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:Navigation" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']"/> + <firstModelOperations xsi:type="tool:Navigation" diagramDescription="//@ownedViewpoints[name='Test%20case%20for%20ticket%20%231054']/@ownedRepresentations[name='TC1054%20representation%201']"/> </initialOperation> </ownedTools> </toolSections> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/resize/testBorderedCreationResize.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/resize/testBorderedCreationResize.odesign index c2d8921321..8b2274f9f7 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/resize/testBorderedCreationResize.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/resize/testBorderedCreationResize.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/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="My" version="8.0.0"> +<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="My" version="10.1.3.201511131800"> <ownedViewpoints name="testBorderedCreationResize"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="testBorderedCreationResize" domainClass="EPackage"> <defaultLayer name="Default"> <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage"> <subContainerMappings name="class" semanticCandidatesExpression="feature:eContents" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@toolSections.0/@ownedTools[name='move%20bordered']"> - <borderedNodeMappings name="att" semanticCandidatesExpression="<%eAllContents()%>" domainClass="EAttribute"> + <borderedNodeMappings name="att" semanticCandidatesExpression="aql:self.eAllContents()" domainClass="EAttribute"> <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="BorderedNode" sizeComputationExpression="1" resizeKind="NSEW" width="1" height="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']"/> @@ -33,7 +33,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -69,14 +69,14 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -90,73 +90,73 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="[newSemanticContainer/]"> - <subModelOperations xsi:type="tool:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[newSemanticContainer/]"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="eStructuralFeatures" valueExpression="[element/]"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createBorderedResize" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createBorderedResize" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='att']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createBorderedResizeHorizontally" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attHori']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createBorderedResizeHorizontally" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attHori']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createBorderedResizeVertically" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attVert']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createBorderedResizeVertically" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attVert']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createBorderedResizeNot" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attNot']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createBorderedResizeNot" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='class']/@borderedNodeMappings[name='attNot']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> + <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createClassNodeResize" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='class']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createClassNodeResize" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='class']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> + <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createClassNodeHorizontally" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classHori']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createClassNodeHorizontally" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classHori']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> + <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createClassNodeVertically" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classVert']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createClassNodeVertically" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classVert']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> + <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:NodeCreationDescription" name="createClassNodeNot" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classNot']"> + <ownedTools xsi:type="tool:NodeCreationDescription" name="createClassNodeNot" nodeMappings="//@ownedViewpoints[name='testBorderedCreationResize']/@ownedRepresentations[name='testBorderedCreationResize']/@defaultLayer/@containerMappings[name='package']/@subContainerMappings[name='packages']/@subNodeMappings[name='classNot']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> + <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"/> </initialOperation> </ownedTools> </toolSections> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign index 47816be0c3..59aba5ecbd 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/popupMenu/VP-1859/vp-1859.odesign @@ -1,25 +1,25 @@ <?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-1859" version="8.0.0"> +<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-1859" version="10.1.3.201511131800"> <ownedViewpoints name="VP-1859" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1859" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <edgeMappings name="Edge" sourceMapping="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Edge" sourceMapping="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" targetMapping="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EPackage" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@containerMappings[name='EPackage']"> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="LEFT"> + <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859']/@defaultLayer/@containerMappings[name='EPackage']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -34,7 +34,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -44,10 +44,10 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -55,9 +55,9 @@ <menuItemDescription xsi:type="tool:OperationAction" name="EClass On Edge"> <view name="views"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$views.eContainer("DSemanticDiagram").target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views.eContainerOrSelf(diagram::DSemanticDiagram).target->first()"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -68,7 +68,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -78,10 +78,10 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Class<%eContainer().eContents().filter("EClass").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Class' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -91,16 +91,16 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1859-RealCase" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" labelPosition="node" resizeKind="NSEW" width="5" height="5"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <containerMappings name="EPackage" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@nodeMappings[name='EClass']"> - <subContainerMappings name="SubEPackage" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@containerMappings[name='EPackage']/@subContainerMappings[name='SubEPackage']"> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="LEFT"> + <containerMappings name="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@nodeMappings[name='EClass']"> + <subContainerMappings name="SubEPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@nodeMappings[name='EClass']" reusedContainerMappings="//@ownedViewpoints[name='VP-1859']/@ownedRepresentations[name='VP-1859-RealCase']/@defaultLayer/@containerMappings[name='EPackage']/@subContainerMappings[name='SubEPackage']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> @@ -108,7 +108,7 @@ <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelAlignment="LEFT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelAlignment="LEFT"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -123,10 +123,10 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="feature:eContainer"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="newPackage"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("EPackage").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:For" expression="var:views"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:newPackage" featureName="eClassifiers"/> </subModelOperations> </subModelOperations> @@ -138,10 +138,10 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="feature:eContainer"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="newPackage"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("EPackage").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="newPackage2"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="Package<%eContainer().eContents().filter("EPackage").nSize()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-1257/vp1257.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-1257/vp1257.odesign index 1715cd77f7..9ec42b288d 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-1257/vp1257.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-1257/vp1257.odesign @@ -1,5 +1,5 @@ <?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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="HideLabelIcons" version="8.0.0"> +<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: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/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="HideLabelIcons" version="10.1.3.201511131800"> <ownedViewpoints name="VP1257"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP1257Diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="myClassAndEdgeFilter"> @@ -11,15 +11,15 @@ <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="SuperTypes" label="isSuperTypeOf" sourceMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetFinderExpression="<%self.eSuperTypes%>"> + <edgeMappings name="SuperTypes" label="isSuperTypeOf" sourceMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetFinderExpression="aql:self.eSuperTypes"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="isSuperTypeOf<%self.name%>"> + <centerLabelStyleDescription labelExpression="aql:'isSuperTypeOf' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="IsContainedIn" label="isContainedIn" sourceMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@containerMappings[name='EPackages']" targetFinderExpression="<%self.ePackage%>"> + <edgeMappings name="IsContainedIn" label="isContainedIn" sourceMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']" targetMapping="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@containerMappings[name='EPackages']" targetFinderExpression="aql:self.ePackage"> <style lineStyle="dot" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <centerLabelStyleDescription labelExpression="isContainedIn"> @@ -27,8 +27,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EPackages" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <containerMappings name="EPackages" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP1257']/@ownedRepresentations[name='VP1257Diagram']/@nodeMappings[name='EClasses']"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -41,7 +41,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newTestClass"/> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%instance%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.instance"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eSuperTypes" valueExpression="var:instance"/> </subModelOperations> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign index 4de5dd1653..d8c6610e52 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/hide-reveal/tc-2330/tc2330.odesign @@ -1,35 +1,35 @@ <?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: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" name="2330" version="8.0.0"> +<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: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" name="2330" version="10.1.3.201511131800"> <ownedViewpoints name="2330" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="2330 Diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="port collapse"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum"> + <nodeMappings name="NM_EEnum" label="NM_EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> </style> </nodeMappings> - <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="<%eReferenceType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style routingStyle="manhattan"> + <edgeMappings name="EM_Ref" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetMapping="//@ownedViewpoints[name='2330']/@ownedRepresentations[name='2330%20Diagram']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_EClass']" targetFinderExpression="aql:self.eReferenceType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="CM_EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage"> - <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CM_EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> + <borderedNodeMappings name="BN_EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <style xsi:type="style:SquareDescription" width="2" height="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/contextMenuTree/vp-2270/2270.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/contextMenuTree/vp-2270/2270.odesign index bc68a51762..c881d9ed18 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/contextMenuTree/vp-2270/2270.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/contextMenuTree/vp-2270/2270.odesign @@ -1,24 +1,25 @@ <?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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2270 Group" version="10.0.0.201411061000"> +<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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2270 Group" version="10.1.3.201511131800"> <ownedViewpoints name="2270" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" reusedTreeItemMappings="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='2270']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> + <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='2270']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='2270']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self"> - <defaultStyle labelExpression="<%name%> Categorie"> + <defaultStyle labelExpression="aql:self.name + ' Categorie'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -32,7 +33,7 @@ <variables name="element" documentation="The currently edited element."/> <variables name="root" documentation="The semantic element corresponding to the current table."/> </delete> - <create name="my create tool"> + <create name="my create tool" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> @@ -43,13 +44,13 @@ <variables name="container" documentation="The semantic element corresponding to the view container."/> </create> </subItemMappings> - <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>"> + <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> - <createTreeItem name="createTool1" precondition="[true/]"> + <createTreeItem name="createTool1" precondition="[true/]" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> @@ -59,7 +60,7 @@ <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> </createTreeItem> - <createTreeItem name="createTool2" precondition="[true/]"> + <createTreeItem name="createTool2" precondition="[true/]" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClass"/> @@ -70,6 +71,7 @@ <variables name="container" documentation="The semantic element corresponding to the view container."/> </createTreeItem> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/ecore.odesign index a120316c18..398e65d4e3 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +83,39 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="RIGHT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.name " labelAlignment="RIGHT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="<%name%><%if (eParameters.nSize()>0) {%> (<%eParameters.getParameterLabel().sep(", ")%>)<%}%> : <%eType.name%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="aql:self.name + if self.eParameters->size() > 0 then ' (' + self.eParameters().name->sep(',') + ')' else '' endif + ' : '+ self.eType.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="6" labelSize="20" labelFormat="italic" labelExpression="<%name%>TT" labelAlignment="RIGHT" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="6" labelSize="20" labelExpression="aql:self.name + 'TT'" labelAlignment="RIGHT" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +123,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -135,7 +139,7 @@ </style> </containerMappings> <containerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -149,7 +153,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -158,7 +162,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -168,7 +172,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -217,7 +221,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -242,7 +246,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -257,7 +261,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -267,8 +271,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -282,12 +286,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -304,18 +308,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -334,9 +338,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -345,9 +349,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -355,26 +359,26 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getOperationNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%createParameterFromString($0)%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <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']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -388,7 +392,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -397,7 +401,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -410,23 +414,24 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="15" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -436,7 +441,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -446,7 +451,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -459,45 +464,45 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference)->select( e | e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> + <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -505,9 +510,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -520,22 +525,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EEnum")%>" createElements="false" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EEnum)" createElements="false" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -543,15 +549,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EDataType")%>" createElements="false" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EDataType)" createElements="false" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -564,7 +570,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -593,7 +599,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -607,12 +613,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -632,7 +638,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -681,9 +687,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -693,12 +699,12 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -715,12 +721,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -737,18 +743,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -758,8 +764,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Blank Layer Package" activeByDefault="true"> - <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -767,7 +773,7 @@ </style> </containerMappings> <containerMappings name="Blank Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -781,7 +787,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -791,7 +797,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -802,18 +808,20 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultStyle> <conditionalStyles> - <style labelFormat="bold" showIcon="false"> + <style showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </conditionalStyles> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -829,41 +837,42 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" domainClass="EPackage"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -877,15 +886,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -895,15 +904,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -913,15 +922,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -931,15 +940,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -951,7 +960,7 @@ <ownedViewpoints name="Quality" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -959,8 +968,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%self + eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:Sequence{self} + self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -970,22 +979,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1000,19 +1009,21 @@ <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1021,15 +1032,15 @@ </containerMappings> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1037,7 +1048,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1045,15 +1056,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1063,15 +1074,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eType%>" sourceFinderExpression="" domainClass="EReference"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eType" sourceFinderExpression="" domainClass="EReference"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1079,7 +1090,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1087,15 +1098,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1107,7 +1118,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1115,7 +1126,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1125,36 +1136,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1167,8 +1180,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -1178,21 +1192,22 @@ </ownedViewpoints> <ownedViewpoints name="Review" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30"> - <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> - <defaultForeground labelSize="8" labelFormat="bold"> + <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> + <defaultForeground labelSize="8"> + <labelFormat>bold</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultForeground> - <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"/> + <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/> </ownedLineMappings> - <ownedColumnMappings name="Available Tags" headerLabelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="<%getRootContainer.eAnnotations[source=="Tags"].details%>"/> - <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="<%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="TagValues"]%>" domainClass="EAnnotation"> + <ownedColumnMappings name="Available Tags" headerLabelExpression="aql:if self->oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.key" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAnnotations->select( e | e.source='Tags').details"/> + <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="aql:self.eAllContents(EAnnotation)->select( e | e.source='TagValues')" domainClass="EAnnotation"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/> <variables name="root" documentation="The semantic element of the table."/> - <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$0.nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:arg0->size() = 0"> <subModelOperations xsi:type="tool:Unset" featureName="references" elementExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> @@ -1203,29 +1218,29 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="TagValues"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='TagValues')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="TagValues"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> <subModelOperations xsi:type="tool:SetValue" featureName="references" valueExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> <mask mask="{0}"/> </create> </intersection> - <createColumn name="New Tag" forceRefresh="true" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> + <createColumn name="New Tag" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> <variables name="root" documentation="The semantic element of the table."/> <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="<%getRootContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="Tags"].nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='Tags')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eAnnotations[source=="Tags"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source='Tags')"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="NEWTAG"/> </subModelOperations> @@ -1234,18 +1249,18 @@ </createColumn> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -1262,19 +1277,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -1282,12 +1297,13 @@ </create> </intersection> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> @@ -1299,7 +1315,7 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/navigation/tree.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/navigation/tree.odesign index b02fbee868..35443fcbf7 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/navigation/tree.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/navigation/tree.odesign @@ -1,8 +1,8 @@ <?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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> + <subItemMappings name="Package" domainClass="EPackage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Package']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -14,17 +14,18 @@ </defaultStyle> </subItemMappings> </subItemMappings> - <subItemMappings name="Class" label="Class" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@ownedRepresentationCreationDescriptions[name='Tree%20Creation%20on%20Class']" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@ownedRepresentationCreationDescriptions[name='Tree%20Creation%20on%20Class']" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> <subItemMappings name="Categorie" domainClass="EClass" semanticCandidatesExpression="var:self"> - <defaultStyle labelExpression="<%name%> Categorie"> + <defaultStyle labelExpression="aql:self.name + ' Categorie'"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -38,7 +39,7 @@ <variables name="element" documentation="The currently edited element."/> <variables name="root" documentation="The semantic element corresponding to the current table."/> </delete> - <create name="my create tool"> + <create name="my create tool" elementsToSelect="service:stdEmptyCollection"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClassCreationTool"/> @@ -67,13 +68,13 @@ <variables name="container" documentation="The semantic element corresponding to the view container."/> </create> </subItemMappings> - <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="<%eContents.filter("EEnum")%>"> + <subItemMappings name="Enum" label="Enum" semanticElements="" domainClass="EEnum" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> - <createTreeItem name="Create root class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class']"> + <createTreeItem name="Create root class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Tree']/@subItemMappings[name='Class']"> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="NewEClassCreationTool"/> @@ -89,7 +90,7 @@ </ownedRepresentationCreationDescriptions> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree on Class" domainClass="EClass"> - <subItemMappings name="Attr2" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr2" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -97,9 +98,10 @@ </subItemMappings> </ownedRepresentations> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/popupMenus/vp915.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/popupMenus/vp915.odesign index 6b1edb82f7..d9210d884c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/popupMenus/vp915.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tree/popupMenus/vp915.odesign @@ -1,26 +1,26 @@ <?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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP915" version="8.0.0"> +<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/tree/description/1.0.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP915" version="10.1.3.201511131800"> <ownedViewpoints name="VP915"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree With Contextual Menus" domainClass="EPackage"> - <subItemMappings name="EClass" domainClass="EClass" semanticCandidatesExpression="<%eAllContents.filter("EClass")%>"> + <subItemMappings name="EClass" domainClass="EClass" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EClass)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <subItemMappings name="EAttribute" domainClass="EAttribute" semanticCandidatesExpression="<%eAllContents.filter("EAttribute")%>"> + <subItemMappings name="EAttribute" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eAllContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_purple']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> - <popupMenus name="Renamming..." precondition="<%self.name != "wrongFeature"%>"> - <menuItemDescriptions xsi:type="tool:OperationAction" name="from Operation" precondition="<%self.name != "name"%>" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <popupMenus name="Renamming..." precondition="aql:self.name <> 'wrongFeature'"> + <menuItemDescriptions xsi:type="tool:OperationAction" name="from Operation" precondition="aql:self.name <> 'name'" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <view name="views"/> <initialOperation> - <firstModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$views.target.name%>-RENAMMED"/> + <firstModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:views.target.name + '-RENAMMED'"/> </initialOperation> </menuItemDescriptions> - <menuItemDescriptions xsi:type="tool:ExternalJavaActionCall" name="MyJavaAction-Call" precondition="<%self.name == "name"%>" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/Role.gif" action="//@ownedViewpoints[name='VP915']/@ownedRepresentations[name='Tree%20With%20Contextual%20Menus']/@subItemMappings[name='EClass']/@subItemMappings[name='EAttribute']/@popupMenus.0/@menuItemDescriptions.2"/> - <menuItemDescriptions xsi:type="tool:ExternalJavaAction" name="MyJavaAction" precondition="<%self.name != "name"%>" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/Thing.gif" id="org.eclipse.sirius.tests.tree.javaaction1"/> + <menuItemDescriptions xsi:type="tool:ExternalJavaActionCall" name="MyJavaAction-Call" precondition="aql:self.name = 'name'" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/Role.gif" action="//@ownedViewpoints[name='VP915']/@ownedRepresentations[name='Tree%20With%20Contextual%20Menus']/@subItemMappings[name='EClass']/@subItemMappings[name='EAttribute']/@popupMenus.0/@menuItemDescriptions.2"/> + <menuItemDescriptions xsi:type="tool:ExternalJavaAction" name="MyJavaAction" precondition="aql:self.name <> 'name'" icon="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/Thing.gif" id="org.eclipse.sirius.tests.tree.javaaction1"/> </popupMenus> </subItemMappings> </subItemMappings> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-1737/vp-1737.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-1737/vp-1737.odesign index c96b2c8add..18417ff4c8 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-1737/vp-1737.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-1737/vp-1737.odesign @@ -1,5 +1,5 @@ <?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" 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="VP-1737" version="8.0.0"> +<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="VP-1737" version="10.1.3.201511131800"> <ownedViewpoints name="VP-1737" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1737.1" domainClass="EPackage"> <defaultLayer name="Default"> @@ -22,7 +22,7 @@ </style> </nodeMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="Creation test" browseExpression="<%eContainer("EPackage")%>" diagramDescription="//@ownedViewpoints[name='VP-1737']/@ownedRepresentations[name='VP-1737.2']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Creation test" browseExpression="aql:self.eContainerOrSelf(ecore::EPackage)" diagramDescription="//@ownedViewpoints[name='VP-1737']/@ownedRepresentations[name='VP-1737.2']"> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"/> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2674/read_only_column.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2674/read_only_column.odesign index a149420b7f..7bfc7324b6 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2674/read_only_column.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2674/read_only_column.odesign @@ -1,12 +1,12 @@ <?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/table/description/1.1.0" name="read_only_column" version="8.0.0"> +<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/table/description/1.1.0" name="read_only_column" version="10.1.3.201511131800"> <ownedViewpoints name="read_only_column" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="read_only_column" domainClass="ecore.EPackage"> - <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="<%eClassifiers%>" headerLabelExpression="<%name%>"> - <ownedSubLines name="EReference" domainClass="ecore.EReference" semanticCandidatesExpression="<%eReferences%>"/> + <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="aql:self.eClassifiers" headerLabelExpression="aql:self.name"> + <ownedSubLines name="EReference" domainClass="ecore.EReference" semanticCandidatesExpression="aql:self.eReferences"/> </ownedLineMappings> - <ownedColumnMappings name="Containment1" label="containment1" headerLabelExpression="Containment1" canEdit="<%false%>" featureName="containment" labelExpression="<%containment%>"/> - <ownedColumnMappings name="Containment2" label="containment2" headerLabelExpression="Containment2" featureName="containment" labelExpression="<%containment%>"/> + <ownedColumnMappings name="Containment1" label="containment1" headerLabelExpression="Containment1" canEdit="aql:false" featureName="containment" labelExpression="aql:self.containment"/> + <ownedColumnMappings name="Containment2" label="containment2" headerLabelExpression="Containment2" featureName="containment" labelExpression="aql:self.containment"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2683/different_parent_expression.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2683/different_parent_expression.odesign index 2d014602e6..e91b27c4f1 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2683/different_parent_expression.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2683/different_parent_expression.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/table/description/1.1.0" name="different_parent_expression" version="8.0.0"> +<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/table/description/1.1.0" name="different_parent_expression" version="10.1.3.201511131800"> <ownedViewpoints name="different_parent_expression"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="different_parent_expression" domainClass="ecore.EPackage"> - <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eContents" headerLabelExpression="<%name%>"/> - <ownedColumnMappings name="IsAbstract" headerLabelExpression="IsAbstract" featureName="abstract" labelExpression="<%abstract%>" featureParentExpression="var:self"/> - <ownedColumnMappings name="InheritsFromAbstract" headerLabelExpression="InheritsFromAbstract" featureName="abstract" labelExpression="<%abstract%>" featureParentExpression="<%eSuperTypes.nFirst%>"/> + <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:self.name"/> + <ownedColumnMappings name="IsAbstract" headerLabelExpression="IsAbstract" featureName="abstract" labelExpression="aql:self.abstract" featureParentExpression="var:self"/> + <ownedColumnMappings name="InheritsFromAbstract" headerLabelExpression="InheritsFromAbstract" featureName="abstract" labelExpression="aql:self.abstract" featureParentExpression="aql:self.eSuperTypes->first()"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2692/dnd_from_model_content.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2692/dnd_from_model_content.odesign index 0164629fce..7016509909 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2692/dnd_from_model_content.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-2692/dnd_from_model_content.odesign @@ -1,9 +1,9 @@ <?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" 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="dnd_from_model_content" version="8.0.0"> +<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="dnd_from_model_content" version="10.1.3.201511131800"> <ownedViewpoints name="dnd_from_model_content" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='dnd_from_model_content']/@ownedRepresentations[name='dnd_from_model_content']/@defaultLayer/@toolSections.0/@ownedTools[name='DAD_EClass']" name="dnd_from_model_content" domainClass="ecore.EPackage"> <defaultLayer name="Default"> - <nodeMappings name="EClass" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <nodeMappings name="EClass" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="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']"/> @@ -24,12 +24,12 @@ <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:SetValue" featureName="name" valueExpression="EClass<%eContainer.eClassifiers.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'EClass' + self.eContainer().eClassifiers->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="DAD_EClass" precondition="<%filter("EClass")%>" forceRefresh="true" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="DAD_EClass" precondition="aql:self.oclIsKindOf(ecore::EClass)" forceRefresh="true" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -46,7 +46,7 @@ <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:SetValue" featureName="name" valueExpression="Package<%eContainer.eSubpackages.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Package' + self.eContainer().eSubpackages->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-4112/vp-4112.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-4112/vp-4112.odesign index f2954edf58..5d7383cb47 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-4112/vp-4112.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vp-4112/vp-4112.odesign @@ -1,5 +1,5 @@ <?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-4112" version="8.0.0"> +<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-4112" version="10.1.3.201511131800"> <ownedViewpoints name="vp-4112"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp-4112" domainClass="ecore.EPackage"> <defaultLayer name="Default"> @@ -11,7 +11,7 @@ </style> </nodeMappings> <toolSections name="selection tools"> - <ownedTools xsi:type="tool:SelectionWizardDescription" name="Tree Selection" candidatesExpression="<%$container + $container.eAllContents()%>" multiple="true" tree="true" rootExpression="<%$container.filter("EPackage") + $container.eAllContents().filter("EPackage")%>" childrenExpression="feature:eContents"> + <ownedTools xsi:type="tool:SelectionWizardDescription" name="Tree Selection" candidatesExpression="aql:OrderedSet{container} + container.eAllContents()" multiple="true" tree="true" rootExpression="aql:OrderedSet{container}->filter(ecore::EPackage) + container.eAllContents()->filter(ecore::EPackage)" childrenExpression="feature:eContents"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -21,7 +21,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" name="Pane Based Selection" windowTitle="Pane Based" candidatesExpression="<%$container + $container.eAllContents()%>" tree="true" rootExpression="<%$container.filter("EPackage") + $container.eAllContents().filter("EPackage")%>" childrenExpression="feature:eContents"> + <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" name="Pane Based Selection" windowTitle="Pane Based" candidatesExpression="aql:OrderedSet{container} + container.eAllContents()" tree="true" rootExpression="aql:OrderedSet{container}->filter(ecore::EPackage) + container.eAllContents()->filter(ecore::EPackage)" childrenExpression="feature:eContents"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vsm/ecore.odesign b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vsm/ecore.odesign index a120316c18..e1473b7b1c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vsm/ecore.odesign +++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/vsm/ecore.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: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:validation="http://www.eclipse.org/sirius/diagram/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="8.0.0"> +<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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +12,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> <fixes name="Remove Element"> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%target%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.target"> <subModelOperations xsi:type="tool:RemoveElement"/> </firstModelOperations> </initialOperation> </fixes> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment && derived%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment and self.derived"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!containment && derived%>"> - <style sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:not self.containment and self.derived"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.targetNode.filter("EClass")[interface]%>"> - <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <conditionnalStyles predicateExpression="aql:view.targetNode->filter(ecore::EClass)->select( e | e.interface)->size() > 0"> + <style lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -81,37 +83,39 @@ </style> </conditionnalStyles> </edgeMappings> - <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="RIGHT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.name " labelAlignment="RIGHT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> <subNodeMappings name="Operation" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Operation%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EOperation"> - <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="<%name%><%if (eParameters.nSize()>0) {%> (<%eParameters.getParameterLabel().sep(", ")%>)<%}%> : <%eType.name%>" labelAlignment="LEFT" tooltipExpression="<%name%>(<%eParameters.name.sep(", ")%>) : <%eType.name%>" sizeComputationExpression="2"> + <style xsi:type="style:BundledImageDescription" labelSize="20" labelExpression="aql:self.name + if self.eParameters->size() > 0 then ' (' + self.eParameters().name->sep(',') + ')' else '' endif + ' : '+ self.eType.name" labelAlignment="LEFT" tooltipExpression="aql:self.name + '(' + self.eParameters.name->sep(',') + '): '+ self.eType.name" sizeComputationExpression="2"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="6" labelSize="20" labelFormat="italic" labelExpression="<%name%>TT" labelAlignment="RIGHT" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="6" labelSize="20" labelExpression="aql:self.name + 'TT'" labelAlignment="RIGHT" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EEnum")%>" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EEnum)" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -119,15 +123,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EDataType")[eClass.name == "EDataType"]%>" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EDataType)->select( e | e.eClass().name = 'ecore::EDataType')" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -135,7 +139,7 @@ </style> </containerMappings> <containerMappings> - <style xsi:type="style:FlatContainerStyleDescription"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -149,7 +153,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -158,7 +162,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new AbstractClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -168,7 +172,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Interface <%eContainer().eContents().filter("EClass").nSize%>"/> + <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> </initialOperation> @@ -217,7 +221,7 @@ </ownedTools> </toolSections> <toolSections name="Relation"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="<%name%> package entities" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -242,7 +246,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -257,7 +261,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -267,8 +271,8 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -282,12 +286,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -304,18 +308,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -334,9 +338,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -345,9 +349,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getReferenceNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="<%getUpperBoundFromString($0)%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="<%getLowerBoundFromString($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getReferenceNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="upperBound" valueExpression="aql:getUpperBoundFromString(arg0)"/> + <subModelOperations xsi:type="tool:SetValue" featureName="lowerBound" valueExpression="aql:getLowerBoundFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -355,26 +359,26 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getOperationNameFromString($0).trim%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getOperationNameFromString(arg0)->trim()"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%createParameterFromString($0)%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.createParameterFromString(arg0)"/> </firstModelOperations> </initialOperation> </ownedTools> </toolSections> </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> - <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <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']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -388,7 +392,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -397,7 +401,7 @@ </additionalLayers> <additionalLayers name="Dynamic"> <toolSections name="Dynamic"> - <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="<%filter("EClass")%>" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> + <ownedTools xsi:type="tool:ToolDescription" name="Dynamic instance" precondition="aql:self.oclIsKindOf(ecore::EClass)" iconPath="/org.eclipse.sirius.sample.ecore.design/icons/full/obj16/DynamicInstance.gif"> <element name="element"/> <elementView name="elementView"/> <initialOperation> @@ -410,23 +414,24 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="Classes" domainClass="EPackage"> - <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="15" labelFormat="italic"> + <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <foregroundConditionalStyle predicateExpression="aql:self.abstract"> + <style labelSize="15"> + <labelFormat>italic</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> </foregroundConditionalStyle> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedLineMappings> - <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="Package" domainClass="EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> <ownedSubLines name="Feature" domainClass="EStructuralFeature"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -436,7 +441,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedCreateLine name="line" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="line" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes']/@ownedLineMappings[name='Classes%20lines']"> <variables name="root" documentation="The semantic element of the table."/> <variables name="element" documentation="The semantic currently edited element."/> <variables name="container" documentation="The semantic element corresponding to the view container."/> @@ -446,7 +451,7 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -459,45 +464,45 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20']"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide derived features"> - <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@edgeMappings[name='Blank%20EC_EReference%20'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']" semanticConditionExpression="aql:self.oclIsKindOf(ecore::EStructuralFeature) and not self.derived"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="Hide operations"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']/@subNodeMappings[name='Operation']" semanticConditionExpression=""/> </filters> <validationSet> - <ownedRules xsi:type="validation:ViewValidationRule" message="The <%target.name%> class is never used" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%(((target + target.eAllSuperTypes).~.filter("EClass") + (target + target.eAllSuperTypes).~.filter("EReference") ) - target.eAllStructuralFeatures).nSize != 0%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" message="something" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:(((Sequence{self.target} + target.eAllSuperTypes).eInverse()->filter(ecore::EClass) + (Sequence{target} + target.eAllSuperTypes).eInverse()->filter(ecore::EReference) ) - Sequence{target.eAllStructuralFeatures})->size() <> 0"/> </ownedRules> - <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="The <%target.name%> class has more than 4 super types" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> - <audits auditExpression="<%target.eAllSuperTypes.nSize < 4%>"/> + <ownedRules xsi:type="validation:ViewValidationRule" level="ERROR" message="aql:'The ' + self.target.name+' class has more than 4 super types'" targets="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="<%eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference")[!eOpposite]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="Blank EC_EReference " labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference)->select( e | e.eOpposite = null)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectBlankEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond" targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%if (derived) {%>/<%}%><%getEReferenceName()%>"> + <centerLabelStyleDescription labelExpression="aql:if self.derived then '/' else '' + self.getEReferenceName()"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eClassifiers.filter("EClass").eStructuralFeatures.filter("EReference"))%>" semanticElements="<%self + eOpposite%>" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> - <style targetArrow="NoDecoration" sizeComputationExpression="1"> + <edgeMappings name="Blank Bi-directional EC_EReference " semanticCandidatesExpression="aql:self.getEOppositeEReferences(self.eClassifiers->filter(ecore::EClass).eStructuralFeatures->filter(ecore::EReference))" semanticElements="aql:Sequence{self} + Sequence{self.eOpposite}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <style targetArrow="NoDecoration"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%if (derived) {%>/<%}%><%getEOppositeEReferenceName()%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql: if self.derived then '/' + self.getEOppositeEReferenceName() else self.getEOppositeEReferenceName() endif"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> + <edgeMappings name="Blank EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='ReconnectEBlankSupertype']"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -505,9 +510,9 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> + <containerMappings name="Blank EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%> : <%eType.name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.name + ' : ' + self.eType.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -520,22 +525,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EEnum")%>" createElements="false" domainClass="EEnum" childrenPresentation="List"> + <containerMappings name="Blank EC EEnum" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EEnum)" createElements="false" domainClass="EEnum" childrenPresentation="List"> <subNodeMappings name="EC EEnumLiteral" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="ocl:eLiterals" domainClass="EEnumLiteral"> <style xsi:type="style:BundledImageDescription" labelAlignment="LEFT" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -543,15 +549,15 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </containerMappings> - <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%allRoots.eAllContents("EDataType")%>" createElements="false" domainClass="EDataType" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank EC EDataType" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EDataType)" createElements="false" domainClass="EDataType" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> @@ -564,7 +570,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new EClass <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new EClass ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -593,7 +599,7 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newEReference<%eContainer("EClassifier").eAllContents("EReference").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newEReference' + self.eContainerOrSelf(ecore::EClassifier).eAllContents(ecore::EReference)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -607,12 +613,12 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures" variableName="instanceTarget"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:source"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$source.name.toLowerCase()%>"/> + <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:SetValue" featureName="eType" valueExpression="var:target"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%$target.name.toLowerCase()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:target.name.toLower()"/> <subModelOperations xsi:type="tool:SetValue" featureName="eOpposite" valueExpression="var:instanceTarget"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:instanceTarget"> @@ -632,7 +638,7 @@ <subModelOperations xsi:type="tool:CreateInstance" typeName="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="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="containment" valueExpression="aql:true"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -681,9 +687,9 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%extractName($0)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($0)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($0)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.extractName(arg0)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(arg0)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(arg0)"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -693,12 +699,12 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$elementView.sourceNode.target%>"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$elementView.targetNode.target%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:elementView.sourceNode.target"> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:elementView.targetNode.target"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@defaultLayer/@containerMappings[name='Blank%20EC%20EEnum']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -715,12 +721,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="var:target"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferences" valueExpression="var:element"/> </subModelOperations> @@ -737,18 +743,18 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source!=$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:target"/> <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="var:source"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==$element%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="aql:edgeView.targetNode.target"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:source"> - <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="<%$edgeView.targetNode.getTarget()%>"/> + <subModelOperations xsi:type="tool:Unset" featureName="eSuperTypes" elementExpression="aql:edgeView.targetNode.target"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -758,8 +764,8 @@ </toolSections> </defaultLayer> <additionalLayers name="Blank Layer Package" activeByDefault="true"> - <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Blank Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Create%20Blank%20Entities']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@toolSections.0/@ownedTools[name='Package%20from%20treeview%20and%20diagram']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -767,7 +773,7 @@ </style> </containerMappings> <containerMappings name="Blank Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> @@ -781,7 +787,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EPackage" referenceName="eSubpackages" variableName="package"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:package"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Package <%eContainer().eContents.filter("EPackage").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Package ' + self.eContainer().eContents()->filter(ecore::EPackage)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -791,7 +797,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Package from treeview and diagram" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Blank%20Entities']/@additionalLayers[name='Blank%20Layer%20Package']/@containerMappings[name='Blank%20Design%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -802,18 +808,20 @@ </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_3:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> - <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <defaultStyle labelFormat="bold" showIcon="false"> + <subItemMappings name="Class" label="Class" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <defaultStyle showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultStyle> <conditionalStyles> - <style labelFormat="bold" showIcon="false"> + <style showIcon="false"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </conditionalStyles> - <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="<%eContents.filter("EAttribute")%>"> + <subItemMappings name="Attr" label="Attr" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAttribute)"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -829,41 +837,42 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" domainClass="EPackage"/> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Archetype" modelFileExtension="ecore"> <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities With Archetypes" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Archetypes" activeByDefault="true"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <conditionnalStyles predicateExpression="<%isMomentInterval%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Archetyped EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <conditionnalStyles predicateExpression="aql:self.isMomentInterval()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='MomentIntervalColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isDescription%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> + <conditionnalStyles predicateExpression="aql:self.isDescription()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='DescriptionColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isThing%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> + <conditionnalStyles predicateExpression="aql:self.isThing()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='PartyPlaceThingColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isRole%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> + <conditionnalStyles predicateExpression="aql:self.isRole()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom" foregroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='RoleColor']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%isInterface%>"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%eContainer.name%>.<%name%>" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.isInterface()"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -877,15 +886,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new MomentInterval <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new MomentInterval ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("MomentInterval")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("MomentInterval")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -895,15 +904,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Description <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Description ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Description")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Description")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -913,15 +922,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Role <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Role ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Role")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Role")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -931,15 +940,15 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EPackage")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EPackage)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Thing <%eContainer().eContents().filter("EClass").nSize%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Thing ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$container.filter("EClass")%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%addArchetypeAnnotation("Thing")%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:container.oclIsKindOf(ecore::EClass)"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addArchetypeAnnotation("Thing")"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -951,7 +960,7 @@ <ownedViewpoints name="Quality" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Dependencies" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="<%((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainer("EPackage").nMinimize - self%>"> + <edgeMappings name="Package Dependency" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']" targetFinderExpression="aql:((self.eClassifiers.eAllStructuralFeatures.eType) + (self.eClassifiers.eAllSuperTypes)).eContainerOrSelf(ecore::EPackage)->asSet() - OrderedSet{self}"> <style lineStyle="dash" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <centerLabelStyleDescription> @@ -959,8 +968,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%self + eAllContents("EPackage")%>" domainClass="EPackage"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="<%name%> : <%nsURI%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Dep Package" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:Sequence{self} + self.eAllContents(ecore::EPackage)" domainClass="EPackage"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.name + ' : ' + self.nsURI" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> @@ -970,22 +979,22 @@ </defaultLayer> <additionalLayers name="Content"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Dependencies']/@defaultLayer/@containerMappings[name='Dep%20Package']"> - <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" childrenPresentation="List"> + <subContainerMappings name="PD EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1000,19 +1009,21 @@ <defaultLayer name="Default"> <containerMappings name="R Domain Class" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="R EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelSize="10" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']" backgroundStyle="GradientTopToBottom"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -1021,15 +1032,15 @@ </containerMappings> </defaultLayer> <additionalLayers name="Used by"> - <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="<%~.filter("EReference")%>" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Used by EReference" semanticCandidatesExpression="aql:self.eInverse()->filter(ecore::EReference)" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1037,7 +1048,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="<%~.filter("EClass")%>"> + <edgeMappings name="Related Used by ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Used%20by']/@containerMappings[name='R%20Used%20by%20Classes']" targetFinderExpression="aql:self.eInverse(ecore::EClass)"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1045,15 +1056,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(~.filter("EClass") + ~.filter("EReference").eContainer).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Used by Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eInverse(ecore::EClass) + self.eInverse(ecore::EReference)).eContainer()->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1063,15 +1074,15 @@ </containerMappings> </additionalLayers> <additionalLayers name="Uses"> - <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eAllStructuralFeatures.filter("EReference").eType%>" sourceFinderExpression="" domainClass="EReference"> - <style sizeComputationExpression="1"> + <edgeMappings name="Related Use EReference" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eAllStructuralFeatures->filter(ecore::EReference).eType" sourceFinderExpression="" domainClass="EReference"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%containment%>"> - <style sourceArrow="FillDiamond" sizeComputationExpression="1"> + <conditionnalStyles predicateExpression="aql:self.containment"> + <style sourceArrow="FillDiamond"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -1079,7 +1090,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Related Use ESupertypes" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@defaultLayer/@containerMappings[name='R%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Relations']/@additionalLayers[name='Uses']/@containerMappings[name='R%20Uses%20Classes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1087,15 +1098,15 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%(self.eAllStructuralFeatures.filter("EReference").eType + self.eAllSuperTypes.nFirst).nMinimize - self%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="R Uses Classes" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:(self.eAllStructuralFeatures->filter(ecore::EReference).eType + self.eAllSuperTypes->first())->asSet() - OrderedSet{self}" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1107,7 +1118,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Hierarchy" domainClass="EClass"> <defaultLayer name="Default"> - <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy direct super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20Domain%20Class']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1115,7 +1126,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%null%>" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="Hierarchy indirect super type" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:null" sourceMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetMapping="//@ownedViewpoints[name='Quality']/@ownedRepresentations[name='Hierarchy']/@defaultLayer/@containerMappings[name='H%20SuperTypes']" targetFinderExpression="aql:self.eSuperTypes"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -1125,36 +1136,38 @@ </edgeMappings> <containerMappings name="H Domain Class" semanticCandidatesExpression="var:self" domainClass="EClass" childrenPresentation="List"> <subNodeMappings name="H EAttribute" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="<%if (derived) {%>/<%}%><%name%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:if self.derived then '/' else '' endif + self.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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <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']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" labelFormat="bold" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> </containerMappings> - <containerMappings name="H SuperTypes" semanticCandidatesExpression="<%eAllSuperTypes%>" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="H SuperTypes" semanticCandidatesExpression="aql:self.eAllSuperTypes" domainClass="EClass" childrenPresentation="List"> + <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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> - <conditionnalStyles predicateExpression="<%abstract%>"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="GradientTopToBottom"> + <conditionnalStyles predicateExpression="aql:self.abstract"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -1167,8 +1180,9 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Entities" viewpointURI="viewpoint:/org.eclipse.sirius.sample.ecore.design/Design" representationName="Entities"> <layers name="Size"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Doc Class" semanticCandidatesExpression="feature:eAllContents" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelFormat="italic" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='Size%20Based%20Color']"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> @@ -1178,21 +1192,22 @@ </ownedViewpoints> <ownedViewpoints name="Review" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Tags" domainClass="EPackage" initialHeaderColumnWidth="30"> - <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> - <defaultForeground labelSize="8" labelFormat="bold"> + <ownedLineMappings name="Tags EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> + <defaultForeground labelSize="8"> + <labelFormat>bold</labelFormat> <foreGroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultForeground> - <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"/> + <ownedSubLines name="Tag EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"/> </ownedLineMappings> - <ownedColumnMappings name="Available Tags" headerLabelExpression="<%if (filter("EStructuralFeature") && derived) {%>/<%}%><%key%>" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="<%getRootContainer.eAnnotations[source=="Tags"].details%>"/> - <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="<%references%>" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="TagValues"]%>" domainClass="EAnnotation"> + <ownedColumnMappings name="Available Tags" headerLabelExpression="aql:if self->oclIsKindOf(ecore::EStructuralFeature) and self.derived then '/' else '' endif + self.key" domainClass="EStringToStringMapEntry" semanticCandidatesExpression="aql:self.eResource().getContent()->first().eAnnotations->select( e | e.source='Tags').details"/> + <intersection name="Elements to Tags" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedLineMappings[name='Tags%20EClassifiers']/@ownedSubLines[name='Tag%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0" labelExpression="XXXXXX" useDomainClass="true" columnFinderExpression="aql:self.references" lineFinderExpression="feature:eContainer" semanticCandidatesExpression="aql:self.eAllContents(EAnnotation)->select( e | e.source='TagValues')" domainClass="EAnnotation"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/> <variables name="root" documentation="The semantic element of the table."/> - <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$0.nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:arg0->size() = 0"> <subModelOperations xsi:type="tool:Unset" featureName="references" elementExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> @@ -1203,29 +1218,29 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="TagValues"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='TagValues')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="TagValues"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="TagValues"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='TagValues')"> <subModelOperations xsi:type="tool:SetValue" featureName="references" valueExpression="var:columnSemantic"/> </subModelOperations> </firstModelOperation> <mask mask="{0}"/> </create> </intersection> - <createColumn name="New Tag" forceRefresh="true" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> + <createColumn name="New Tag" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Tags']/@ownedColumnMappings.0"> <variables name="root" documentation="The semantic element of the table."/> <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="<%getRootContainer()%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="Tags"].nSize == 0%>"> + <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="aql:self.eResource().getContents()->first()"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='Tags')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="Tags"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eAnnotations[source=="Tags"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eAnnotations->select( e | e.source='Tags')"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="NEWTAG"/> </subModelOperations> @@ -1234,18 +1249,18 @@ </createColumn> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="Documentation" domainClass="EPackage"> - <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedLineMappings name="Doc EClassifiers" semanticElements="var:self" domainClass="EClassifier" semanticCandidatesExpression="" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="<%eClass.name%> : <%name%>"> + <ownedSubLines name="Doc EStructural Features" domainClass="EStructuralFeature" headerLabelExpression="aql:self.eClass().name+ ' : ' + self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> </ownedSubLines> </ownedLineMappings> - <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="<%getRootContainer%>"/> - <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="<%value%>" useDomainClass="true" columnFinderExpression="<%getRootContainer()%>" lineFinderExpression="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <ownedColumnMappings name="Doc Root" headerLabelExpression="Domain Documentation" domainClass="EPackage" semanticCandidatesExpression="aql:self.eResource().getContents()->at(1)"/> + <intersection name="EModelElements to Doc Annotation" semanticElements="var:self" lineMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers'] //@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']" columnMapping="//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedColumnMappings.0" labelExpression="aql:self.value" useDomainClass="true" columnFinderExpression="aql:self.eResource().getContents()->first()" lineFinderExpression="aql:self.eContainerOrSelf(ecore::EAnnotation).eContainer()" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAnnotation)->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel').details->select(d | d.key='documentation')" domainClass="EStringToStringMapEntry"> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -1262,19 +1277,19 @@ <variables name="columnSemantic" documentation="The semantic element corresponding to the column."/> <variables name="root" documentation="The semantic root element of the table."/> <firstModelOperation xsi:type="tool:ChangeContext" browseExpression="var:lineSemantic"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].nSize == 0%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EAnnotation" referenceName="eAnnotations" variableName="newAnnotation"> <subModelOperations xsi:type="tool:SetValue" featureName="source" valueExpression="http://www.eclipse.org/emf/2002/GenModel"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"]%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.details[key=="documentation"].nSize == 0%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel')"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.details->select( e | e.key='documentation')->size() = 0"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EStringToStringMapEntry" referenceName="details" variableName="newDetail"> <subModelOperations xsi:type="tool:SetValue" featureName="key" valueExpression="documentation"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$lineSemantic.eAnnotations[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:lineSemantic.eAnnotations->select( e | e.source='http://www.eclipse.org/emf/2002/GenModel'].details[key='documentation')"> <subModelOperations xsi:type="tool:SetValue" featureName="value" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperation> @@ -1282,12 +1297,13 @@ </create> </intersection> </ownedRepresentations> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> <ownedViewpoints name="Generation" modelFileExtension="genmodel"> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="GenPackage Attributes" domainClass="GenPackage"> - <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="<%ecoreClass.name%>"> - <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="<%eAllContents("GenFeature")[ecoreFeature.filter("EAttribute") || (ecoreFeature.filter("EReference") && !ecoreFeature.filter("EReference").containment && !ecoreFeature.filter("EReference").derived) ]%>" headerLabelExpression="<%ecoreFeature.name%>"> - <backgroundConditionalStyle predicateExpression="<%propertyCategory == ""%>"> + <ownedLineMappings name="GenClass" domainClass="GenClass" headerLabelExpression="aql:self.ecoreClass.name"> + <ownedSubLines name="GenFeature" domainClass="GenFeature" semanticCandidatesExpression="aql:self.eAllContents(genmodel::GenFeature)->select( e | e.ecoreFeature->filter(ecore::EAttribute) or (e.ecoreFeature.oclIsKindOf(ecore::EReference) and not e.ecoreFeature->filter(ecore::EReference).containment and not ecoreFeature.derived) )" headerLabelExpression="aql:self.ecoreFeature.name"> + <backgroundConditionalStyle predicateExpression="aql:self.propertyCategory = ''"> <style> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> @@ -1299,7 +1315,7 @@ </ownedRepresentations> </ownedViewpoints> <userColorsPalettes name="Ecore Palette"> - <entries xsi:type="description:InterpolatedColor" name="Size Based Color"/> + <entries xsi:type="description:InterpolatedColor" name="Size Based Color" colorValueComputationExpression="[eContents()->size()/]"/> <entries xsi:type="description:UserFixedColor" red="250" green="190" blue="190" name="MomentIntervalColor"/> <entries xsi:type="description:UserFixedColor" red="250" green="240" blue="180" name="RoleColor"/> <entries xsi:type="description:UserFixedColor" red="180" green="230" blue="180" name="PartyPlaceThingColor"/> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java index fa233078b7..3b329854e4 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java @@ -11,6 +11,7 @@ package org.eclipse.sirius.tests.swtbot; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -23,6 +24,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gef.EditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart; import org.eclipse.gmf.runtime.notation.Node; +import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart; @@ -84,6 +86,13 @@ public class ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest extends A protected void onSetUpAfterOpeningDesignerPerspective() throws Exception { sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE); localSession = designerPerspective.openSessionFromFile(sessionAirdResource); + /* + * Force the addition of a dependency to the swtbot tests plugins + * otherwise the interpreter has no way to retrieve the service class + * hence any call to "getUniqueReferencesByName()" will fail. + */ + localSession.getOpenedSession().getInterpreter().setProperty(IInterpreter.FILES, Collections.singleton("/org.eclipse.sirius.tests.swtbot/" + DATA_UNIT_DIR + VSM_FILE)); + editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_NAME_ENTITIES2, REPRESENTATION_INSTANCE_NAME_ENTITIES2, DDiagram.class); bot.viewById("org.eclipse.ui.views.ContentOutline").close(); SWTBotUtils.waitAllUiEvents(); diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NodeCreationPositionTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NodeCreationPositionTest.java index f1a56debc3..008faa5a06 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NodeCreationPositionTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NodeCreationPositionTest.java @@ -34,6 +34,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; +import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNode3EditPart; @@ -196,6 +197,13 @@ public class NodeCreationPositionTest extends AbstractSiriusSwtBotGefTestCase { final SWTBotTreeItem semanticResourceNode = localSession.getSemanticResourceNode(new UIResource(designerProject, MODEL)); semanticResourceNode.expandNode(P1).click(); otherTED = new TransactionalEditingDomainImpl(new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE)); + /* + * Force the addition of a dependency to the sample ecore editor + * otherwise the interpreter has no way to retrieve the service class + * hence any call to "render()" will fail. + */ + localSession.getOpenedSession().getInterpreter().setProperty(IInterpreter.FILES, Collections.singleton("/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign")); + } private void openDiagram() { diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeWithChangedRoutingStyleTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeWithChangedRoutingStyleTest.java index b3566dbce6..74280780f6 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeWithChangedRoutingStyleTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeWithChangedRoutingStyleTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.sirius.tests.swtbot; +import java.util.Collections; import java.util.List; import org.eclipse.draw2d.geometry.Dimension; @@ -21,6 +22,7 @@ import org.eclipse.gmf.runtime.notation.ConnectorStyle; import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.gmf.runtime.notation.Routing; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; +import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNodeList; @@ -94,6 +96,12 @@ public class ReconnectEdgeWithChangedRoutingStyleTest extends AbstractSiriusSwtB UILocalSession localSession = designerPerspective.openSessionFromFile(sessionAirdResource); editor = openDiagram(localSession.getOpenedSession(), REPRESENTATION_DESCRIPTION_NAME, REPRESENTATION_NAME, DDiagram.class); + /* + * Force the addition of a dependency to the sample ecore editor + * otherwise the interpreter has no way to retrieve the service class + * hence any call to "render()" will fail. + */ + localSession.getOpenedSession().getInterpreter().setProperty(IInterpreter.FILES, Collections.singleton("/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign")); } /** @@ -257,8 +265,8 @@ public class ReconnectEdgeWithChangedRoutingStyleTest extends AbstractSiriusSwtB private ConnectionEditPart getConnectionEditPart(String sourceEditPartName, String targetEditPartName) { assertNotNull("There is no connection between " + sourceEditPartName + " and " + targetEditPartName, getConnectionEditPartList(sourceEditPartName, targetEditPartName)); - assertEquals("There are more or less than 1 connection between " + sourceEditPartName + " and " + targetEditPartName, 1, getConnectionEditPartList(sourceEditPartName, targetEditPartName) - .size()); + assertEquals("There are more or less than 1 connection between " + sourceEditPartName + " and " + targetEditPartName, 1, + getConnectionEditPartList(sourceEditPartName, targetEditPartName).size()); return getConnectionEditPartList(sourceEditPartName, targetEditPartName).get(0).part(); } diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemovedDefaultColorMenuTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemovedDefaultColorMenuTest.java index fb11bfbbff..dea224783e 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemovedDefaultColorMenuTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/RemovedDefaultColorMenuTest.java @@ -10,7 +10,10 @@ *******************************************************************************/ package org.eclipse.sirius.tests.swtbot; +import java.util.Collections; + import org.eclipse.gef.EditPart; +import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNode2EditPart; @@ -110,6 +113,12 @@ public class RemovedDefaultColorMenuTest extends AbstractSiriusSwtBotGefTestCase sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE); localSession = designerPerspective.openSessionFromFile(sessionAirdResource); + /* + * Force the addition of a dependency to the sample ecore editor + * otherwise the interpreter has no way to retrieve the service class + * hence any call to "render()" will fail. + */ + localSession.getOpenedSession().getInterpreter().setProperty(IInterpreter.FILES, Collections.singleton("/org.eclipse.sirius.sample.ecore.design/description/ecore.odesign")); editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(), REPRESENTATION_NAME, REPRESENTATION_INSTANCE_NAME, DDiagram.class); } diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ContentAssistTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ContentAssistTest.java index 63ff4665fc..73300d0a2d 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ContentAssistTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/editor/vsm/ContentAssistTest.java @@ -84,7 +84,7 @@ public class ContentAssistTest extends AbstractContentAssistTest { propertiesBot.setFocus(); final SWTBotText semanticCandidateExpressionText = propertiesBot.bot().text("feature:eContents"); semanticCandidateExpressionText.setFocus(); - semanticCandidateExpressionText.setText("<%aa"); + semanticCandidateExpressionText.setText("aql:self.aa"); // Unfocus the semantic candidate expression and add text to another // text area @@ -95,12 +95,12 @@ public class ContentAssistTest extends AbstractContentAssistTest { // Focus back on the semantic candidate expression and modify its // content semanticCandidateExpressionText.setFocus(); - semanticCandidateExpressionText.setText("<%"); + semanticCandidateExpressionText.setText("aql:"); String initialText = semanticCandidateExpressionText.getText(); // Use of content assist - String contentAssistProposalText = selectContentAssistProposal(semanticCandidateExpressionText, 2, 2); + String contentAssistProposalText = selectContentAssistProposal(semanticCandidateExpressionText, 4, 4); String expectedCompletion = contentAssistProposalText.split(" String")[0].replaceAll(" ", ""); assertEquals("The content of Semantic Candidate Expression after content assist use is not as expected", initialText + expectedCompletion, semanticCandidateExpressionText.getText()); } finally { diff --git a/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF index d96abe77a2..fcd712052d 100644 --- a/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.tests.tree/META-INF/MANIFEST.MF @@ -34,7 +34,6 @@ Require-Bundle: org.eclipse.sirius, org.eclipse.sirius.table.ui, org.eclipse.sirius.table.ui.ext, org.eclipse.sirius.diagram, - org.eclipse.sirius.query.legacy;bundle-version="1.0.0", org.eclipse.sdk, org.eclipse.platform Bundle-Activator: org.eclipse.sirius.tests.SiriusTreeTestsPlugin @@ -51,5 +50,4 @@ Export-Package: org.eclipse.sirius.tests, org.eclipse.sirius.tests.unit.tree, org.eclipse.sirius.tests.unit.tree.tools, org.eclipse.sirius.tests.unit.tree.vsm.edit -Import-Package: org.eclipse.sirius.ext.base;version="1.0.0", - org.eclipse.sirius.query.legacy.business.internal.interpreter +Import-Package: org.eclipse.sirius.ext.base;version="1.0.0" diff --git a/plugins/org.eclipse.sirius.tests.tree/data/refresh/tree.odesign b/plugins/org.eclipse.sirius.tests.tree/data/refresh/tree.odesign index 59ae5b6afc..8c212c9fa1 100644 --- a/plugins/org.eclipse.sirius.tests.tree/data/refresh/tree.odesign +++ b/plugins/org.eclipse.sirius.tests.tree/data/refresh/tree.odesign @@ -8,8 +8,8 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="<%eContents()[isAbstract]%>" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> - <defaultStyle labelExpression="*<%name%>"> + <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.abstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> + <defaultStyle labelExpression="aql:'*'+ self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> @@ -60,7 +60,7 @@ </subItemMappings> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="PreconditionOnMappings" domainClass="EPackage"> - <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="<%$view.target[isAbstract]%>" semanticCandidatesExpression="feature:eContents"> + <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="aql:view.target->select(e | e.isAbstract)" semanticCandidatesExpression="feature:eContents"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/unit/tree/MappingBasedPartitionTests.java b/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/unit/tree/MappingBasedPartitionTests.java index eb59b9bbcb..73efffb3f2 100644 --- a/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/unit/tree/MappingBasedPartitionTests.java +++ b/plugins/org.eclipse.sirius.tests.tree/src/org/eclipse/sirius/tests/unit/tree/MappingBasedPartitionTests.java @@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; +import org.eclipse.sirius.common.tools.internal.interpreter.FeatureInterpreter; import org.eclipse.sirius.ecore.extender.business.api.accessor.ExtenderConstants; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ecore.extender.business.internal.accessor.ecore.EcoreIntrinsicExtender; import org.eclipse.sirius.ext.base.Options; -import org.eclipse.sirius.query.legacy.business.internal.interpreter.AcceleoExtendedInterpreter; import org.eclipse.sirius.tree.business.internal.dialect.common.viewpoint.GlobalContext; import org.eclipse.sirius.tree.business.internal.dialect.common.viewpoint.MappingBasedPartition; import org.junit.Assert; @@ -45,7 +45,7 @@ public class MappingBasedPartitionTests { accessor.addExtender(new EcoreIntrinsicExtender(), ExtenderConstants.HIGHEST_PRIORITY); accessor.init(set); - IInterpreter interpreter = new AcceleoExtendedInterpreter(); + IInterpreter interpreter = new FeatureInterpreter(); ctx = new GlobalContext(accessor, interpreter, null); |