diff options
| author | cbrun | 2015-12-23 16:23:50 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2015-12-29 14:23:53 +0000 |
| commit | e48e9bd394574444fb9df3f1e260cb0d6e2cf890 (patch) | |
| tree | d0ac6fa86e371f5b6f27478c646daf7f88fb3ebb | |
| parent | 672acad1a494ad9a59d07443786635ca61089960 (diff) | |
| download | org.eclipse.sirius-e48e9bd394574444fb9df3f1e260cb0d6e2cf890.tar.gz org.eclipse.sirius-e48e9bd394574444fb9df3f1e260cb0d6e2cf890.tar.xz org.eclipse.sirius-e48e9bd394574444fb9df3f1e260cb0d6e2cf890.zip | |
[478878] migrate legacy expressions in JUnit's odesign
Bug: 478878
Change-Id: Icc38e64ce58dc875137c1e01ce98898c5560859f
68 files changed, 2086 insertions, 2019 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/contents/t.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/contents/t.odesign index 19d4e5602d..eb01262b2e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/contents/t.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/contents/t.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/table/description/1.1.0" name="T" 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="T" version="10.1.0.201507271600"> <ownedViewpoints name="T"> <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="TD" domainClass="ecore.EPackage"> - <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eAllContents" headerLabelExpression="<%name%>"/> + <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eAllContents" headerLabelExpression="aql:self.name"/> <ownedColumnMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eAllContents"/> </ownedRepresentations> </ownedViewpoints> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/My.odesign index 166f36cf0e..803f433e4e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/My.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/My.odesign @@ -1,11 +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/tree/description/1.0.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/table/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/tree/description/1.0.0" version="10.1.3.201511131800"> <ownedViewpoints name="VP2726"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Table" domainClass="EPackage"> <ownedLineMappings name="Package" domainClass="EPackage"> <ownedSubLines name="Class" domainClass="EClass" semanticCandidatesExpression="feature:eContents"/> </ownedLineMappings> - <ownedColumnMappings name="Abstract" headerLabelExpression="Abstract" featureName="abstract" labelExpression="<%abstract%>" featureParentExpression="<%eSuperTypes.nFirst%>"/> + <ownedColumnMappings name="Abstract" headerLabelExpression="Abstract" featureName="abstract" labelExpression="aql:self.abstract" featureParentExpression="aql:self.eSuperTypes->first()"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:TreeDescription" name="Tree" domainClass="EPackage"> <subItemMappings name="Package" domainClass="EPackage"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/manual/VP-2793/VP-2793.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/manual/VP-2793/VP-2793.odesign index 5f30dfff95..e54c807a1d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/manual/VP-2793/VP-2793.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/manual/VP-2793/VP-2793.odesign @@ -1,24 +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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="VP-2793" 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-2793" version="10.1.0.201507271600"> <ownedViewpoints name="VP-2793" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="VP-2793_EditionTableDescription" domainClass="ecore.EPackage"> - <ownedLineMappings name="EClassLineMapping" domainClass="ecore.EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <foregroundConditionalStyle predicateExpression="<%abstract%>"> - <style labelSize="10" labelFormat="italic"> + <ownedLineMappings name="EClassLineMapping" domainClass="ecore.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="EPackageLineMapping" domainClass="ecore.EPackage" headerLabelExpression="<%name%>"> + <ownedLineMappings name="EPackageLineMapping" domainClass="ecore.EPackage" headerLabelExpression="aql:self.name"> <defaultBackground> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </defaultBackground> - <ownedSubLines name="Classes lines" domainClass="EClass" semanticCandidatesExpression="<%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="EClassLineCreationTool" forceRefresh="true" mapping="//@ownedViewpoints[name='VP-2793']/@ownedRepresentations[name='VP-2793_EditionTableDescription']/@ownedLineMappings[name='EClassLineMapping']"> + <ownedCreateLine name="EClassLineCreationTool" forceRefresh="true" elementsToSelect="service:stdEmptyCollection" mapping="//@ownedViewpoints[name='VP-2793']/@ownedRepresentations[name='VP-2793_EditionTableDescription']/@ownedLineMappings[name='EClassLineMapping']"> <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,8 +29,9 @@ </subModelOperations> </firstModelOperation> </ownedCreateLine> - <ownedColumnMappings name="NameColumnMapping" headerLabelExpression="Name" featureName="name" labelExpression="<%if (filter("EStructuralFeature").derived) {%>/<%}%><%name%>"/> + <ownedColumnMappings name="NameColumnMapping" headerLabelExpression="Name" featureName="name" labelExpression="aql: if self.derived then '/' + self.name else self.name endif"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="VP-2793_CrossTableDescription" domainClass="ecore.EPackage"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tc598.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tc598.odesign index 518391bf24..fcd0f16f22 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tc598.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tc598.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/table/description/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/table/description/1.1.0" version="10.1.3.201511131800"> <ownedViewpoints name="Table" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="TestColumnTable" domainClass="EPackage"> - <ownedLineMappings name="lines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="1-<%name%>"> - <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S1-<%name%>"/> - <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S2-<%name%>"/> - <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S3-<%name%>"/> + <ownedLineMappings name="lines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="aql:'1-' + self.name"> + <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S1-' + self.name"/> + <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S2-' + self.name"/> + <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S3-' + self.name"/> </ownedSubLines> - <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="2-<%name%>"/> + <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="aql:'2-' + self.name"/> </ownedLineMappings> <ownedColumnMappings name="Name" headerLabelExpression="Name" featureName="name"/> <ownedColumnMappings name="Name2" headerLabelExpression="Name2" featureName="name"/> @@ -16,28 +16,28 @@ <ownedColumnMappings name="Name4" headerLabelExpression="Name4" featureName="name"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="TestDomainCrossTable" domainClass="EPackage"> - <ownedLineMappings name="crossLines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="1-<%name%>"> - <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S1-<%name%>"/> - <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S2-<%name%>"/> - <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S3-<%name%>"/> + <ownedLineMappings name="crossLines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="aql:'1-' + self.name"> + <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S1-' + self.name"/> + <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S2-' + self.name"/> + <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S3-' + self.name"/> </ownedSubLines> - <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="2-<%name%>"/> + <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="aql:'2-' + self.name"/> </ownedLineMappings> <ownedColumnMappings name="crossColumn" domainClass="EClass"/> - <intersection name="intersect1" lineMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut2'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut3'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut2']" columnMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="<%self.eContainer("EClass")%>" lineFinderExpression="var:self" domainClass="EAttribute"/> + <intersection name="intersect1" lineMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut2'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut3'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut2']" columnMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestDomainCrossTable']/@ownedColumnMappings.0" labelExpression="X" useDomainClass="true" columnFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)" lineFinderExpression="var:self" domainClass="EAttribute"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:CrossTableDescription" name="TestNonDomainCrossTable" domainClass="EPackage"> - <ownedLineMappings name="crossLines" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> - <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="1-<%name%>"> - <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S1-<%name%>"/> - <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S2-<%name%>"/> - <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="S3-<%name%>"/> + <ownedLineMappings name="crossLines" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> + <ownedSubLines name="Attribut1" domainClass="EAttribute" headerLabelExpression="aql:'1-' + self.name"> + <ownedSubLines name="SousAttribut1" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S1-' + self.name"/> + <ownedSubLines name="SousAttribut2" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S2-' + self.name"/> + <ownedSubLines name="SousAttribut3" domainClass="EAttribute" semanticCandidatesExpression="var:self" headerLabelExpression="aql:'S3-' + self.name"/> </ownedSubLines> - <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="2-<%name%>"/> + <ownedSubLines name="Attribut2" domainClass="EAttribute" headerLabelExpression="aql:'2-' + self.name"/> </ownedLineMappings> <ownedColumnMappings name="crossColumn" domainClass="EClass"/> - <intersection name="intersect1" lineMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut2'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut3'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut2']" columnMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedColumnMappings.0" labelExpression="X" columnFinderExpression="<%self.eContainer("EClass")%>"/> + <intersection name="intersect1" lineMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut1'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut2'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut1']/@ownedSubLines[name='SousAttribut3'] //@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedLineMappings[name='crossLines']/@ownedSubLines[name='Attribut2']" columnMapping="//@ownedViewpoints[name='Table']/@ownedRepresentations[name='TestNonDomainCrossTable']/@ownedColumnMappings.0" labelExpression="X" columnFinderExpression="aql:self.eContainerOrSelf(ecore::EClass)"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2673/invalid_parent_expression.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2673/invalid_parent_expression.odesign index bc748dbbe3..f4e1d9e5e7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2673/invalid_parent_expression.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2673/invalid_parent_expression.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/table/description/1.1.0" name="invalid_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="invalid_parent_expression" version="10.1.0.201507271600"> <ownedViewpoints name="invalid_parent_expression"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="invalid_parent_expression" domainClass="ecore.EPackage"> - <ownedLineMappings name="Class" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eContents" headerLabelExpression="<%name%>"/> - <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="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.junit/data/table/unit/vp-2759/vp-2759.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2759/vp-2759.odesign index 0c0d2eda28..d0f24b5440 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2759/vp-2759.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/vp-2759/vp-2759.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/table/description/1.1.0" xmlns:tool="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/table/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="My" version="10.1.3.201511131800"> <ownedViewpoints name="vp-2759"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="vp-2759" domainClass="EClass"> - <ownedLineMappings name="Attribute" domainClass="EAttribute" semanticCandidatesExpression="<%eAttributes%>" headerLabelExpression="ATTRIBUTE"> - <ownedSubLines name="Reference" semanticElements="<%eKeys%>" domainClass="EReference" semanticCandidatesExpression="<%~eKeys%>" headerLabelExpression="->"> + <ownedLineMappings name="Attribute" domainClass="EAttribute" semanticCandidatesExpression="aql:self.eAttributes" headerLabelExpression="ATTRIBUTE"> + <ownedSubLines name="Reference" semanticElements="aql:self.eKeys" domainClass="EReference" semanticCandidatesExpression="aql:self.eInverse('eKeys')" headerLabelExpression="->"> <delete name="DeleteReference"> <variables name="element" documentation="The currently edited element."/> <variables name="root" documentation="The semantic element corresponding to the current table."/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign index 8900c9ade4..96635bb96d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/tree/unit/refresh/tree.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/tree/description/1.0.0" xmlns:description_2="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.0.0.201505222000"> +<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:description_2="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:TreeDescription" name="Tree" label="Tree" domainClass="EPackage"> <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']"> @@ -39,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"/> @@ -73,6 +73,7 @@ </subItemMappings> </ownedRepresentations> <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.ecore.design.service.EcoreService"/> + <ownedJavaExtensions qualifiedClassName="org.eclipse.sirius.common.tools.api.interpreter.StandardServices"/> </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="aql:'Documentation for ' + self.name + ' package'" domainClass="EPackage"> @@ -87,7 +88,7 @@ </ownedSubLines> </ownedLineMappings> <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="<%eContainer("EAnnotation").eContainer()%>" semanticCandidatesExpression="<%eAllContents("EAnnotation")[source=="http://www.eclipse.org/emf/2002/GenModel"].details[key=="documentation"]%>" domainClass="EStringToStringMapEntry"> + <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."/> @@ -104,12 +105,12 @@ <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: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"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/collapsefilter/collapse.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/collapsefilter/collapse.odesign index 79ef3c3a27..c988adeee1 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/collapsefilter/collapse.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/collapsefilter/collapse.odesign @@ -1,15 +1,15 @@ <?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" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="collapse" 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" name="collapse" version="10.1.3.201511131800"> <ownedViewpoints name="ECORE" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Node Class and Package Diagram with Ports" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="FilterPropertyStartingWithA"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Class']/@borderedNodeMappings[name='CPDP%20Property']" semanticConditionExpression="<%!(name.startsWith("a"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Class']/@borderedNodeMappings[name='CPDP%20Property']" semanticConditionExpression="aql:not (self.name.startsWith('a'))"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="FilterClassAndPackageStartingWithA"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Class'] //@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Package']" semanticConditionExpression="<%!(name.startsWith("a"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Class'] //@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@nodeMappings[name='CPDP%20Package']" semanticConditionExpression="aql:not (self.name.startsWith('a'))"/> </filters> - <nodeMappings name="CPDP Class" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> - <borderedNodeMappings name="CPDP Property" semanticCandidatesExpression="<%current.eAllContents[!startsWith("a")]%>" domainClass="EAttribute"> + <nodeMappings name="CPDP Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> + <borderedNodeMappings name="CPDP Property" semanticCandidatesExpression="aql:self.eAllContents()->select( e | not e.toString().startsWith('a'))" domainClass="EAttribute"> <style xsi:type="style:BundledImageDescription" 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']"/> @@ -22,7 +22,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <nodeMappings name="CPDP Package" detailDescriptions="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@toolSection/@ownedTools[name='New%20diagram']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="CPDP Package" detailDescriptions="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Node%20Class%20and%20Package%20Diagram%20with%20Ports']/@toolSection/@ownedTools[name='New%20diagram']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:BundledImageDescription" sizeComputationExpression="20"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -39,19 +39,19 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Container Class and Package Diagram with Ports" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="FilterPropertyStartingWithA"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']/@borderedNodeMappings[name='CCDP%20Property'] //@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']/@subNodeMappings[name='CCDP%20NodeProperty']/@borderedNodeMappings[name='CCDP%20NodeProperty%20BN']" semanticConditionExpression="<%!(name.startsWith("a"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']/@borderedNodeMappings[name='CCDP%20Property'] //@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']/@subNodeMappings[name='CCDP%20NodeProperty']/@borderedNodeMappings[name='CCDP%20NodeProperty%20BN']" semanticConditionExpression="aql:not (self.name.startsWith('a'))"/> </filters> <filters xsi:type="filter:CompositeFilterDescription" name="FilterClassStartingWithA"> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']" semanticConditionExpression="<%!(name.startsWith("a"))%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@containerMappings[name='CCPD%20Class']" semanticConditionExpression="aql:not (self.name.startsWith('a'))"/> </filters> - <nodeMappings name="CPDP Package" detailDescriptions="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@toolSection/@ownedTools[name='New%20diagram']" semanticCandidatesExpression="<%eContents().filter("EPackage")%>" domainClass="EPackage"> + <nodeMappings name="CPDP Package" detailDescriptions="//@ownedViewpoints[name='ECORE']/@ownedRepresentations[name='Container%20Class%20and%20Package%20Diagram%20with%20Ports']/@toolSection/@ownedTools[name='New%20diagram']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage"> <style xsi:type="style:BundledImageDescription" sizeComputationExpression="20"> <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> - <containerMappings name="CCPD Class" semanticCandidatesExpression="<%eContents().filter("EClass")%>" domainClass="EClass"> + <containerMappings name="CCPD Class" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <borderedNodeMappings name="CCDP Property" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> <style xsi:type="style:BundledImageDescription" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -61,19 +61,19 @@ </borderedNodeMappings> <subNodeMappings name="CCDP NodeProperty" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> <borderedNodeMappings name="CCDP NodeProperty BN" semanticCandidatesExpression="var:self" domainClass="EAttribute"> - <style xsi:type="style:BundledImageDescription" labelExpression="2-<%name%>" sizeComputationExpression="1" resizeKind="NSEW"> + <style xsi:type="style:BundledImageDescription" labelExpression="aql:'2-' + self.name" 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='orange']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" labelExpression="1-<%name%>" resizeKind="NSEW"> + <style xsi:type="style:SquareDescription" labelExpression="aql:'1-' + 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='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='gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/description.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/description.odesign index 318b781366..b9b00578e3 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/description.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/description.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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/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" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="description" version="10.1.3.201511131800"> <ownedViewpoints name="Test" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramDescription" initialisation="true" domainClass="EPackage"> <defaultLayer name="Default"> - <containerMappings name="EClassDescription_Mapping" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="EClassDescription_Mapping" 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='red']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/trac2085.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/trac2085.odesign index 71d0780273..85cec7a155 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/trac2085.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/componentization/trac2085.odesign @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" version="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="Interactions" modelFileExtension="interactions"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Participants" domainClass="Interaction"> <metamodel href="http://www.eclipse.org/sirius/sample/interactions#/"/> <defaultLayer name="Default"> - <containerMappings name="Participant CM" semanticCandidatesExpression="<%participants%>" domainClass="Participant"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="Participant CM" semanticCandidatesExpression="aql:self.participants" domainClass="Participant"> + <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']"/> @@ -19,8 +19,8 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Types" viewpointURI="viewpoint:/org.eclipse.sirius.tests.junit/Interactions" representationName="Participants"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <layers name="L2"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Participants extension" semanticCandidatesExpression="<%participants%>" domainClass="Participant" importedMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Participants']/@defaultLayer/@containerMappings[name='Participant%20CM']"> - <subNodeMappings name="Type" semanticCandidatesExpression="<%type%>" domainClass="EClass"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Participants extension" semanticCandidatesExpression="aql:self.participants" domainClass="Participant" importedMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Participants']/@defaultLayer/@containerMappings[name='Participant%20CM']"> + <subNodeMappings name="Type" semanticCandidatesExpression="aql:self.type" domainClass="EClass"> <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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign index e012bddd07..ba0967e2b7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/compositefilter/ticket2174/tc2174.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="description" version="10.0.0.201505222000"> +<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="description" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="2174
" name="tc2174" label="TC2174" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2174" label="tc2174" titleExpression="tc2174" domainClass="EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> @@ -28,7 +28,7 @@ </filters> <filters xsi:type="filter:CompositeFilterDescription" name="CollapseHideContentsCondition" label="Collapse attributes and hide references with condition"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='tc2174']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subNodeMappings[name='EReferenceMapping3']" semanticConditionExpression="aql:self.name <> 'activateHideRef'"/> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='tc2174']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="<%name != "activateCollapseAtt"%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2174']/@ownedRepresentations[name='tc2174']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="aql:self.name <> 'activateCollapseAtt'"/> </filters> <defaultLayer name="Default" label="default"> <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass"> @@ -53,7 +53,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </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']"/> @@ -89,7 +89,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EOperation" referenceName="eOperations"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="op<%$container.eOperations.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'op' + container.eOperations->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign index a45be559b3..91aa0a6109 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/editors/traceability/vp1038/vp1038.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: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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="TraceabilityTest" version="10.0.0.201505222000"> +<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:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="TraceabilityTest" version="10.1.3.201511131800"> <ownedViewpoints name="Traceability" modelFileExtension="ecore"> <validationSet> <ownedRules xsi:type="validation:SemanticValidationRule" level="WARNING" targetClass="EClass"> - <audits auditExpression="<%self.name != "A" && self.name != "myEClass"%>"/> + <audits auditExpression="aql:self.name <> 'A' and self.name <> 'myEClass'"/> </ownedRules> </validationSet> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Trace Diagram" domainClass="EPackage"> @@ -34,7 +34,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <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='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']"/> @@ -47,7 +47,7 @@ <ownedLineMappings domainClass="EPackage"> <ownedSubLines domainClass="EClass"> <ownedSubLines domainClass="EReference" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EReference)"> - <ownedSubLines domainClass="EAnnotation" semanticCandidatesExpression="<%eContents.filter("EAnnotation")%>"/> + <ownedSubLines domainClass="EAnnotation" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAnnotation)"/> </ownedSubLines> </ownedSubLines> </ownedLineMappings> @@ -72,7 +72,7 @@ <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="EAnnotation" domainClass="EAnnotation" semanticCandidatesExpression="<%eContents.filter("EAnnotation")%>"> + <subItemMappings name="EAnnotation" domainClass="EAnnotation" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAnnotation)"> <defaultStyle labelExpression="aql:self.source"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/gconf/gconf1.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/gconf/gconf1.odesign index c4c03f8df9..ef6b8d4ba1 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/gconf/gconf1.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/gconf/gconf1.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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="gconf1" 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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="gconf1" version="10.1.0.201507271600"> <ownedViewpoints name="GConf1" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DiagramOnModel" domainClass="Model"> <defaultLayer name="Default"> @@ -24,8 +24,8 @@ </defaultLayer> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="ArrayOnClass" domainClass="Class"> - <ownedLineMappings name="AOC_Attribute" domainClass="Property" headerLabelExpression="<%name%>"/> - <ownedColumnMappings name="AOC_Type" headerLabelExpression="Type" canEdit="false" featureName="type" labelExpression="<%name%>"/> + <ownedLineMappings name="AOC_Attribute" domainClass="Property" headerLabelExpression="aql:self.name"/> + <ownedColumnMappings name="AOC_Type" headerLabelExpression="Type" canEdit="false" featureName="type" labelExpression="aql:self.name"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/initialization/init.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/initialization/init.odesign index 0b56068836..b66d0f610f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/initialization/init.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/initialization/init.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" 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.0.201507271600"> <ownedViewpoints name="InitializationTest" modelFileExtension="uml" icon=""> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Tests the simple initialization" name="BasicInit" initialisation="true" domainClass="EPackage"/> </ownedViewpoints> <ownedViewpoints name="ThreeMappings" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Tests the simple initialization" name="BasicInit2" initialisation="true" domainClass="EPackage"> <nodeMappings name="map1" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> - <style xsi:type="style:SquareDescription" labelExpression="a" sizeComputationExpression="<%4%>"> + <style xsi:type="style:SquareDescription" labelExpression="a" 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='gray']"/> </style> </nodeMappings> <containerMappings name="map2" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> - <style xsi:type="style:ShapeContainerStyleDescription" labelExpression="b"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="b"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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> </containerMappings> <containerMappings name="map3" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:ShapeContainerStyleDescription" labelSize="6" labelExpression="tt"> + <style xsi:type="style:ShapeContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="6" labelExpression="tt"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign index 11a04934a8..c6f242cc95 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ValidateExpression.odesign @@ -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" 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.0.201507271600"> <ownedViewpoints> <ownedRepresentations xsi:type="description_1:DiagramDescription" domainClass=""> <defaultLayer name="Default"/> <additionalLayers name="Acceleo2"> - <nodeMappings name="AC2_InvalidExpressions" semanticCandidatesExpression="<%invalidExpression%>" semanticElements="<%anotherInvalid%>" domainClass="EClass"/> + <nodeMappings name="AC2_InvalidExpressions" semanticCandidatesExpression="aql:invalidExpression" semanticElements="aql:anotherInvalid" domainClass="EClass"/> </additionalLayers> <additionalLayers name="OCL"/> <additionalLayers name="Acceleo3"> 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 24b03549da..d17a8d8301 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign @@ -1,7 +1,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:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:description_3="http://www.eclipse.org/sirius/tree/description/1.0.0" xmlns:description_4="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" xmlns:validation="http://www.eclipse.org/sirius/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:description_4="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:filter="http://www.eclipse.org/sirius/diagram/description/filter/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" xmlns:validation="http://www.eclipse.org/sirius/description/validation/1.1.0" name="Ecore Editing Workbench V4.6" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="Provides graphical and tabular modelers to design an Ecore model." name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo2" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo2" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -12,68 +13,70 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="var:self" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <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%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <edgeMappings name="EC ESupertypes" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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,45 +84,46 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eAllContents("EReference"))%>" semanticElements="<%self + eOpposite%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%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}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true"> + <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']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <containerMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> <subNodeMappings name="EC EAttribute" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20EAttribute%20Name']" semanticCandidatesExpression="feature:eAllContents" domainClass="EAttribute"> - <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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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%20Acceleo2']/@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']"/> @@ -127,23 +131,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='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%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"> + <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="EC External EClass" semanticCandidatesExpression="<%allRoots.eAllContents("EClass") - eContents.filter("EClass")%>" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%name%> in <%eResourceName%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -157,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 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> @@ -166,7 +170,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> @@ -176,7 +180,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> @@ -196,7 +200,7 @@ <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -232,7 +236,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -243,7 +247,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -256,7 +260,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%20Acceleo2']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -281,7 +285,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> @@ -295,12 +299,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"> @@ -320,7 +324,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> @@ -330,8 +334,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> @@ -345,28 +349,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> @@ -384,35 +388,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> @@ -431,19 +435,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> @@ -459,8 +463,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%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> + <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']"/> @@ -468,7 +472,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <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']"/> @@ -482,12 +486,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%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -498,7 +502,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -507,7 +511,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%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@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%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo2']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -522,7 +526,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> @@ -534,7 +538,8 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo3" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20external%20package']" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="Entities Acceleo3" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/> </filters> @@ -545,71 +550,73 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%20Acceleo3']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%20Acceleo3']/@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%20Acceleo3']/@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%20Acceleo3']/@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%20Acceleo3']/@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%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']"> + <audits auditExpression="aql:self.target.eAllSuperTypes->size() < 4"/> </ownedRules> <ownedRules xsi:type="validation:SemanticValidationRule" targetClass="EClass"> <audits auditExpression="[eAttributes->size()>0/]"/> </ownedRules> </validationSet> <defaultLayer name="Default"> - <edgeMappings name="EC_EReference" preconditionExpression="<%!eOpposite%>" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="[self/]" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[self.eType/]" sourceFinderExpression="[eContainer(OclAny)/]" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <style sizeComputationExpression="1"> + <edgeMappings name="EC_EReference" preconditionExpression="aql:self.eOpposite = null" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='EReference%20Name']" semanticElements="[self/]" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[self.eType/]" sourceFinderExpression="[eContainer(OclAny)/]" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="[name/]"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> <conditionnalStyles predicateExpression="[containment and derived/]"> - <style sourceArrow="FillDiamond" targetArrow="NoDecoration" sizeComputationExpression="1"> + <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="[not(containment) and derived/]"> - <style sizeComputationExpression="1"> + <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"> + <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%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20ESuperType']" semanticCandidatesExpression="feature:eAllContents" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[eSuperTypes/]" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="tree"> + <style targetArrow="InputClosedArrow" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false" labelExpression="[name/]"> <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" labelExpression="[name/]"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -617,10 +624,10 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eAllContents("EReference"))%>" semanticElements="<%self + eOpposite%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[eType/]" sourceFinderExpression="[eContainer(OclAny)/]" targetExpression="" domainClass="EReference" useDomainElement="true"> - <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}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="[eType/]" sourceFinderExpression="[eContainer(OclAny)/]" targetExpression="" domainClass="EReference" useDomainElement="true"> + <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> @@ -640,22 +647,23 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="[name/]" tooltipExpression="[self.eContainer(EPackage).name + '.' + name/]" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="[name/]" tooltipExpression="[self.eContainer(EPackage).name + '.' + 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" labelExpression="[name/]" tooltipExpression="[self.eContainer(EPackage).name + '.' + name/]" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="[name/]" tooltipExpression="[self.eContainer(EPackage).name + '.' + 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%20Acceleo3']/@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%20Acceleo3']/@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%20Acceleo3']/@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']"/> @@ -663,23 +671,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='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%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"> + <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="EC External EClass" semanticCandidatesExpression="<%allRoots.eAllContents("EClass") - eContents.filter("EClass")%>" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%name%> in <%eResourceName%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -702,7 +710,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> @@ -712,7 +720,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> @@ -732,7 +740,7 @@ <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -768,7 +776,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop attribute" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -779,7 +787,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop operation" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -792,7 +800,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%20Acceleo3']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="New Package Entities" titleExpression="aql:self.name + ' package entities'" diagramDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -817,7 +825,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> @@ -831,12 +839,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"> @@ -856,7 +864,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> @@ -866,8 +874,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> @@ -881,28 +889,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> @@ -920,35 +928,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> @@ -967,19 +975,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> @@ -995,8 +1003,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%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" backgroundStyle="GradientTopToBottom"> + <containerMappings name="Design Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType']"> + <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']"/> @@ -1004,7 +1012,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" detailDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities']" createElements="false" domainClass="EPackage" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EClassifier%20into%20EPackage'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Drop%20EPackage%20into%20EPackage']" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package']"> - <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']"/> @@ -1018,12 +1026,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%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop EClassifier into EPackage" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EDataType'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@defaultLayer/@containerMappings[name='EC%20EEnum']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -1034,7 +1042,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop external package" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -1043,7 +1051,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%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@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%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities%20Acceleo3']/@additionalLayers[name='Package']/@containerMappings[name='Dropped%20Package']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -1058,7 +1066,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> @@ -1070,16 +1078,18 @@ </toolSections> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes Acceleo3" titleExpression="Classes in <%name%> package" domainClass="EPackage"> + <ownedRepresentations xsi:type="description_2:EditionTableDescription" endUserDocumentation="A tabular editor (spreadsheet-like) of the entities in an Ecore model." name="Classes Acceleo3" titleExpression="aql:'Classes in ' + self.name + ' package'" domainClass="EPackage"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <ownedLineMappings name="Classes lines" domainClass="EClass" semanticCandidatesExpression="[eClassifiers/]"> <foregroundConditionalStyle predicateExpression="[abstract/]"> - <style labelSize="10" labelFormat="italic"> + <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" semanticCandidatesExpression="[eStructuralFeatures/]"/> </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> @@ -1087,7 +1097,7 @@ <ownedSubLines name="Feature" domainClass="EStructuralFeature" semanticCandidatesExpression="[eStructuralFeatures/]"/> </ownedSubLines> </ownedLineMappings> - <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes%20Acceleo3']/@ownedLineMappings[name='Classes%20lines']"> + <ownedCreateLine name="Create Class" forceRefresh="true" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Classes%20Acceleo3']/@ownedLineMappings[name='Classes%20lines']" elementsToSelect="service:stdEmptyCollection"> <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."/> @@ -1097,47 +1107,51 @@ </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_3:TreeDescription" name="Classes Acceleo3 (Tree)" domainClass="EPackage"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <subItemMappings name="Class (TreeItem)" domainClass="EClass" semanticCandidatesExpression="[self.eClassifiers/]"> <defaultStyle labelExpression="[name/]"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> <conditionalStyles predicateExpression="[self.abstract/]"> - <style labelFormat="italic" labelExpression="[name/] [abstract]"> + <style labelExpression="[name/] [abstract]"> + <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']"/> </style> </conditionalStyles> </subItemMappings> </ownedRepresentations> - <ownedRepresentations xsi:type="description_4:SequenceDiagramDescription" name="Sequence Diagram" titleExpression="Sequence Diagram with Combined Fragments on <%name%>" domainClass="interactions.Interaction" endsOrdering="<%ends && $eventEnds%>"> + <ownedRepresentations xsi:type="description_4:SequenceDiagramDescription" name="Sequence Diagram" titleExpression="aql:'Sequence Diagram with Combined Fragments on ' + self.name" domainClass="interactions.Interaction" endsOrdering="aql:self.ends->size() > 0 and eventEnds->size() > 0"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> + <metamodel href="http://www.eclipse.org/sirius/sample/interactions#/"/> <defaultLayer name="Default"> <nodeMappings xsi:type="description_4:InstanceRoleMapping" name="Participant" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="[participants/]" semanticElements="[self/]" domainClass="interactions.Participant"> <borderedNodeMappings xsi:type="description_4:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="[self/]" semanticElements="var:self" domainClass="interactions.Participant" startingEndFinderExpression="[self/]" finishingEndFinderExpression="var:self"> - <borderedNodeMappings xsi:type="description_4:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="<%self + start + end + owner%>" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='State']" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%end%>"> + <borderedNodeMappings xsi:type="description_4:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="aql:OrderedSet{self, self.start, self.end, self.owner}" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@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"> <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:InterpolatedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Interpolated%20blue%20for%20Executions']"/> </style> </borderedNodeMappings> - <borderedNodeMappings xsi:type="description_4:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="<%self + start + end + owner%>" domainClass="interactions.State" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%end%>"> + <borderedNodeMappings xsi:type="description_4:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="aql:OrderedSet{self, self.start, self.end, self.owner}" domainClass="interactions.State" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.end"> <style xsi:type="style:EllipseNodeDescription" labelSize="15" showIcon="false" labelAlignment="LEFT" labelPosition="node" resizeKind="NORTH_SOUTH" horizontalDiameterComputationExpression="12" verticalDiameterComputationExpression="3"> <borderColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Skyblue']/@entries[name='Midnight_Skyblue']"/> <labelColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Greens']/@entries[name='Watery%20Green']"/> <color xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Skyblue']/@entries[name='High_Skyblue']"/> </style> </borderedNodeMappings> - <borderedNodeMappings xsi:type="description_4:EndOfLifeMapping" name="EOL" preconditionExpression="<%eContainer("Interaction").messages.filter("DestroyParticipantMessage").receivingEnd[context == current("Participant")]%>" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EndOfLife']" 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_4:EndOfLifeMapping" name="EOL" preconditionExpression="aql:self.eContainerOrSelf(interactions::Interaction).messages->filter(interactions::DestroyParticipantMessage).receivingEnd->select( e | e.context = self)->size() > 0" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EndOfLife']" 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_4: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_4: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']"/> @@ -1150,62 +1164,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="[name + ' : ' + 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_4:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="[sendingEnd/]" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_4:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="[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_4:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_4:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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_4:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CreateParticipantMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_4:CreationMessageMapping" name="Create Participant Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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_4:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.DestroyParticipantMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style lineStyle="dash" targetArrow="InputFillClosedArrow" sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_4:DestructionMessageMapping" name="Destroy Participant Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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_4:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>" invocationMessageFinderExpression="<%self.invocationMessage%>"> - <style lineStyle="dot"> + <edgeMappings xsi:type="description_4:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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_4:InteractionUseMapping" name="Interaction Use" preconditionExpression="<%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + interaction%>" domainClass="interactions.InteractionUse" startingEndFinderExpression="<%startingEnd%>" finishingEndFinderExpression="<%finish%>" coveredLifelinesExpression="<%coveredParticipants%>" centerLabelExpression="call(<%interaction.name%>)"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%type%>" labelAlignment="LEFT"> + <containerMappings xsi:type="description_4:InteractionUseMapping" name="Interaction Use" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + Sequence{self.interaction}" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finish" 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']"/> @@ -1213,16 +1228,16 @@ <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> </style> </containerMappings> - <containerMappings xsi:type="description_4:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="<%coveredParticipants.nSize > 0%>" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self%" domainClass="interactions.CombinedFragment" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%finish%>" coveredLifelinesExpression="<%coveredParticipants%>"> - <subContainerMappings xsi:type="description_4:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="<%ownedOperands%>" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="[<%name%>]" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> + <containerMappings xsi:type="description_4:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" 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_4:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false" labelExpression="[<%name%>]" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/> <labelColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']"/> <backgroundColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> <foregroundColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </style> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="<%operator%>" labelAlignment="LEFT"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false" labelExpression="aql:self.operator" labelAlignment="LEFT"> <borderColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/> <labelColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']"/> <backgroundColor xsi:type="description:InterpolatedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"/> @@ -1237,7 +1252,7 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Participant" referenceName="participants"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="newParticipant<%eContainer("Interaction").participants.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'newParticipant' + self.eContainerOrSelf(interactions::Interaction).participants->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1263,17 +1278,17 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eContainer("interactions.Interaction")%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> - <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="<%$newExecution.owner%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> - <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="<%$newExecution.owner%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newExecution"> <subModelOperations xsi:type="tool:SetValue" featureName="start" valueExpression="var:startingEnd"/> @@ -1283,23 +1298,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newExecution"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.0/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:startingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:finishingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="finish_<%execution.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -1313,13 +1328,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%start%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.start"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%end%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.end"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -1335,7 +1350,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -1353,23 +1368,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%$newMessage.sendingEnd%>"/> + <parameters name="predecessor" value="aql:newMessage.sendingEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m_create<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1382,7 +1397,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -1400,23 +1415,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1429,13 +1444,13 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Write Feature Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage"> - <subModelOperations xsi:type="tool:SetValue" featureName="isWrite" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="isWrite" valueExpression="aql:true"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -1453,23 +1468,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1482,10 +1497,10 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> @@ -1504,23 +1519,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1533,7 +1548,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -1551,23 +1566,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m_return<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1579,11 +1594,11 @@ <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="var:arg0"/> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%sendingEnd%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%$0%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.sendingEnd"> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%receivingEnd%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%$0%>"/> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.receivingEnd"> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1594,13 +1609,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%sendingEnd%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.execution == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.sendingEnd"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.execution = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%receivingEnd%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.execution == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.receivingEnd"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.execution = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -1614,48 +1629,48 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:callMsg"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newExecution"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg"> <subModelOperations xsi:type="tool:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:returnMsg"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m_return<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:returnMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="finish_<%execution.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:returnMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:callMsg"> <subModelOperations xsi:type="tool:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/> @@ -1673,13 +1688,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startExec"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> @@ -1713,31 +1728,31 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:callMsg"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newExecution"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec"> <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec"> <subModelOperations xsi:type="tool:SetValue" featureName="execution" valueExpression="var:newExecution"/> @@ -1755,13 +1770,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startExec"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> @@ -1786,7 +1801,7 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$source.eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:source.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> @@ -1805,23 +1820,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%$newMessage.sendingEnd%>"/> + <parameters name="predecessor" value="aql:newMessage.sendingEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="m_destroy<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1834,22 +1849,22 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="IU creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU"> - <subModelOperations xsi:type="tool:SetValue" featureName="type" valueExpression="ref.<%eContainer.eContents.filter("InteractionUse").nSize%>"/> - <subModelOperations xsi:type="tool:SetValue" featureName="interaction" valueExpression="<%eContainer("Interaction")%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/> + <subModelOperations xsi:type="tool:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/> <subModelOperations xsi:type="tool:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%$instance.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newIU"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="finish_<%$instance.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newIU"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newIU"> @@ -1860,13 +1875,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newIU"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/> @@ -1891,10 +1906,10 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%start%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.start"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%finish%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.finish"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> <subModelOperations xsi:type="tool:RemoveElement"/> @@ -1907,28 +1922,28 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="CF creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF"> - <subModelOperations xsi:type="tool:SetValue" featureName="operator" valueExpression="alt.<%eContainer.eContents.filter("CombinedFragment").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="operator" valueExpression="aql:'alt.' + self.eContainer().eContents()->filter(interactions::CombinedFragment)->size()"/> <subModelOperations xsi:type="tool:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand"> <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="condition1"/> </subModelOperations> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%$newCF.operator%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newCF"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="finish_<%$newCF.operator%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newCF"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%$newOperand.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newOperand"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newCF"> @@ -1942,19 +1957,19 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishCF"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:newOpEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startCF"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1975,25 +1990,25 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$element.deleteCombinedFragment()%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_2:OperandCreationTool" name="Operand" precondition="<%$source!=null && $target!=null && $sourceView!=null && $targetView!=null $startingEndPredecessor !=null && $finishingEndPredecessor !=null %>" containerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@containerMappings[name='Combined%20Fragment']/@subContainerMappings[name='Operand']"> + <ownedTools xsi:type="tool_2:OperandCreationTool" name="Operand" precondition="aql:source<>null and target<>null and sourceView<>null and targetView<>null startingEndPredecessor <>null and finishingEndPredecessor <>null " containerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@containerMappings[name='Combined%20Fragment']/@subContainerMappings[name='Operand']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Operand Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$container.eContainer("CombinedFragment")%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::CombinedFragment)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="condition.<%eContainer.ownedOperands.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'condition.' + self.eContainer().ownedOperands->size()"/> </subModelOperations> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%$newOperand.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="var:newOperand"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newOperand"> @@ -2003,13 +2018,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:newOpEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%$newOperand.eContainer%>"/> + <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/> <parameters name="referenceName" value="ownedOperands"/> <parameters name="element" value="var:newOperand"/> - <parameters name="predecessor" value="<%(($newOperand.start.precedingSibling.nReverse.filter("OperandEnd") && $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/> + <parameters name="predecessor" value="aql:((newOperand.start.precedingSiblings()->reverse()->filter(interactions::OperandEnd)->asSet()->intersection(newOperand.eContainer().ownedOperands.start)->first())).owner"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -2030,7 +2045,7 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$element.deleteOperand()%>"/> + <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:element.deleteOperand()"/> </initialOperation> </ownedTools> </subSections> @@ -2043,19 +2058,19 @@ <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Execution creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eContainer("interactions.Interaction")%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState"> <subModelOperations xsi:type="tool:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="state" valueExpression="var:newState"/> - <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="<%$newState.owner%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="aql:newState.owner"/> </subModelOperations> <subModelOperations xsi:type="tool:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd"> <subModelOperations xsi:type="tool:SetValue" featureName="state" valueExpression="var:newState"/> - <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="<%$newState.owner%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="context" valueExpression="aql:newState.owner"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newState"> <subModelOperations xsi:type="tool:SetValue" featureName="start" valueExpression="var:startingEnd"/> @@ -2065,23 +2080,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:newState"> <subModelOperations xsi:type="tool:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="s<%eContainer("Interaction").states.nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:startingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="start_<%state.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'start_' + self.state.name"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:finishingEnd"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="finish_<%state.name%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'finish_' + self.state.name"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -2101,13 +2116,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%start%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.start"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%end%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.end"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -2122,118 +2137,118 @@ <finishingEndPredecessorAfter name="finishingEndPredecessorAfter"/> <onEventMovedOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("Execution")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(Execution)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.end%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.end"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="executions"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.ExecutionEnd")[current.execution.start == current].nLast.execution%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::ExecutionEnd)->select(current | current.execution.start = current)->last().execution"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("State")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(State)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.end%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.end"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="states"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.StateEnd")[current.state.start == current].nLast.state%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::StateEnd)->select(current | current.state.start = current)->last().state"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("Message")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(Message)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.sendingEnd%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.sendingEnd"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.receivingEnd%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.receivingEnd"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="messages"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.sendingEnd.precedingSibling.filter("interactions.MessageEnd")[current.message.receivingEnd == current].nLast.message%>"/> + <parameters name="predecessor" value="aql:self.sendingEnd.precedingSiblings()->filter(interactions::MessageEnd)->select(current | current.message.receivingEnd = current)->last().message"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("InteractionUse")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.finish%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.finish"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="interactionUses"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.InteractionUseEnd")[current.owner.start == current].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::InteractionUseEnd)->select(current| current.owner.start = current)->last().owner"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("CombinedFragment")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.finish%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.finish"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="combinedFragments"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.CombinedFragmentEnd")[current.owner.start == current].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::CombinedFragmentEnd)->select(current | current.owner.start = current)->last().owner"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%self.filter("Operand")%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.oclIsKindOf(Operand)"> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("CombinedFragment")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/> <parameters name="referenceName" value="ownedOperands"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.OperandEnd")[current.owner.start == current && current(1).eContainer("interactions.CombinedFragment") == current().owner.eContainer("interactions.CombinedFragment")].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::OperandEnd)->select(op | op.owner.start = op and self.eContainerOrSelf(interactions::CombinedFragment) = op.owner.eContainerOrSelf(interactions::CombinedFragment))->last().owner)"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -2244,9 +2259,10 @@ </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> <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.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign index 47bfdcc5dc..a3152feb62 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.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" 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:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.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" 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:tool_2="http://www.eclipse.org/sirius/diagram/sequence/description/tool/2.0.0" name="Interaction" version="10.1.3.201511131800"> <ownedViewpoints name="Interactions" 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 && $eventEnds%>"> + <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->size() > 0 and eventEnds->size() > 0"> <defaultLayer name="Default"> <nodeMappings xsi:type="description_1:InstanceRoleMapping" name="Participant" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Edit%20Participant']" semanticCandidatesExpression="[participants/]" semanticElements="[self/]" domainClass="interactions.Participant"> <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Lifeline" semanticCandidatesExpression="[self/]" semanticElements="var:self" domainClass="interactions.Participant" startingEndFinderExpression="var:self" finishingEndFinderExpression="var:self"> - <borderedNodeMappings xsi:type="description_1:ExecutionMapping" name="Execution" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="<%self + start + end + owner%>" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.1/@ownedTools[name='Delete%20Execution']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(Execution).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(Execution).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(Execution).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(ExecutionEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(ExecutionEnd).execution)->asSet()" semanticElements="aql:OrderedSet{self, self.start, self.end, self.owner}" domainClass="interactions.Execution" reusedBorderedNodeMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="<%self + start + end + owner%>" domainClass="interactions.State" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%end%>"> + <borderedNodeMappings xsi:type="description_1:StateMapping" name="State" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Delete%20State']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.5/@ownedTools[name='Edit%20State']" semanticCandidatesExpression="ocl: let owner_ : Participant = if self.oclIsKindOf(Participant) then self.oclAsType(Participant) else self.oclAsType(State).owner.oclAsType(Participant) endif in let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = owner_ ) in let filteredEnds : Sequence(AbstractEnd) = if self.oclIsTypeOf(Participant) then _ends else let firstIndex : Integer = _ends->indexOf(self.oclAsType(State).start) in let lastIndex : Integer = _ends->indexOf(self.oclAsType(State).end) in if ((lastIndex-1)>=(firstIndex+1) and not firstIndex.oclIsInvalid() and not lastIndex.oclIsInvalid()) then _ends->subSequence(firstIndex+1, lastIndex-1) else _ends->select(false) endif endif in filteredEnds->select(end : AbstractEnd | end.oclIsKindOf(StateEnd))->collect(execEnd : AbstractEnd | execEnd.oclAsType(StateEnd).state)->asSet()" semanticElements="aql:OrderedSet{self, self.start, self.end, self.owner}" 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")]%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EndOfLife']" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.0/@ownedTools[name='Delete%20EndOfLife']" 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="[name/] : [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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.FeatureAccessMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Feature Access Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.CallMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings xsi:type="description_1:BasicMessageMapping" name="Call Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.receivingEnd._context) in let indexOfReceivingEnd : Integer = _ends->indexOf(self.receivingEnd) in if (indexOfReceivingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfReceivingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.receivingEnd._context else executionOnTarget endif else self.receivingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Edit%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="<%messages%>" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" domainClass="interactions.ReturnMessage" useDomainElement="true" sendingEndFinderExpression="<%sendingEnd%>" receivingEndFinderExpression="<%receivingEnd%>" invocationMessageFinderExpression="<%self.invocationMessage%>"> - <style lineStyle="dot"> + <edgeMappings xsi:type="description_1:ReturnMessageMapping" name="Return Message" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20Message']" semanticCandidatesExpression="aql:self.messages" semanticElements="ocl: Sequence{self, self.sendingEnd, self.receivingEnd, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif, let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif}" sourceMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetMapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline'] //@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='Execution']" targetFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.recevingEnd._context) in let indexOfRecevingEnd : Integer = _ends->indexOf(self.recevingEnd) in if (indexOfRecevingEnd > 1) then let executionOnTarget : Execution = _ends->subSequence(1, indexOfRecevingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnTarget.oclIsInvalid() then self.RecevingEnd._context else executionOnTarget endif else self.recevingEnd._context endif" sourceFinderExpression="ocl: let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e._context = self.sendingEnd._context) in let indexOfSendingEnd : Integer = _ends->indexOf(self.sendingEnd) in if (indexOfSendingEnd > 1) then let executionOnSource : Execution = _ends->subSequence(1, indexOfSendingEnd-1)->select(ae : AbstractEnd | ae.oclIsKindOf(ExecutionEnd))->last().oclAsType(ExecutionEnd).execution in if executionOnSource.oclIsInvalid() then self.sendingEnd._context else executionOnSource endif else self.sendingEnd._context endif" 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%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self + interaction%>" domainClass="interactions.InteractionUse" startingEndFinderExpression="<%startingEnd%>" finishingEndFinderExpression="<%finish%>" 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()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Delete%20Interaction%20Use']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.3/@ownedTools[name='Edit%20IU%20Label']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:Sequence{self} + Sequence{self.interaction}" domainClass="interactions.InteractionUse" startingEndFinderExpression="aql:self.startingEnd" finishingEndFinderExpression="aql:self.finish" 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%>" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%self%" domainClass="interactions.CombinedFragment" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="<%finish%>" coveredLifelinesExpression="<%coveredParticipants%>"> - <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="<%ownedOperands%>" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="<%start%>" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> - <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()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" 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" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> + <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> @@ -111,7 +112,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Participant" referenceName="participants"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="newParticipant<%eContainer("Interaction").participants.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'newParticipant' + self.eContainerOrSelf(interactions::Interaction).participants->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -137,17 +138,17 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer("interactions.Interaction")%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="startingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="<%$newExecution.owner%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="finishingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="<%$newExecution.owner%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newExecution.owner"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution"> <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/> @@ -157,23 +158,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new execution position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.0/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_<%execution.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -187,13 +188,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%start%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%end%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -209,7 +210,7 @@ <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="interactions.CreateParticipantMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -227,23 +228,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%$newMessage.sendingEnd%>"/> + <parameters name="predecessor" value="aql:newMessage.sendingEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_create<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_create' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -256,7 +257,7 @@ <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="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -274,23 +275,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new read message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -303,13 +304,13 @@ <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:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Write Feature Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.FeatureAccessMessage" referenceName="messages" variableName="newMessage"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="<%true%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="isWrite" valueExpression="aql:true"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -327,23 +328,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new write message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -356,10 +357,10 @@ <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:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> @@ -378,23 +379,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -407,7 +408,7 @@ <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="interactions.ReturnMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:newMessage"/> @@ -425,23 +426,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new return message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -453,11 +454,11 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%sendingEnd%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%$0%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_' + arg0"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%receivingEnd%>"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%$0%>"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd"> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + arg0"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -468,13 +469,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%sendingEnd%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.execution == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.sendingEnd"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.execution = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%receivingEnd%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.execution == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.receivingEnd"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.execution = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -488,48 +489,48 @@ <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:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ReturnMessage" referenceName="messages" variableName="returnMsg"> <subModelOperations xsi:type="tool_1:SetValue" featureName="invocationMessage" valueExpression="var:callMsg"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:returnMsg"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_return<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_return' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="endExec"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_<%execution.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="receivingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:returnMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg"> <subModelOperations xsi:type="tool_1:SetValue" featureName="sendingEnd" valueExpression="var:sendingEnd"/> @@ -547,13 +548,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startExec"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> @@ -587,31 +588,31 @@ <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:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Call Message Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CallMessage" referenceName="messages" variableName="callMsg"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:callMsg"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Execution" referenceName="executions" variableName="newExecution"> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newExecution"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="e<%eContainer("Interaction").executions.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'e' + self.eContainerOrSelf(interactions::Interaction).executions->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MixEnd" referenceName="ends" variableName="startExec"> <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="ocl: if $source.oclIsTypeOf(Participant) then $source else if $source.oclIsTypeOf(Execution) then $source.oclAsType(Execution).owner else null endif endif"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="message" valueExpression="var:callMsg"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%execution.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_'+self.execution.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.ExecutionEnd" referenceName="ends" variableName="endExec"> <subModelOperations xsi:type="tool_1:SetValue" featureName="execution" valueExpression="var:newExecution"/> @@ -629,13 +630,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startExec"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sendingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move endExec" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> @@ -660,7 +661,7 @@ <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:CreateView" mapping="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@nodeMappings[name='Participant']/@borderedNodeMappings[name='Lifeline']/@borderedNodeMappings[name='EOL']" containerViewExpression="var:targetView"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.DestroyParticipantMessage" referenceName="messages" variableName="newMessage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.MessageEnd" referenceName="ends" variableName="sendingEnd"> @@ -679,23 +680,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:sendingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receivingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:receivingEnd"/> - <parameters name="predecessor" value="<%$newMessage.sendingEnd%>"/> + <parameters name="predecessor" value="aql:newMessage.sendingEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newMessage"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new call message position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.2/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="m_destroy<%eContainer("Interaction").messages.nSize %>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'m_destroy' + self.eContainerOrSelf(interactions::Interaction).messages->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:sendingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="send_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'send_'+ self.message.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:receivingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="receive_<%message.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'receive_' + self.message.name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -708,22 +709,22 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="IU creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUse" referenceName="interactionUses" variableName="newIU"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="ref.<%eContainer.eContents.filter("InteractionUse").nSize%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="<%eContainer("Interaction")%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="type" valueExpression="aql:'ref.' + self.eContainer().eContents()->filter(InteractionUse)->size()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="interaction" valueExpression="aql:self.eContainerOrSelf(Interaction)"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="startingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%$instance.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + instance.name"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.InteractionUseEnd" referenceName="ends" variableName="finishingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_<%$instance.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + instance.name"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newIU"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU"> @@ -734,13 +735,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newIU"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust interaction use position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.3/@subModelOperations.2"/> @@ -765,10 +766,10 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%start%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%finish%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.finish"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> <subModelOperations xsi:type="tool_1:RemoveElement"/> @@ -781,28 +782,28 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="CF creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragment" referenceName="combinedFragments" variableName="newCF"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="alt.<%eContainer.eContents.filter("CombinedFragment").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="operator" valueExpression="aql:'alt.' + self.eContainer().eContents()->filter(interactions::CombinedFragment)->size()"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="coveredParticipants" valueExpression="var:coverage"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="condition1"/> </subModelOperations> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="startCF"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%$newCF.operator%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' +newCF.operator"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.CombinedFragmentEnd" referenceName="ends" variableName="finishCF"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_<%$newCF.operator%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' +newCF.operator"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newCF"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%$newOperand.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newCF"> @@ -816,19 +817,19 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishCF"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move newOpEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:newOpEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startCF" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startCF"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -849,25 +850,25 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.deleteCombinedFragment()%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteCombinedFragment()"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_2:OperandCreationTool" name="Operand" precondition="<%$source!=null && $target!=null && $sourceView!=null && $targetView!=null $startingEndPredecessor !=null && $finishingEndPredecessor !=null %>" containerMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@containerMappings[name='Combined%20Fragment']/@subContainerMappings[name='Operand']"> + <ownedTools xsi:type="tool_2:OperandCreationTool" name="Operand" precondition="aql:source<>null and target<>null and sourceView<>null and targetView<>null startingEndPredecessor <>null and finishingEndPredecessor <>null " containerMappings="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@containerMappings[name='Combined%20Fragment']/@subContainerMappings[name='Operand']"> <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer("Interaction")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(Interaction)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Operand Creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$container.eContainer("CombinedFragment")%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:container.eContainerOrSelf(interactions::CombinedFragment)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.Operand" referenceName="ownedOperands" variableName="newOperand"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="condition.<%eContainer.ownedOperands.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'condition.' + self.eContainer().ownedOperands->size()"/> </subModelOperations> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.OperandEnd" referenceName="ends" variableName="newOpEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%$newOperand.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + newOperand.name"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="var:newOperand"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newOperand"> @@ -877,13 +878,13 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:newOpEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move operand" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%$newOperand.eContainer%>"/> + <parameters name="referenceOwner" value="aql:newOperand.eContainer()"/> <parameters name="referenceName" value="ownedOperands"/> <parameters name="element" value="var:newOperand"/> - <parameters name="predecessor" value="<%(($newOperand.start.precedingSibling.nReverse.filter("OperandEnd") && $newOperand.eContainer.ownedOperands.start).nFirst).owner%>"/> + <parameters name="predecessor" value="aql:((newOperand.start.precedingSiblings()->reverse()->filter(interactions::OperandEnd)->asSet()->intersection(newOperand.eContainer().ownedOperands.start)->first())).owner"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -904,7 +905,7 @@ <elementView name="elementView"/> <containerView name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.deleteOperand()%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.deleteOperand()"/> </initialOperation> </ownedTools> </subSections> @@ -917,19 +918,19 @@ <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Show variables" id="org.eclipse.sirius.business.api.action.printVariables"> <parameters name="title" value="Execution creation"/> - <parameters name="enabled" value="<%false%>"/> + <parameters name="enabled" value="aql:false"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%eContainer("interactions.Interaction")%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eContainerOrSelf(interactions::Interaction)"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.State" referenceName="states" variableName="newState"> <subModelOperations xsi:type="tool_1:SetValue" featureName="owner" valueExpression="ocl: if $container.oclIsTypeOf(Participant) then $container else if $container.oclIsTypeOf(Execution) then $container.oclAsType(Execution).owner else null endif endif"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="startingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="<%$newState.owner%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/> </subModelOperations> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="interactions.StateEnd" referenceName="ends" variableName="finishingEnd"> <subModelOperations xsi:type="tool_1:SetValue" featureName="state" valueExpression="var:newState"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="<%$newState.owner%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="context" valueExpression="aql:newState.owner"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState"> <subModelOperations xsi:type="tool_1:SetValue" featureName="start" valueExpression="var:startingEnd"/> @@ -939,23 +940,23 @@ <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:finishingEnd"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessor){%><%$finishingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:finishingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move startingEnd" icon="" id="org.eclipse.sirius.business.api.action.moveElement"> <parameters name="referenceOwner" value="var:self"/> <parameters name="referenceName" value="ends"/> <parameters name="element" value="var:startingEnd"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessor){%><%$startingEndPredecessor.semanticEnd%><%}%>"/> + <parameters name="predecessor" value="aql:startingEndPredecessor.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:newState"> <subModelOperations xsi:type="tool_1:ExternalJavaActionCall" name="Adjust new state position" action="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.6/@ownedTools[name='Reorder%20Executions%2C%20States%20Messages%2C%20InteractionUses']/@onEventMovedOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.2"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="s<%eContainer("Interaction").states.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="'s' + self.eContainerOrSelf(interactions::Interaction).states->size()"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:startingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="start_<%state.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'start_' + self.state.name"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:finishingEnd"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="finish_<%state.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'finish_' + self.state.name"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -975,13 +976,13 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%start%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.start"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%end%>"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%filter("MixEnd").nSize == 0 ||filter("MixEnd").nSize != 0 && current.message == null%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.end"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:not self.oclIsKindOf(interactions::MixEnd) or (self.oclIsKindOf(interactions::MixEnd) and self.message = null)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> </subModelOperations> @@ -996,118 +997,118 @@ <finishingEndPredecessorAfter name="finishingEndPredecessorAfter"/> <onEventMovedOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("Execution")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Execution)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.end%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.end"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust execution position 2" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="executions"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.ExecutionEnd")[current.execution.start == current].nLast.execution%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::ExecutionEnd)->select(current | current.execution.start = current)->last().execution"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("State")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(State)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.end%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.end"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust state position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="states"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.StateEnd")[current.state.start == current].nLast.state%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::StateEnd)->select(current | current.state.start = current)->last().state"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("Message")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Message)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move sending end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.sendingEnd%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.sendingEnd"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move receiving end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.receivingEnd%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.receivingEnd"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust message position 2" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="messages"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.sendingEnd.precedingSibling.filter("interactions.MessageEnd")[current.message.receivingEnd == current].nLast.message%>"/> + <parameters name="predecessor" value="aql:self.sendingEnd.precedingSiblings()->filter(interactions::MessageEnd)->select(current | current.message.receivingEnd = current)->last().message"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("InteractionUse")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(InteractionUse)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.finish%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.finish"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Interaction Use position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="interactionUses"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.InteractionUseEnd")[current.owner.start == current].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::InteractionUseEnd)->select(current| current.owner.start = current)->last().owner"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("CombinedFragment")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(CombinedFragment)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move finish end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.finish%>"/> - <parameters name="predecessor" value="<%if ($finishingEndPredecessorAfter){%><%$finishingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.finish"/> + <parameters name="predecessor" value="aql:finishingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust CombinedFragment position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="combinedFragments"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.CombinedFragmentEnd")[current.owner.start == current].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::CombinedFragmentEnd)->select(current | current.owner.start = current)->last().owner"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%self.filter("Operand")%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.oclIsKindOf(Operand)"> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Move start end" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("Interaction")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainerOrSelf(Interaction)"/> <parameters name="referenceName" value="ends"/> - <parameters name="element" value="<%self.start%>"/> - <parameters name="predecessor" value="<%if ($startingEndPredecessorAfter){%><%$startingEndPredecessorAfter.semanticEnd%><%}%>"/> + <parameters name="element" value="aql:self.start"/> + <parameters name="predecessor" value="aql:startingEndPredecessorAfter.semanticEnd"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="Adjust Operand position" id="org.eclipse.sirius.business.api.action.moveElement"> - <parameters name="referenceOwner" value="<%eContainer("CombinedFragment")%>"/> + <parameters name="referenceOwner" value="aql:self.eContainer(CombinedFragment)"/> <parameters name="referenceName" value="ownedOperands"/> <parameters name="element" value="var:self"/> - <parameters name="predecessor" value="<%self.start.precedingSibling.filter("interactions.OperandEnd")[current.owner.start == current && current(1).eContainer("interactions.CombinedFragment") == current().owner.eContainer("interactions.CombinedFragment")].nLast.owner%>"/> + <parameters name="predecessor" value="aql:self.start.precedingSiblings()->filter(interactions::OperandEnd)->select(op | op.owner.start = op and self.eContainerOrSelf(interactions::CombinedFragment) = op.owner.eContainerOrSelf(interactions::CombinedFragment))->last().owner)"/> </subModelOperations> </subModelOperations> </firstModelOperations> @@ -1130,7 +1131,7 @@ <entries xsi:type="description:UserFixedColor" red="126" green="206" blue="202" name="Seabluff"/> <entries xsi:type="description:UserFixedColor" red="160" green="222" blue="214" name="Paleolitico"/> <entries xsi:type="description:UserFixedColor" red="199" green="237" blue="232" name="Glint on the ocean"/> - <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="<%computeExecutionDepth()%>"> + <entries xsi:type="description:InterpolatedColor" name="Interpolated blue for Executions" colorValueComputationExpression="aql:self.computeExecutionDepth()"> <colorSteps associatedValue="0" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Glint%20on%20the%20ocean']"/> <colorSteps associatedValue="10" associatedColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/> </entries> @@ -1140,7 +1141,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.junit/data/unit/layers/MultipleMappingImport.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/MultipleMappingImport.odesign index a65b171618..5049a0b9b7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/MultipleMappingImport.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/MultipleMappingImport.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" 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="MultipleMappingImport" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <nodeMappings name="DefaultNode" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> <style xsi:type="style:SquareDescription"> @@ -12,7 +12,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="alpha"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaNode" preconditionExpression="<%name=="ALPHA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram']/@defaultLayer/@nodeMappings[name='DefaultNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaNode" preconditionExpression="aql:self.name = 'ALPHA'" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram']/@defaultLayer/@nodeMappings[name='DefaultNode']"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -21,7 +21,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="beta"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaNode" preconditionExpression="<%name=="BETA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram']/@defaultLayer/@nodeMappings[name='DefaultNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaNode" preconditionExpression="aql:self.name = 'BETA'" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram']/@defaultLayer/@nodeMappings[name='DefaultNode']"> <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']"/> @@ -30,10 +30,10 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_ContainerMappingImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_ContainerMappingImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> - <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,8 +42,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="alpha"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" preconditionExpression="<%name=="ALPHA_CONTAINER"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" preconditionExpression="aql:self.name='ALPHA_CONTAINER'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> + <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']"/> @@ -52,8 +52,8 @@ </containerMappings> </additionalLayers> <additionalLayers name="beta"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" preconditionExpression="<%name=="BETA_CONTAINER"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" preconditionExpression="aql:self.name='BETA_CONTAINER'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> + <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='red']"/> @@ -62,7 +62,7 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <nodeMappings name="DefaultNode" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <style xsi:type="style:SquareDescription"> @@ -91,10 +91,10 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_ContainerMappingImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_ContainerMappingImportDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> - <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']"/> @@ -104,7 +104,7 @@ </defaultLayer> <additionalLayers name="alpha"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnum" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='DC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <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='green']"/> @@ -114,7 +114,7 @@ </additionalLayers> <additionalLayers name="beta"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='DC_ContainerMappingImportDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <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='red']"/> @@ -123,7 +123,7 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <nodeMappings name="DefaultNode" domainClass="EClass"> <style xsi:type="style:SquareDescription"> @@ -134,7 +134,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="alpha"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaNode" preconditionExpression="<%name=="ALPHA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram_WithHideSubMapping']/@defaultLayer/@nodeMappings[name='DefaultNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaNode" preconditionExpression="aql:self.name = 'ALPHA'" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram_WithHideSubMapping']/@defaultLayer/@nodeMappings[name='DefaultNode']"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -143,7 +143,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="beta"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaNode" preconditionExpression="<%name=="BETA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram_WithHideSubMapping']/@defaultLayer/@nodeMappings[name='DefaultNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaNode" preconditionExpression="aql:self.name = 'BETA'" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeImportDiagram_WithHideSubMapping']/@defaultLayer/@nodeMappings[name='DefaultNode']"> <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']"/> @@ -152,10 +152,10 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_ContainerMappingImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_ContainerMappingImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> - <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']"/> @@ -164,8 +164,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="alpha"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" preconditionExpression="<%name=="ALPHA_CONTAINER"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" preconditionExpression="aql:self.name='ALPHA_CONTAINER'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> + <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']"/> @@ -174,8 +174,8 @@ </containerMappings> </additionalLayers> <additionalLayers name="beta"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" preconditionExpression="<%name=="BETA_CONTAINER"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" preconditionExpression="aql:self.name='BETA_CONTAINER'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> + <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='red']"/> @@ -184,7 +184,7 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <nodeMappings name="DefaultNode" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <style xsi:type="style:SquareDescription"> @@ -213,10 +213,10 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_ContainerMappingImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_ContainerMappingImportDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> - <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']"/> @@ -226,7 +226,7 @@ </defaultLayer> <additionalLayers name="alpha"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="AlphaContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="EEnum" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='DC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <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='green']"/> @@ -236,7 +236,7 @@ </additionalLayers> <additionalLayers name="beta"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="BetaContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='DC_ContainerMappingImportDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']"> - <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='red']"/> @@ -245,7 +245,7 @@ </containerMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeMappingImportInContainerMappingDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeMappingImportInContainerMappingDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <subNodeMappings name="defaultSubNode" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> @@ -255,7 +255,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']"/> @@ -264,7 +264,7 @@ </containerMappings> </defaultLayer> <additionalLayers name="alpha"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaSubNode" preconditionExpression="<%name=="ALPHA"%>" semanticCandidatesExpression="feature:eAllContents" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportInContainerMappingDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']/@subNodeMappings[name='defaultSubNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaSubNode" preconditionExpression="aql:self.name = 'ALPHA'" semanticCandidatesExpression="feature:eAllContents" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportInContainerMappingDiagram']/@defaultLayer/@containerMappings[name='DefaultContainer']/@subNodeMappings[name='defaultSubNode']"> <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']"/> @@ -273,7 +273,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="beta"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaSubNode" preconditionExpression="<%name=="BETA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaSubNode" preconditionExpression="aql:self.name = 'BETA'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <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']"/> @@ -282,7 +282,7 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <subNodeMappings name="defaultSubNode" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> @@ -292,7 +292,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']"/> @@ -301,7 +301,7 @@ </containerMappings> </defaultLayer> <additionalLayers name="alpha"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaSubNode" preconditionExpression="<%name=="ALPHA"%>" semanticCandidatesExpression="feature:eAllContents" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']/@subNodeMappings[name='defaultSubNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="AlphaSubNode" preconditionExpression="aql:self.name = 'ALPHA'" semanticCandidatesExpression="feature:eAllContents" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping']/@defaultLayer/@containerMappings[name='DefaultContainer']/@subNodeMappings[name='defaultSubNode']"> <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']"/> @@ -310,7 +310,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="beta"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaSubNode" preconditionExpression="<%name=="BETA"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="BetaSubNode" preconditionExpression="aql:self.name = 'BETA'" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement" hideSubMappings="true"> <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']"/> @@ -319,7 +319,7 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeMappingImportInContainerMappingDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeMappingImportInContainerMappingDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <subNodeMappings name="defaultSubNode" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> @@ -329,7 +329,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']"/> @@ -356,7 +356,7 @@ </nodeMappings> </additionalLayers> </ownedRepresentations> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="<%name=="RootPackage"%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="DC_NodeMappingImportInContainerMappingDiagram_WithHideSubMapping" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.name = 'RootPackage'"> <defaultLayer name="default"> <containerMappings name="DefaultContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> <subNodeMappings name="defaultSubNode" semanticCandidatesExpression="feature:eAllContents" domainClass="ENamedElement"> @@ -366,7 +366,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']"/> @@ -404,42 +404,42 @@ </nodeMappings> </defaultLayer> <additionalLayers name="tree"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="F1" preconditionExpression="<%name == "F1"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@defaultLayer/@nodeMappings[name='Class%20node%20mapping']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F1" preconditionExpression="aql:self.name = 'F1'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@defaultLayer/@nodeMappings[name='Class%20node%20mapping']"> <style xsi:type="style:LozengeNodeDescription"> <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='gray']"/> </style> </nodeMappings> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="F2" preconditionExpression="<%name == "F2"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@defaultLayer/@nodeMappings[name='Class%20node%20mapping']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F2" preconditionExpression="aql:self.name = 'F2'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@defaultLayer/@nodeMappings[name='Class%20node%20mapping']"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='chocolate']"/> <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 xsi:type="description_1:NodeMappingImport" name="F11" preconditionExpression="<%name == "F11"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F1']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F11" preconditionExpression="aql:self.name = 'F11'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F1']"> <style xsi:type="style:EllipseNodeDescription"> <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='gray']"/> </style> </nodeMappings> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="F12" preconditionExpression="<%name == "F12"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F1']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F12" preconditionExpression="aql:self.name = 'F12'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F1']"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <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 xsi:type="description_1:NodeMappingImport" name="F21" preconditionExpression="<%name == "F21"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F2']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F21" preconditionExpression="aql:self.name = 'F21'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F2']"> <style xsi:type="style:EllipseNodeDescription"> <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='gray']"/> </style> </nodeMappings> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="F22" preconditionExpression="<%name == "F22"%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F2']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="F22" preconditionExpression="aql:self.name = 'F22'" domainClass="EClass" importedMapping="//@ownedViewpoints[name='MultipleMappingImport']/@ownedRepresentations[name='PC_NodeMappingImportTree']/@additionalLayers[name='tree']/@nodeMappings[name='F2']"> <style xsi:type="style:EllipseNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/My.odesign index fd9be4bc59..a4f23f3416 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/My.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/My.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="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="bug_root" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="rep0" initialisation="true" domainClass="EPackage" preconditionExpression="<%eContainer == null%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="rep0" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() = null"> <defaultLayer name="Default"> <containerMappings name="m0" 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='white']"/> @@ -13,8 +13,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="op" label="op"> - <edgeMappings name="in" sourceMapping="//@ownedViewpoints[name='bug_root']/@ownedRepresentations[name='rep0']/@defaultLayer/@containerMappings[name='m0']" targetMapping="//@ownedViewpoints[name='bug_root']/@ownedRepresentations[name='rep0']/@defaultLayer/@containerMappings[name='m0']" targetFinderExpression="<%filter("EClass").eSuperTypes%>"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <edgeMappings name="in" sourceMapping="//@ownedViewpoints[name='bug_root']/@ownedRepresentations[name='rep0']/@defaultLayer/@containerMappings[name='m0']" targetMapping="//@ownedViewpoints[name='bug_root']/@ownedRepresentations[name='rep0']/@defaultLayer/@containerMappings[name='m0']" targetFinderExpression="aql:OrderedSet{self}->filter(ecore::EClass).eSuperTypes"> + <style targetArrow="InputClosedArrow" routingStyle="manhattan"> <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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/football.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/football.odesign index 8f8c5b23bb..0b61762507 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/football.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/football.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="Football with UML2 (Modeler test for layers)" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="NodeMapping only" initialisation="true" domainClass="Package" rootExpression=""> <defaultLayer name="Zidane"> - <nodeMappings name="Class Diagram 1" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" semanticElements="" domainClass="Class"> + <nodeMappings name="Class Diagram 1" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" semanticElements="" domainClass="Class"> <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']"/> @@ -12,7 +12,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="Makelele"> - <nodeMappings name="Class Diagram" semanticCandidatesExpression="<%eAllContents("Class")[name == "Makelele"]%>" semanticElements="" domainClass="Class"> + <nodeMappings name="Class Diagram" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Makelele')" semanticElements="" domainClass="Class"> <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']"/> @@ -33,7 +33,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="Old generation"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> <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']"/> @@ -42,7 +42,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="New generation" icon=""> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Benzema"]%>" semanticElements="" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"/> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Benzema')" semanticElements="" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"/> </additionalLayers> <toolSection/> </ownedRepresentations> @@ -56,7 +56,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </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='dark_red']"/> @@ -85,7 +85,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="Old generation"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements%20and%20hide%20sub%20mappings']/@defaultLayer/@nodeMappings[name='Class%20Diagram%20hide']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements%20and%20hide%20sub%20mappings']/@defaultLayer/@nodeMappings[name='Class%20Diagram%20hide']"> <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']"/> @@ -94,7 +94,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="New generation" icon=""> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Benzema"]%>" semanticElements="" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements%20and%20hide%20sub%20mappings']/@defaultLayer/@nodeMappings[name='Class%20Diagram%20hide']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Benzema')" semanticElements="" hideSubMappings="true" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements%20and%20hide%20sub%20mappings']/@defaultLayer/@nodeMappings[name='Class%20Diagram%20hide']"> <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']"/> @@ -106,7 +106,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="NodeMappingImport with semantic elements from other diagram" initialisation="true" domainClass="Package"> <defaultLayer name="all"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="class diag imported" semanticCandidatesExpression="<%eAllContents("Class")[name == "Benzema"]%>" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="class diag imported" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Benzema')" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> <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']"/> @@ -115,7 +115,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="Old generation"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Makelele"]%>" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Makelele')" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> <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']"/> @@ -124,7 +124,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="New generation" icon=""> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" semanticElements="" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" semanticElements="" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='NodeMappingImport%20with%20semantic%20elements']/@defaultLayer/@nodeMappings[name='Class%20Diagram%202']"> <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']"/> @@ -136,7 +136,7 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="NodeMappingImport with semantic elements from other viewpoint" initialisation="true" domainClass="Package"> <defaultLayer name="all"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="annexe node imported" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="annexe node imported" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> <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']"/> @@ -145,7 +145,7 @@ </nodeMappings> </defaultLayer> <additionalLayers name="Old generation"> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Benzema"]%>" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="Old generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Benzema')" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> <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']"/> @@ -154,7 +154,7 @@ </nodeMappings> </additionalLayers> <additionalLayers name="New generation" icon=""> - <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Makelele"]%>" semanticElements="" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> + <nodeMappings xsi:type="description_1:NodeMappingImport" name="New generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Makelele')" semanticElements="" importedMapping="//@ownedViewpoints[name='Annexe']/@ownedRepresentations[name='annexeDiag']/@defaultLayer/@nodeMappings[name='AnnexeNode']"> <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']"/> @@ -256,8 +256,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="ContainerMapping only" initialisation="true" domainClass="Package" rootExpression=""> <defaultLayer name="Zidane"> - <containerMappings name="Container Mapping Class Diagram 0" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" domainClass="Class"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="Container Mapping Class Diagram 0" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" domainClass="Class"> + <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='gray']"/> @@ -266,8 +266,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="Makelele"> - <containerMappings name="Container Mapping Class Diagram 1" semanticCandidatesExpression="<%eAllContents("Class")[name == "Makelele"]%>" domainClass="Class"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="Container Mapping Class Diagram 1" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Makelele')" domainClass="Class"> + <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='gray']"/> @@ -280,7 +280,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="ContainerMappingImport without semantic elements" initialisation="true" domainClass="Package"> <defaultLayer name="all"> <containerMappings name="Container Mapping Class Diagram 2" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> - <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='gray']"/> @@ -290,7 +290,7 @@ </defaultLayer> <additionalLayers name="Old generation"> <containerMappings xsi:type="description_1:ContainerMappingImport" name="Old generation" semanticCandidatesExpression="feature:eAllContents" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20without%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%202']"> - <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='chocolate']"/> @@ -300,7 +300,7 @@ </additionalLayers> <additionalLayers name="New generation" icon=""> <containerMappings xsi:type="description_1:ContainerMappingImport" name="New generation" semanticCandidatesExpression="feature:eAllContents" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20without%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%202']"> - <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='purple']"/> @@ -313,7 +313,7 @@ <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="ContainerMappingImport with semantic elements" initialisation="true" domainClass="Package"> <defaultLayer name="all"> <containerMappings name="Container Mapping Class Diagram 3" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> - <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='gray']"/> @@ -322,8 +322,8 @@ </containerMappings> </defaultLayer> <additionalLayers name="Old generation"> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="Old generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Zidane"]%>" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20with%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%203']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="Old generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Zidane')" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20with%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%203']"> + <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='chocolate']"/> @@ -332,7 +332,7 @@ </containerMappings> </additionalLayers> <additionalLayers name="New generation" icon=""> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="New generation" semanticCandidatesExpression="<%eAllContents("Class")[name == "Benzema"]%>" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20with%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%203']"/> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="New generation" semanticCandidatesExpression="aql:self.eAllContents(uml::Class)->select( e | e.name = 'Benzema')" importedMapping="//@ownedViewpoints[name='Football%20with%20UML2%20(Modeler%20test%20for%20layers)']/@ownedRepresentations[name='ContainerMappingImport%20with%20semantic%20elements']/@defaultLayer/@containerMappings[name='Container%20Mapping%20Class%20Diagram%203']"/> </additionalLayers> <toolSection/> </ownedRepresentations> @@ -354,7 +354,7 @@ </style> </nodeMappings> <containerMappings name="AnnexeContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> - <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='gray']"/> @@ -367,14 +367,14 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="annexe2Diag" viewpointURI="platform:/plugin/org.eclipse.sirius.tests.junit/data/unit/layers/football.odesign#//@ownedViewpoints[name='Football with UML2 (Modeler test for layers)']" representationName="ContainerMappingImport without semantic elements"> <layers name="extension"> <nodeMappings name="AnnexeNode" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> - <style xsi:type="style:BundledImageDescription" sizeComputationExpression="<%8%>"> + <style xsi:type="style:BundledImageDescription" sizeComputationExpression="8"> <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> </nodeMappings> <containerMappings name="AnnexeContainer" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> - <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='gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1203.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1203.odesign index 4b9359d5b6..10100eeeaf 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1203.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1203.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="trac1203" 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="trac1203" version="10.1.3.201511131800"> <ownedViewpoints documentation="Unit test for #1203" name="trac1203" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="trac1203" initialisation="true" domainClass="Package"> <defaultLayer name="default"> - <containerMappings name="MyContainer" semanticCandidatesExpression="<%ownedType.filter("Class")%>" domainClass="Class"> - <borderedNodeMappings name="MyBorderedNode" semanticCandidatesExpression="<%ownedAttribute%>" domainClass="Property"> + <containerMappings name="MyContainer" semanticCandidatesExpression="aql:self.ownedType->filter(uml::Class)" domainClass="Class"> + <borderedNodeMappings name="MyBorderedNode" semanticCandidatesExpression="aql:self.ownedAttribute" domainClass="Property"> <style xsi:type="style:SquareDescription" 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='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='gray']"/> @@ -28,7 +28,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='gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1302.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1302.odesign index c4c90fdc39..f2834164bb 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1302.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1302.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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="trac1302" 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="trac1302" version="10.1.3.201511131800"> <ownedViewpoints name="trac1302" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="trac1302_1" initialisation="true" domainClass="Model"> + <metamodel href="http://www.eclipse.org/uml2/2.1.0/UML"/> <defaultLayer name="default"> <containerMappings name="CM_1" semanticCandidatesExpression="feature:eAllContents" domainClass="Package"> <borderedNodeMappings name="BNM_1" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> @@ -11,7 +12,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </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='gray']"/> @@ -27,7 +28,7 @@ <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 predicateExpression="<%name.startsWith("A")%>"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -35,14 +36,14 @@ </style> </conditionnalStyles> </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='gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%name.startsWith("A")%>"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> + <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='gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1796.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1796.odesign index adc97a63aa..f08268b93d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1796.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1796.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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="trac1796" 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="trac1796" version="10.1.3.201511131800"> <ownedViewpoints name="trac1796" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="trac1796" initialisation="true" domainClass="Model"> + <metamodel href="http://www.eclipse.org/uml2/2.1.0/UML"/> <defaultLayer name="default"> <nodeMappings name="Class Mapping" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> <style xsi:type="style:SquareDescription"> @@ -10,10 +11,10 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="Reference Mapping" semanticCandidatesExpression="<%eAllContents("Property")[type.filter("Class")]%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='trac1796']/@ownedRepresentations[name='trac1796']/@defaultLayer/@nodeMappings[name='Class%20Mapping']" targetMapping="//@ownedViewpoints[name='trac1796']/@ownedRepresentations[name='trac1796']/@defaultLayer/@nodeMappings[name='Class%20Mapping']" targetFinderExpression="<%type.filter("Class")%>" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true"> - <style> + <edgeMappings name="Reference Mapping" semanticCandidatesExpression="aql:self.eAllContents(uml::Property)->select( e | e.type.oclIsKindOf(uml::Class))" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='trac1796']/@ownedRepresentations[name='trac1796']/@defaultLayer/@nodeMappings[name='Class%20Mapping']" targetMapping="//@ownedViewpoints[name='trac1796']/@ownedRepresentations[name='trac1796']/@defaultLayer/@nodeMappings[name='Class%20Mapping']" targetFinderExpression="aql:self.type->filter(uml::Class)" sourceFinderExpression="feature:eContainer" domainClass="Property" useDomainElement="true"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -23,10 +24,10 @@ <ownedRepresentationExtensions xsi:type="description_1:DiagramExtensionDescription" name="Extension for compositions" viewpointURI="viewpoint:/org.eclipse.sirius.tests.junit/trac1796" representationName="trac1796"> <layers name="Extension for compositions"> <edgeMappingImports name="Extension Reference Mapping" importedMapping="//@ownedViewpoints[name='trac1796']/@ownedRepresentations[name='trac1796']/@defaultLayer/@edgeMappings[name='Reference%20Mapping']"> - <conditionnalStyles predicateExpression="<%isComposite%>"> - <style sourceArrow="FillDiamond"> + <conditionnalStyles predicateExpression="aql:self.isComposite"> + <style sourceArrow="FillDiamond" sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> - <centerLabelStyleDescription labelExpression="<%name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1887.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1887.odesign index ae1d88e260..b08a9d0a91 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1887.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/layers/trac1887.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:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="trac1887" 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="trac1887" version="10.1.3.201511131800"> <ownedViewpoints name="trac1887" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="trac1887" initialisation="true" domainClass="Model"> + <metamodel href="http://www.eclipse.org/uml2/2.1.0/UML"/> <defaultLayer name="default"> <containerMappings name="CM_1" semanticCandidatesExpression="feature:eAllContents" domainClass="Package"> <borderedNodeMappings name="BNM_1" semanticCandidatesExpression="feature:eAllContents" domainClass="Class"> @@ -10,7 +11,7 @@ <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="<%name.startsWith("A")%>"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> <style xsi:type="style:NoteDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -18,14 +19,14 @@ </style> </conditionnalStyles> </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='gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%name.startsWith("A")%>"> - <style xsi:type="style:FlatContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> + <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='red']"/> @@ -42,7 +43,7 @@ <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 predicateExpression="<%name.startsWith("A")%>"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> <style xsi:type="style:LozengeNodeDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -50,14 +51,14 @@ </style> </conditionnalStyles> </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='gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> - <conditionnalStyles predicateExpression="<%name.startsWith("A")%>"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.name.startsWith('A')"> + <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='gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign index ff76c99319..b61fdc8af6 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/2182.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="doremi_2182" version="10.0.0.201505222000"> +<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="doremi_2182" version="10.1.0.201507271600"> <ownedViewpoints name="doremi_2182" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef"> @@ -262,7 +262,7 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> @@ -272,7 +272,7 @@ <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </style> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign index de1c9cd32a..b0f566b048 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_diagram/2182-dnd.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="doremi_2182" version="10.0.0.201505222000"> +<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="doremi_2182" version="10.1.3.201511131800"> <ownedViewpoints name="doremi_2182" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef"> @@ -9,7 +9,7 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='RefToEAnnot%20TC1']"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="<%eContents.filter("EAnnotation") + eAllContents.filter("EReference").eContents.filter("EAnnotation")%>" domainClass="EAnnotation"> + <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAnnotation) + self.eAllContents()->filter(ecore::EReference).eContents()->filter(ecore::EAnnotation)" domainClass="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']"/> @@ -24,7 +24,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="<%eAnnotations + eContainer.eReferences.eType.eAnnotations%>"> + <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="aql:self.eAnnotations + self.eContainer().eReferences.eType.eAnnotations"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <centerLabelStyleDescription labelExpression="RefToEAnnot"> @@ -41,7 +41,7 @@ </style> </edgeMappings> <containerMappings name="EC EClass TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndAnnotationInClass']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']"> - <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']"/> @@ -260,7 +260,7 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> @@ -270,7 +270,7 @@ <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </style> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign index 93481e6be9..3d5dfbceef 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/mappings/edges_on_edges/drag_and_drop/from_model_content/2182-dnd.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="doremi_2182" version="10.0.0.201505222000"> +<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="doremi_2182" version="10.1.3.201511131800"> <ownedViewpoints name="doremi_2182" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndClassInPackage']" name="doremi-2182_TC1" domainClass="EPackage" enablePopupBars="true"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide EAnnotToRef"> @@ -9,7 +9,7 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='RefToEAnnot%20TC1']"/> </filters> <defaultLayer name="Default"> - <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="<%eContents.filter("EAnnotation") + eAllContents.filter("EReference").eContents.filter("EAnnotation")%>" domainClass="EAnnotation"> + <nodeMappings name="EAnnot TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EAnnotation) + self.eAllContents()->filter(ecore::EReference).eContents()->filter(ecore::EAnnotation)" domainClass="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']"/> @@ -24,7 +24,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="<%eAnnotations + eContainer.eReferences.eType.eAnnotations%>"> + <edgeMappings name="RefToEAnnot TC1" deletionDescription="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.2/@ownedTools[name='Delete%20RefToAnnot']" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@edgeMappings[name='EMa%20TC1']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']" targetFinderExpression="aql:self.eAnnotations + self.eContainer().eReferences.eType.eAnnotations"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/> <centerLabelStyleDescription labelExpression="RefToEAnnot"> @@ -41,7 +41,7 @@ </style> </edgeMappings> <containerMappings name="EC EClass TC1" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@toolSections.4/@ownedTools[name='dndClassInPackage']" reusedNodeMappings="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC1']/@defaultLayer/@nodeMappings[name='EAnnot%20TC1']"> - <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']"/> @@ -265,7 +265,7 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference1" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@edgeMappings[name='EReference2'] //@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> @@ -275,7 +275,7 @@ <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </edgeMappings> - <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="<%eContents().filter("EReference").eType + eContents().filter("EReference")%>" sourceFinderExpression="feature:eContainer" domainClass="EReference"> + <edgeMappings name="EReference2" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20A']" targetMapping="//@ownedViewpoints[name='doremi_2182']/@ownedRepresentations[name='doremi-2182_TC2']/@defaultLayer/@nodeMappings[name='EClass%20B']" targetFinderExpression="aql:self.eContents()->filter(ecore::EReference).eType + self.eContents()->filter(ecore::EReference)" sourceFinderExpression="feature:eContainer" domainClass="EReference"> <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_red']"/> </style> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/margin.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/margin.odesign index 4d0f75e48d..1895e81e9a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/margin.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/margin.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="margin" 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="margin" version="10.1.0.201507271600"> <ownedViewpoints name="margin"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Margin Diagram" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> @@ -11,7 +11,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="<%name%>" labelExpression="The border label VSM size is <%name%> " labelAlignment="LEFT" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.name" labelExpression="aql:'The border label VSM size is ' + self.name + ' '" labelAlignment="LEFT" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> @@ -26,7 +26,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="<%name%>" labelExpression="The border label VSM size is <%name%> " labelAlignment="LEFT" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="aql:self.name" labelExpression="aql:'The border label VSM size is ' + self.name + ' '" labelAlignment="LEFT" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-init.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-init.odesign index 2f83b61726..aa47c87ef4 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-init.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-init.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/table/description/1.1.0" name="Test fixture" 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="Test fixture" version="10.1.0.201507271600"> <ownedViewpoints name="Edition table: showOnStartup && initialization" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Edition table: showOnStartup && initialization" initialisation="true" showOnStartup="true" domainClass="EPackage"> <ownedLineMappings name="Classes" domainClass="EClass" headerLabelExpression="Class"/> - <ownedColumnMappings name="Name" featureName="name" labelExpression="<%name%>"/> + <ownedColumnMappings name="Name" featureName="name" labelExpression="aql:self.name"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-noinit.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-noinit.odesign index 2da8a0185f..0513ae1b1f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-noinit.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/startup/table-startup-noinit.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/table/description/1.1.0" name="Test fixture" 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="Test fixture" version="10.1.0.201507271600"> <ownedViewpoints name="Edition table: showOnStartup && !initialization" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Edition table: showOnStartup && !initialization" showOnStartup="true" domainClass="EPackage"> <ownedLineMappings name="Classes" domainClass="EClass" headerLabelExpression="Class"/> - <ownedColumnMappings name="Name" featureName="name" labelExpression="<%name%>"/> + <ownedColumnMappings name="Name" featureName="name" labelExpression="aql:self.name"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign index 56663244cd..caf9b5338d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign @@ -1,15 +1,15 @@ <?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:contribution="http://www.eclipse.org/sirius/description/contribution/1.0.0" 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="Base_Group" version="6.7.0.201302071200"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contribution="http://www.eclipse.org/sirius/description/contribution/1.0.0" 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="Base_Group" version="10.1.0.201507271600"> <ownedViewpoints name="VP1" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="Target_Table" domainClass="ecore.EPackage"> <ownedLineMappings name="Classes" domainClass="ecore.EClass" semanticCandidatesExpression="feature:eContents"/> - <ownedColumnMappings name="Class_Name" headerLabelExpression="Name" featureName="name" labelExpression="<%name%>"/> + <ownedColumnMappings name="Class_Name" headerLabelExpression="Name" featureName="name" labelExpression="aql:self.name"/> </ownedRepresentations> </ownedViewpoints> <ownedViewpoints name="VP2"> <ownedRepresentationExtensions xsi:type="description_1:EditionTableExtensionDescription" name="Table_Customization" viewpointURI="viewpoint:/vp-1224/VP1" representationName="Target_Table" domainClass="ecore.EPackage"> <contributions> - <source xsi:type="contribution:DirectEObjectReference" value="//@ownedViewpoints[name='VP2']/@ownedRepresentationExtensions[name='Table_Customization']/@ownedLineMappings[name='ClassesSubset']"/> + <source xsi:type="contribution:DirectEObjectReference"/> <target xsi:type="contribution:DirectEObjectReference" value="//@ownedViewpoints[name='VP1']/@ownedRepresentations[name='Target_Table']/@ownedLineMappings[name='Classes']"/> <featureMask xsi:type="contribution:SetFeatureContribution"/> </contributions> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/v1.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/v1.odesign index 6afe5e58c9..473444a584 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/v1.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/v1.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.1.0.201507271600"> <ownedViewpoints name="V"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="ecore.EPackage" preconditionExpression="<%someCondition%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="ecore.EPackage" preconditionExpression="aql:self.someCondition"> <defaultLayer name="Default"> <nodeMappings name="Packages" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <style xsi:type="style:SquareDescription"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/various_changes.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/various_changes.odesign index 6afe5e58c9..473444a584 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/various_changes.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/various_changes.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.0.0.201505222000"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="G" version="10.1.0.201507271600"> <ownedViewpoints name="V"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="ecore.EPackage" preconditionExpression="<%someCondition%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="D" initialisation="true" showOnStartup="true" domainClass="ecore.EPackage" preconditionExpression="aql:self.someCondition"> <defaultLayer name="Default"> <nodeMappings name="Packages" semanticCandidatesExpression="feature:eContents" domainClass="EPackage"> <style xsi:type="style:SquareDescription"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/testNavigation.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/testNavigation.odesign index aeb5bf0264..3864375eae 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/testNavigation.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/navigation/testNavigation.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" version="10.0.0.201505222000"> +<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" version="10.1.3.201511131800"> <ownedViewpoints name="NavigationTest" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Test a simple class diagram with only a box representing a Class" name="Package Diagram" initialisation="true" domainClass="Model" rootExpression=""> <defaultLayer name="Package"> @@ -11,7 +11,7 @@ </style> </nodeMappings> <toolSections name="Package"> - <ownedTools xsi:type="tool:DiagramNavigationDescription" name="Class Diagram" browseExpression="var:self" navigationNameExpression="Navigate to owned packages : <%$diagramName%>" diagramDescription="//@ownedViewpoints[name='NavigationTest']/@ownedRepresentations[name='Class%20Diagram']"> + <ownedTools xsi:type="tool:DiagramNavigationDescription" name="Class Diagram" browseExpression="var:self" navigationNameExpression="aql:'Navigate to owned packages : ' + diagramName" diagramDescription="//@ownedViewpoints[name='NavigationTest']/@ownedRepresentations[name='Class%20Diagram']"> <containerViewVariable name="containerView"/> <containerVariable name="container"/> <representationNameVariable name="diagramName"/> @@ -29,7 +29,7 @@ </style> </nodeMappings> <toolSections name="Package"> - <ownedTools xsi:type="tool:DiagramNavigationDescription" name="Package Diagram" browseExpression="<%eContainer("Model")%>" navigationNameExpression="aql:'Navigate to ' + diagramName" diagramDescription="//@ownedViewpoints[name='NavigationTest']/@ownedRepresentations[name='Package%20Diagram']"> + <ownedTools xsi:type="tool:DiagramNavigationDescription" name="Package Diagram" browseExpression="aql:self.eContainerOrSelf(uml::Model)" navigationNameExpression="aql:'Navigate to ' + diagramName" diagramDescription="//@ownedViewpoints[name='NavigationTest']/@ownedRepresentations[name='Package%20Diagram']"> <containerViewVariable name="containerView"/> <containerVariable name="container"/> <representationNameVariable name="diagramName"/> 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 689a595908..3ea775b607 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 @@ -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='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%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='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Use%20Case%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='blue']"/> @@ -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='Object%20Diagram']/@toolSection/@ownedTools[name='Object%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Class%20Diagram'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='details']/@ownedTools[name='Component%20Diagram'] //@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='Use%20Case%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='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"> <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,12 +101,12 @@ </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 sizeComputationExpression="1"> + <style> <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 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> <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']"/> @@ -119,7 +119,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 +140,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 +157,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 +166,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" workspacePath="/org.eclipse.sirius.tests.junit/images/Actor.png"> + <style xsi:type="style:WorkspaceImageDescription" labelSize="10" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/images/Actor.png"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </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 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 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%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 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> <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%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 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> <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%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='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%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" workspacePath="/org.eclipse.sirius.tests.junit/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" arcWidth="1" arcHeight="1" workspacePath="/org.eclipse.sirius.tests.junit/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 +213,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 +222,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 +243,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 +252,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 +266,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 +285,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 +304,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 +318,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,32 +334,32 @@ </subSections> </toolSection> </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%>"> - <edgeMappings name="CD_Association_Class_To_Class" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").getAssociationP()%>" semanticElements="<%current + memberEnd%>" 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="<%memberEnd.nGet(0).type%>" sourceFinderExpression="<%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1"> + <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)"> + <edgeMappings name="CD_Association_Class_To_Class" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).getAssociationP()" semanticElements="aql:Sequence{self} + self.memberEnd" 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.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelExpression="<%if (memberEnd.nGet(0).isNavigableP) {%><%memberEnd.nGet(0).name%><%}%><%if (memberEnd.nGet(0).isNavigableP && memberEnd.nGet(1).isNavigableP) {%> - <%}%><%if (memberEnd.nGet(1).isNavigableP) {%><%memberEnd.nGet(1).name%><%}%>"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->select(e | e.isNavigableP()).name->sep(' - ')"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(0).isNavigableP && $view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->first().isNavigableP() and view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(1).isNavigableP && !$view.target.memberEnd.nGet(0).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->at(2).isNavigableP() and not view.target.memberEnd->first().isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!$view.target.memberEnd.nGet(0).isNavigableP && !$view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:not view.target.memberEnd->first().isNavigableP() and not view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -367,31 +367,31 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="CD_Association_Class_To_Interface" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").getAssociationP()%>" semanticElements="<%current + memberEnd%>" 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="<%memberEnd.nGet(0).type%>" sourceFinderExpression="<%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1"> + <edgeMappings name="CD_Association_Class_To_Interface" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).getAssociationP()" semanticElements="aql:Sequence{self} + self.memberEnd" 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.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelExpression="<%if (memberEnd.nGet(0).isNavigableP) {%><%memberEnd.nGet(0).name%><%}%><%if (memberEnd.nGet(0).isNavigableP && memberEnd.nGet(1).isNavigableP) {%> - <%}%><%if (memberEnd.nGet(1).isNavigableP) {%><%memberEnd.nGet(1).name%><%}%>"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->select(e | e.isNavigableP()).name->sep(' - ')"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(0).isNavigableP && $view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->first().isNavigableP() and view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(1).isNavigableP && !$view.target.memberEnd.nGet(0).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->at(2).isNavigableP() and not view.target.memberEnd->first().isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!$view.target.memberEnd.nGet(0).isNavigableP && !$view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:not view.target.memberEnd->first().isNavigableP() and not view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -399,31 +399,31 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="CD_Association_Interface_To_Interface" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").getAssociationP()%>" semanticElements="<%current + memberEnd%>" 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="<%memberEnd.nGet(0).type%>" sourceFinderExpression="<%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1"> + <edgeMappings name="CD_Association_Interface_To_Interface" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).getAssociationP()" semanticElements="aql:Sequence{self} + self.memberEnd" 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.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelExpression="<%if (memberEnd.nGet(0).isNavigableP) {%><%memberEnd.nGet(0).name%><%}%><%if (memberEnd.nGet(0).isNavigableP && memberEnd.nGet(1).isNavigableP) {%> - <%}%><%if (memberEnd.nGet(1).isNavigableP) {%><%memberEnd.nGet(1).name%><%}%>"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->select(e | e.isNavigableP()).name->sep(' - ')"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(0).isNavigableP && $view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->first().isNavigableP() and view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(1).isNavigableP && !$view.target.memberEnd.nGet(0).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->at(2).isNavigableP() and not view.target.memberEnd->first().isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!$view.target.memberEnd.nGet(0).isNavigableP && !$view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:not view.target.memberEnd->first().isNavigableP() and not view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -431,31 +431,31 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="CD_Association_Interface_To_Class" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Classifier").getAssociationP()%>" semanticElements="<%current + memberEnd%>" 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="<%memberEnd.nGet(0).type%>" sourceFinderExpression="<%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1"> + <edgeMappings name="CD_Association_Interface_To_Class" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Classifier).getAssociationP()" semanticElements="aql:Sequence{self} + self.memberEnd" 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.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelExpression="<%if (memberEnd.nGet(0).isNavigableP) {%><%memberEnd.nGet(0).name%><%}%><%if (memberEnd.nGet(0).isNavigableP && memberEnd.nGet(1).isNavigableP) {%> - <%}%><%if (memberEnd.nGet(1).isNavigableP) {%><%memberEnd.nGet(1).name%><%}%>"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->select(e | e.isNavigableP()).name->sep(' - ')"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(0).isNavigableP && $view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->first().isNavigableP() and view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(1).isNavigableP && !$view.target.memberEnd.nGet(0).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->at(2).isNavigableP() and not view.target.memberEnd->first().isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!$view.target.memberEnd.nGet(0).isNavigableP && !$view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:not view.target.memberEnd->first().isNavigableP() and not view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -463,31 +463,31 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="CD_Association_Interface_To_Enumeration" semanticCandidatesExpression="<%$viewpoint.eAllContents("DSemanticDecorator").target.filter("Type").getAssociationP()%>" semanticElements="<%current + memberEnd%>" 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_Enumeration']" targetFinderExpression="<%memberEnd.nGet(0).type%>" sourceFinderExpression="<%memberEnd.nGet(1).type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> - <style sizeComputationExpression="1"> + <edgeMappings name="CD_Association_Interface_To_Enumeration" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::DSemanticDecorator).target->filter(uml::Type).getAssociationP()" semanticElements="aql:Sequence{self} + self.memberEnd" 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_Enumeration']" targetFinderExpression="aql:self.memberEnd->first().type" sourceFinderExpression="aql:self.memberEnd->at(2).type" targetExpression="var:self" domainClass="Association" useDomainElement="true" pathExpression=""> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> - <centerLabelStyleDescription labelSize="10" labelExpression="<%if (memberEnd.nGet(0).isNavigableP) {%><%memberEnd.nGet(0).name%><%}%><%if (memberEnd.nGet(0).isNavigableP && memberEnd.nGet(1).isNavigableP) {%> - <%}%><%if (memberEnd.nGet(1).isNavigableP) {%><%memberEnd.nGet(1).name%><%}%>"> + <centerLabelStyleDescription labelSize="10" labelExpression="aql:self.memberEnd->select(e | e.isNavigableP()).name->sep(' - ')"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(0).isNavigableP && $view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->first().isNavigableP() and view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%$view.target.memberEnd.nGet(1).isNavigableP && !$view.target.memberEnd.nGet(0).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:view.target.memberEnd->at(2).isNavigableP() and not view.target.memberEnd->first().isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%!$view.target.memberEnd.nGet(0).isNavigableP && !$view.target.memberEnd.nGet(1).isNavigableP%>"> - <style> + <conditionnalStyles predicateExpression="aql:not view.target.memberEnd->first().isNavigableP() and not view.target.memberEnd->at(2).isNavigableP()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -495,72 +495,72 @@ </style> </conditionnalStyles> </edgeMappings> - <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=""> + <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='black']"/> </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='black']"/> </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 sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </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 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> <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 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> <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 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> <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 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> <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" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface'] //@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']"> - <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" reusedContainerMappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Class%20Diagram']/@containerMappings[name='CD_Interface'] //@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']"> + <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='gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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%>" 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="<%attribute%>" 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" 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.attribute" 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"> + <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']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_gray']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <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']"/> @@ -568,15 +568,15 @@ </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"> + <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"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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='dark_blue']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <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']"/> @@ -584,22 +584,22 @@ </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"> + <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_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/> </style> - <conditionnalStyles predicateExpression="<%isAbstract%>"> - <style xsi:type="style:FlatContainerStyleDescription"> + <conditionnalStyles predicateExpression="aql:self.isAbstract"> + <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_green']"/> @@ -615,7 +615,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> @@ -626,7 +626,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> @@ -637,7 +637,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> @@ -648,7 +648,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> @@ -659,7 +659,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> @@ -670,7 +670,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> @@ -681,7 +681,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> @@ -692,17 +692,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> @@ -740,7 +740,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"/> @@ -750,7 +750,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"/> @@ -770,47 +770,47 @@ </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"> + <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"> <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_gray']"/> </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 sizeComputationExpression="2"> <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"> <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%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 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> <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%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 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> <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> - <containerMappings name="CO_Component" labelDirectEdit="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@ownedTools[name='NamedElementDirectEdit']" semanticCandidatesExpression="<%eContents.filter("Component")%>" domainClass="Component" 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" 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='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']"/> @@ -818,21 +818,21 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <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='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(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='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']"/> @@ -840,7 +840,7 @@ </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <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_green']"/> @@ -875,7 +875,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop Interface on canvas" forceRefresh="true" mappings="//@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@nodeMappings[name='CO_Interface'] //@ownedViewpoints[name='UML%20Analysis%20workspace']/@ownedRepresentations[name='Component%20Diagram']/@containerMappings[name='CO_ImportedComponent']"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -924,15 +924,15 @@ </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"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <centerLabelStyleDescription labelSize="10"> <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"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -941,20 +941,20 @@ </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='light_blue']"/> </style> - <conditionnalStyles predicateExpression="<%filter("Pseudostate").nSize > 0%>"> + <conditionnalStyles predicateExpression="aql:self.oclIsKindOf(uml::Pseudostate)"> <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']"/> <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"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -962,7 +962,7 @@ </style> </conditionnalStyles> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10"> + <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_gray']"/> @@ -1012,7 +1012,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"/> @@ -1021,9 +1021,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> @@ -1035,20 +1035,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" workspacePath="/org.eclipse.sirius.tests.junit/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" 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> - <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="<%6%>" id="uml2.LifelineStyle"> + <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="6" 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"> + <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> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </edgeMappings> @@ -1071,25 +1071,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> @@ -1098,10 +1098,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> @@ -1110,17 +1110,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='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']"/> @@ -1140,7 +1140,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.junit/data/unit/refresh/VP-1958/VP-1958.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-1958/VP-1958.odesign index d3ed70a51a..cb77d26c42 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-1958/VP-1958.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-1958/VP-1958.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" 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_1958" 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_1958" version="10.1.3.201511131800"> <ownedViewpoints name="vp_1958" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP_1958_Diagram" domainClass="EPackage"> <defaultLayer name="Default1"> - <nodeMappings name="Nodes" semanticCandidatesExpression="<%self.eSubpackages%>" domainClass="EPackage"> - <borderedNodeMappings name="BorderedNodes" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <nodeMappings name="Nodes" semanticCandidatesExpression="aql:self.eSubpackages" domainClass="EPackage"> + <borderedNodeMappings name="BorderedNodes" 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']"/> @@ -17,10 +17,10 @@ <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_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']/@borderedNodeMappings[name='BorderedNodes']" targetMapping="//@ownedViewpoints[name='vp_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']/@borderedNodeMappings[name='BorderedNodes']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="EC_EReference" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='vp_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']/@borderedNodeMappings[name='BorderedNodes']" targetMapping="//@ownedViewpoints[name='vp_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@nodeMappings[name='Nodes']/@borderedNodeMappings[name='BorderedNodes']" 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%> <%$diagram.name%>"> + <centerLabelStyleDescription labelExpression="aql:self.name + ' ' + diagram.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> @@ -58,7 +58,7 @@ <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EReference" referenceName="eStructuralFeatures"> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetEClass"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ref"/> - <subModelOperations xsi:type="tool:CreateEdgeView" mapping="//@ownedViewpoints[name='vp_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@edgeMappings[name='EC_EReference']" containerViewExpression="<% $sourceView.eContainer %>" sourceExpression="var:sourceEClass" targetExpression="var:targetEClass"/> + <subModelOperations xsi:type="tool:CreateEdgeView" mapping="//@ownedViewpoints[name='vp_1958']/@ownedRepresentations[name='VP_1958_Diagram']/@defaultLayer/@edgeMappings[name='EC_EReference']" containerViewExpression="aql:sourceView.eContainer()" sourceExpression="var:sourceEClass" targetExpression="var:targetEClass"/> </subModelOperations> </subModelOperations> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign index b70764e809..34721247a6 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-2649/VP-2649.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: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="VP-2649" version="10.0.0.201505222000"> +<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="VP-2649" version="10.1.0.201507271600"> <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-2649_Viewpoint" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" endUserDocumentation="A graphical modeler for Ecore model similar to a UML class diagram." name="VP-2649_Diagram" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> <containerMappings name="EClassMapping" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.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']"/> @@ -12,7 +12,7 @@ </style> </containerMappings> <containerMappings name="EPackageMapping" deletionDescription="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteEPackageTool']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping'] //@ownedViewpoints[name='VP-2649_Viewpoint']/@ownedRepresentations[name='VP-2649_Diagram']/@defaultLayer/@containerMappings[name='EClassMapping']"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="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='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']"/> @@ -54,7 +54,7 @@ <firstModelOperation xsi:type="tool_1:RemoveElement"/> </delete> </ownedLineMappings> - <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_3:TreeDescription" name="VP-2649_Tree" domainClass="EPackage"> <subItemMappings name="EClassTreeItemMapping" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3257/VP-3257.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3257/VP-3257.odesign index 1861e8adc0..11fefa2d59 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3257/VP-3257.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/VP-3257/VP-3257.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="prod00088637"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp3257" initialisation="true" domainClass="Interaction"> <defaultLayer name="Default"> @@ -10,7 +10,7 @@ <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 predicateExpression="<% name == "a" %>"> + <conditionnalStyles predicateExpression="aql:self. name = 'a' "> <style xsi:type="style:LozengeNodeDescription" sizeComputationExpression="8" resizeKind="NSEW" widthComputationExpression="2" heightComputationExpression="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']"/> @@ -23,7 +23,7 @@ <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 predicateExpression="<% name == "a" %>"> + <conditionnalStyles predicateExpression="aql:self. name = 'a' "> <style xsi:type="style:SquareDescription" sizeComputationExpression="10" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/constantStyleRefresh/tc1989.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/constantStyleRefresh/tc1989.odesign index dd483a684b..e40b4aa69f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/constantStyleRefresh/tc1989.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/constantStyleRefresh/tc1989.odesign @@ -1,55 +1,55 @@ <?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="tc1989" 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="tc1989" version="10.1.3.201511131800"> <ownedViewpoints name="tc1989" modelFileExtension="*.ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc1989" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="Ellipse" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Ellipse") != -1]%>" domainClass="EClass"> + <nodeMappings name="Ellipse" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Ellipse') <> -1)" domainClass="EClass"> <style xsi:type="style:EllipseNodeDescription" horizontalDiameterComputationExpression="5" verticalDiameterComputationExpression="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> - <nodeMappings name="Lozenge" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Lozenge") != -1]%>" domainClass="EClass"> + <nodeMappings name="Lozenge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Lozenge') <> -1)" domainClass="EClass"> <style xsi:type="style:LozengeNodeDescription" widthComputationExpression="5" heightComputationExpression="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> - <nodeMappings name="Square" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Square") != -1]%>" domainClass="EClass"> + <nodeMappings name="Square" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Square') <> -1)" domainClass="EClass"> <style xsi:type="style:SquareDescription" sizeComputationExpression="4" width="5" height="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> - <nodeMappings name="Dot" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Dot") != -1]%>" domainClass="EClass"> + <nodeMappings name="Dot" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Dot') <> -1)" domainClass="EClass"> <style xsi:type="style:DotDescription" borderSizeComputationExpression="6" sizeComputationExpression="8" strokeSizeComputationExpression="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='gray']"/> </style> </nodeMappings> - <nodeMappings name="Gauge" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Gauge") != -1]%>" domainClass="EClass"> + <nodeMappings name="Gauge" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Gauge') <> -1)" domainClass="EClass"> <style xsi:type="style:GaugeCompositeStyleDescription" 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']"/> </style> </nodeMappings> - <nodeMappings name="Custom" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Custom") != -1]%>" domainClass="EClass"> + <nodeMappings name="Custom" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Custom') <> -1)" domainClass="EClass"> <style xsi:type="style:CustomStyleDescription" sizeComputationExpression="5"> <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="WorkspaceImage" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("WorkspaceImage") != -1]%>" domainClass="EClass"> + <nodeMappings name="WorkspaceImage" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('WorkspaceImage') <> -1)" domainClass="EClass"> <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="10" sizeComputationExpression="8" arcWidth="5" arcHeight="9" roundedCorner="true" workspacePath="/org.eclipse.sirius.diagram/icons/incomingLinksNavigatorGroup.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> - <nodeMappings name="Note" semanticCandidatesExpression="<%eContents.filter("EClass")[name.indexOf("Note") != -1]%>" domainClass="EClass"> + <nodeMappings name="Note" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)->select( e | e.name.index('Note') <> -1)" domainClass="EClass"> <style xsi:type="style:NoteDescription" borderSizeComputationExpression="3" sizeComputationExpression="5"> <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 0269344d3d..f68b030d5d 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 @@ -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="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" 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"> @@ -158,7 +158,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="InitHierarchy" precondition="aql:self.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"/> @@ -511,22 +511,22 @@ <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </edgeMappings> - <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="aql:self->filter(InterfaceRealization)->size() = 0" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <edgeMappings name="CD_Dependency_Class_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="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="aql:self->filter(InterfaceRealization)->size() = 0" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <edgeMappings name="CD_Dependency_Class_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="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="aql:self->filter(InterfaceRealization)->size() = 0" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <edgeMappings name="CD_Dependency_Interface_To_Class" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="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="aql:self->filter(InterfaceRealization)->size() = 0" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="aql:self.supplier" sourceFinderExpression="aql:self.client" targetExpression="var:self" domainClass="Dependency" useDomainElement="true"> + <edgeMappings name="CD_Dependency_Interface_To_Interface" preconditionExpression="aql:self.oclIsKindOf(uml::InterfaceRealization)" semanticCandidatesExpression="aql:viewpoint.eAllContents(viewpoint::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="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> @@ -754,7 +754,7 @@ </ownedTools> </subSections> <subSections name="wizard"> - <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"> + <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"/> @@ -1108,7 +1108,7 @@ <initialOperation> <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="aql:(containerView + containerView->ancestors())->select( e | e.target->filter(uml::Lifeline)->size() > 0).target"> + <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> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/mwsdc1243/mwsdc.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/mwsdc1243/mwsdc.odesign index 0aa3ede907..74fd84dae7 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/mwsdc1243/mwsdc.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/mwsdc1243/mwsdc.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" documentation="Test for trac task #1243" name="Mapping With Same Domain Class" 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" documentation="Test for trac task #1243" name="Mapping With Same Domain Class" version="10.1.3.201511131800"> <ownedViewpoints documentation="Test for trac task #1243" name="Mapping With Same Domain Class" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="MWSDC" initialisation="true" domainClass="Package"> <defaultLayer name="default layer"> - <nodeMappings name="NMClass1" semanticCandidatesExpression="<%ownedType.filter("Class")%>" domainClass="Class"> + <nodeMappings name="NMClass1" semanticCandidatesExpression="aql:self.ownedType->filter(uml::Class)" domainClass="Class"> <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> - <nodeMappings name="NMClass2" semanticCandidatesExpression="<%ownedType.filter("Class")%>" domainClass="Class"> + <nodeMappings name="NMClass2" semanticCandidatesExpression="aql:self.ownedType->filter(uml::Class)" domainClass="Class"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/refreshWhenSeveralEdiorsOpen/EcoreExtension.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/refreshWhenSeveralEdiorsOpen/EcoreExtension.odesign index 762dd943e7..afe880f131 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/refreshWhenSeveralEdiorsOpen/EcoreExtension.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/refreshWhenSeveralEdiorsOpen/EcoreExtension.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/tree/description/1.0.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ExtensionForTest" 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:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" name="ExtensionForTest" version="10.1.3.201511131800"> <ownedViewpoints name="EcoreForResfreshTest" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Tree" domainClass="EPackage"> <subItemMappings name="package" domainClass="EPackage"> @@ -7,7 +7,7 @@ <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="Class" domainClass="EClass" semanticCandidatesExpression="<%eContents.filter("EClass")%>"> + <subItemMappings name="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']"/> @@ -29,7 +29,7 @@ <elementView name="elementView"/> <initialOperation> <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%name%>A"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.name + 'A'"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -38,7 +38,7 @@ <elementView name="elementView"/> <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> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/relationEdgeWithoutSemantic/RelationalEdgeWithoutSemantic.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/relationEdgeWithoutSemantic/RelationalEdgeWithoutSemantic.odesign index f37589e15b..a8a6b235e0 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/relationEdgeWithoutSemantic/RelationalEdgeWithoutSemantic.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/relationEdgeWithoutSemantic/RelationalEdgeWithoutSemantic.odesign @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="RelationalEdgeWithoutSemantic" 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="RelationalEdgeWithoutSemantic" version="10.1.3.201511131800"> <ownedViewpoints name="RelationalEdgeWithoutSemantic" label="RelationalEdgeWithoutSemantic" modelFileExtension="*.ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="RelationalEdgeWithoutSemantic" label="RelationalEdgeWithoutSemantic" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="class" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <nodeMappings name="class" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="super" sourceMapping="//@ownedViewpoints[name='RelationalEdgeWithoutSemantic']/@ownedRepresentations[name='RelationalEdgeWithoutSemantic']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='RelationalEdgeWithoutSemantic']/@ownedRepresentations[name='RelationalEdgeWithoutSemantic']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="<%eSuperTypes%>"> + <edgeMappings name="super" sourceMapping="//@ownedViewpoints[name='RelationalEdgeWithoutSemantic']/@ownedRepresentations[name='RelationalEdgeWithoutSemantic']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='RelationalEdgeWithoutSemantic']/@ownedRepresentations[name='RelationalEdgeWithoutSemantic']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="aql:self.eSuperTypes"> <style targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2023.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2023.odesign index f79445ff54..b1b0efe351 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2023.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2023.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="VP-2023" 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-2023" version="10.1.3.201511131800"> <ownedViewpoints name="VP-2023" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2023" domainClass="uml.Package"> <defaultLayer name="Default"> <nodeMappings name="Comment" domainClass="uml.Comment"> - <style xsi:type="style:SquareDescription" labelExpression="<%body%>" tooltipExpression="<%body%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.body" tooltipExpression="aql:self.body"> <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']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2025/vp-2025.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2025/vp-2025.odesign index 0aad4cb05f..b9ae71e141 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2025/vp-2025.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/refresh/tooltip/vp-2025/vp-2025.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" 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="VP-2025"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-2025" domainClass="EPackage"> <defaultLayer name="Default"> - <nodeMappings name="Employee" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <nodeMappings name="Employee" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> <style xsi:type="style:CustomStyleDescription" tooltipExpression="foo"> <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/repair/VP-2552/tc2552.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign index 53d894d61c..bbbc0ea1d2 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/repair/VP-2552/tc2552.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="description" version="10.0.0.201505222000"> +<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="description" version="10.1.3.201511131800"> <ownedViewpoints endUserDocumentation="2174
" name="tc2552" label="tc2552" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2552" label="tc2552" titleExpression="tc2552" domainClass="EPackage" enablePopupBars="true"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> @@ -28,7 +28,7 @@ </filters> <filters xsi:type="filter:CompositeFilterDescription" name="CollapseHideContentsCondition" label="Collapse attributes and hide references with condition"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='tc2552']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@subNodeMappings[name='EReferenceMapping3']" semanticConditionExpression="aql:self.name <> 'activateHideRef'"/> - <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='tc2552']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="<%name != "activateCollapseAtt"%>"/> + <filters xsi:type="filter:MappingFilter" filterKind="COLLAPSE" mappings="//@ownedViewpoints[name='tc2552']/@ownedRepresentations[name='tc2552']/@defaultLayer/@containerMappings[name='EClassContainerMapping']/@borderedNodeMappings[name='EAttributeMapping2']" semanticConditionExpression="aql:self.name <> 'activateCollapseAtt'"/> </filters> <defaultLayer name="Default" label="default"> <containerMappings name="EClassContainerMapping" label="EClassMapping" semanticCandidatesExpression="aql:self.eClassifiers->filter(ecore::EClass)" domainClass="EClass"> @@ -53,7 +53,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </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']"/> @@ -89,7 +89,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EOperation" referenceName="eOperations"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="op<%$container.eOperations.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'op' + container.eOperations->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> 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 b419286964..1d3577372a 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 @@ -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.self.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.junit/data/unit/session/benchmark.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/benchmark.odesign index 6c22e82e78..72d3b94f38 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/benchmark.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/benchmark.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" 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="UML2 Benchmarks Acceleo" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Acceleo Class Diagram" initialisation="true" domainClass="Package"> - <edgeMappings name="CD_Association" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%memberEnd.nLast().type%>" sourceFinderExpression="<%memberEnd.nFirst().type%>" targetExpression="var:self" domainClass="Association" useDomainElement="true"> + <edgeMappings name="CD_Association" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="aql:self.memberEnd->last().type" sourceFinderExpression="aql:self.memberEnd->first().type" targetExpression="var:self" domainClass="Association" useDomainElement="true"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription labelSize="10"> @@ -10,41 +10,42 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="<%eContents().filter("Classifier").generalization%>" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetFinderExpression="<%general%>" sourceFinderExpression="<%specific%>" targetExpression="" domainClass="Generalization" useDomainElement="true" pathExpression=""> + <edgeMappings name="CD_Generalization_Class_To_Class" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Classifier).generalization" semanticElements="" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%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='black']"/> </style> </edgeMappings> - <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="<%eContents().filter("Classifier").interfaceRealization%>" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Interface']" targetFinderExpression="<%contract%>" sourceFinderExpression="<%implementingClassifier%>" targetExpression="" domainClass="InterfaceRealization" useDomainElement="true"> + <edgeMappings name="CD_InterfaceRealization" semanticCandidatesExpression="aql:self.eContents()->filter(uml::Classifier).interfaceRealization" sourceMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']" targetMapping="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%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='black']"/> </style> </edgeMappings> - <containerMappings name="CD_Class" semanticCandidatesExpression="<%packagedElement.filter("Class")%>" semanticElements="" domainClass="Class" childrenPresentation="List"> - <subNodeMappings name="CD_Property" semanticCandidatesExpression="<%attribute%>" domainClass="Property"> + <containerMappings name="CD_Class" semanticCandidatesExpression="aql:self.packagedElement->filter(uml::Class)" semanticElements="" domainClass="Class" childrenPresentation="List"> + <subNodeMappings name="CD_Property" semanticCandidatesExpression="aql:self.attribute" domainClass="Property"> <style xsi:type="style:BundledImageDescription" 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='black']"/> </style> </subNodeMappings> - <subNodeMappings name="CD_Operation" semanticCandidatesExpression="<%ownedOperation%>" domainClass="Operation"> + <subNodeMappings name="CD_Operation" semanticCandidatesExpression="aql:self.ownedOperation" domainClass="Operation"> <style xsi:type="style:BundledImageDescription" 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='black']"/> </style> </subNodeMappings> - <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_gray']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="CD_Interface" semanticCandidatesExpression="<%packagedElement.filter("Interface")%>" semanticElements="" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="italic" backgroundStyle="GradientTopToBottom"> + <containerMappings name="CD_Interface" semanticCandidatesExpression="aql:self.packagedElement->filter(uml::Interface)" semanticElements="" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML2%20Benchmarks%20Acceleo']/@ownedRepresentations[name='Acceleo%20Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" 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']"/> + <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='light_gray']"/> @@ -61,7 +62,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Class" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New <%eClass.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ' + self.eClass().name"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -70,7 +71,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Interface" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New <%eClass.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ' + self.eClass().name"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -79,7 +80,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Property" referenceName="ownedAttribute"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New <%eClass.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ' + self.eClass().name"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -88,7 +89,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Operation" referenceName="ownedOperation"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New <%eClass.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ' + self.eClass().name"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -98,18 +99,18 @@ <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="name" valueExpression="New <%eClass.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="navigableOwnedEnd" valueExpression="aql:self.memberEnd->first()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ' + self.eClass().name"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -178,7 +179,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelExpression="name" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="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='light_gray']"/> @@ -186,8 +187,9 @@ </style> </containerMappings> <containerMappings name="CD_Interface" semanticCandidatesExpression="ocl:self.packagedElement->select( c | c.oclIsTypeOf(uml::Interface))" semanticElements="" domainClass="Interface" reusedNodeMappings="//@ownedViewpoints[name='UML2%20Benchmarks%20OCL']/@ownedRepresentations[name='OCL%20Class%20Diagram']/@containerMappings[name='CD_Class']/@subNodeMappings[name='CD_Operation']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" labelSize="10" labelFormat="italic" labelExpression="name" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="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_blue']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -241,17 +243,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="ocl:'New '.concat(self.oclAsType(ecore::EObject).eClass())"/> </subModelOperations> </firstModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/interpreter/1411/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/interpreter/1411/My.odesign index 2aa715bf0b..a00eee5274 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/interpreter/1411/My.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/interpreter/1411/My.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: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="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" 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="a" version="10.1.3.201511131800"> <ownedViewpoints name="a"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="a" initialisation="true" domainClass="EPackage" preconditionExpression="<%~target.filter("DDiagram")[eContainer != null].description[name=="a"].nSize < 1%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="a" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eInverse('target')->filter(diagram::DDiagram)->select( e | e.eContainer() <> null).description->select(n | n.name='a')->size() < 1"> <defaultLayer name="Default"> <nodeMappings name="class" domainClass="EClass"> <style xsi:type="style:SquareDescription"> @@ -10,18 +10,18 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="reference" labelDirectEdit="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@toolSections.0/@ownedTools[name='edit%20ref']" semanticCandidatesExpression="<%eAllContents("EReference")%>" documentation="Edge specified with source mapping as the target semantic (& vice versa) to work around top to bottom layout (see VP-930)" sourceMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> + <edgeMappings name="reference" labelDirectEdit="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@toolSections.0/@ownedTools[name='edit%20ref']" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)" documentation="Edge specified with source mapping as the target semantic (& vice versa) to work around top to bottom layout (see VP-930)" sourceMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" 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='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="Ref : <%name%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:'Ref : ' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="ref2" labelDirectEdit="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@toolSections.0/@ownedTools[name='edit%20ref']" sourceMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="<%eReferences.eType%>"> + <edgeMappings name="ref2" labelDirectEdit="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@toolSections.0/@ownedTools[name='edit%20ref']" sourceMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetMapping="//@ownedViewpoints[name='a']/@ownedRepresentations[name='a']/@defaultLayer/@nodeMappings[name='class']" targetFinderExpression="aql:self.eReferences.eType"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="Ref 2 : <%name%>"> + <centerLabelStyleDescription labelExpression="aql:'Ref 2 : ' + self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> 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 4df526007c..c3f44c3622 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 @@ -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.0.201507271600"> <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="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@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']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview'] //@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'] //@ownedViewpoints[name='Design']/@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']/@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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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,45 +83,46 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="Bi-directional EC_EReference " semanticCandidatesExpression="<%getEOppositeEReferences(eAllContents("EReference"))%>" semanticElements="<%self + eOpposite%>" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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}" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%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']/@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']"/> @@ -127,23 +130,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='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.self.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="EC External EClass" semanticCandidatesExpression="<%allRoots.eAllContents("EClass") - eContents.filter("EClass")%>" createElements="false" 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"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%name%> in <%eResourceName%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20attribute'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.1/@ownedTools[name='Drop%20operation']" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -157,7 +160,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> @@ -166,7 +169,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> @@ -176,7 +179,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> @@ -196,7 +199,7 @@ <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -232,7 +235,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"/> @@ -243,7 +246,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"/> @@ -256,7 +259,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"/> @@ -281,7 +284,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> @@ -295,12 +298,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"> @@ -320,7 +323,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> @@ -330,8 +333,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> @@ -345,28 +348,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> @@ -384,35 +387,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> @@ -431,19 +434,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> @@ -459,8 +462,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']"/> @@ -468,7 +471,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']"/> @@ -482,12 +485,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"/> @@ -498,7 +501,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"/> @@ -507,7 +510,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"/> @@ -522,7 +525,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> @@ -534,24 +537,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."/> @@ -561,45 +565,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']"/> @@ -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 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> @@ -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 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> @@ -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 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> @@ -667,15 +672,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> @@ -686,9 +691,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> @@ -696,15 +701,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']"/> @@ -723,22 +728,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" 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" 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']"/> @@ -749,23 +754,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']"/> @@ -784,15 +791,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']"/> @@ -800,7 +807,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"> @@ -808,15 +815,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']"/> @@ -826,15 +833,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']"/> @@ -842,7 +849,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"> @@ -850,15 +857,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']"/> @@ -868,9 +875,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"> @@ -878,7 +885,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"> @@ -888,36 +895,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']"/> @@ -940,8 +949,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> @@ -950,19 +960,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."/> @@ -979,19 +989,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> @@ -1002,21 +1012,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.junit/data/unit/style/ticket2229/2229.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign index 016868ac8f..96b6b7bef9 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.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="tc2229" version="10.0.0.201505222000"> +<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="tc2229" version="10.1.3.201511131800"> <ownedViewpoints name="tc2229" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="tc2229" label="tc2229" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> @@ -101,7 +101,7 @@ </style> </containerMappings> <containerMappings name="EC EClass Workspace Image Container" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> - <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="Workspace_Image_Container_<%name%>" tooltipExpression="aql:self.eContainer().name + '.' + self.name" arcWidth="1" arcHeight="1" workspacePath="/2229/logo_o.png"> + <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" labelExpression="aql:'Workspace_Image_Container_' + self.name" tooltipExpression="aql:self.eContainer().name + '.' + self.name" arcWidth="1" arcHeight="1" workspacePath="/2229/logo_o.png"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign index 67a0c46e66..db9fa31685 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2230/2230.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="2230" version="10.0.0.201505222000"> +<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="2230" version="10.1.3.201511131800"> <ownedViewpoints name="2230" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Entities" titleExpression="aql:self.name + ' package entities'" domainClass="EPackage" enablePopupBars="true"> <defaultLayer name="Default"> @@ -45,13 +45,13 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='computedColor']" tooltipExpression="aql:self.eContainer().name + '.' + self.name" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelColor="//@userColorsPalettes[name='Ecore%20Palette']/@entries[name='computedColor']" tooltipExpression="aql:self.eContainer().name + '.' + self.name" 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='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> <conditionnalStyles predicateExpression="aql:self.abstract"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" tooltipExpression="aql:self.eContainer().name + '.' + self.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']"/> @@ -63,7 +63,7 @@ </defaultLayer> <additionalLayers name="Package" activeByDefault="true"> <containerMappings name="Design Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@containerMappings[name='Design%20Package'] //@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="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='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']"/> @@ -71,7 +71,7 @@ </style> </containerMappings> <containerMappings name="Dropped Package" semanticCandidatesExpression="feature:eAllContents" createElements="false" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='2230']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="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='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']"/> @@ -107,6 +107,6 @@ <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"/> <entries xsi:type="description:UserFixedColor" red="180" green="200" blue="210" name="DescriptionColor"/> - <entries xsi:type="description:ComputedColor" name="computedColor" red="<%filter("EClass").eAttributes[name=="red"].nFirst.defaultValue%>" green="<%filter("EClass").eAttributes[name=="green"].nFirst.defaultValue%>" blue="<%filter("EClass").eAttributes[name=="blue"].nFirst.defaultValue%>"/> + <entries xsi:type="description:ComputedColor" name="computedColor" red="aql:self->filter(ecore::EClass).eAttributes->select( e | e.name='red')->first().defaultValue" green="aql:self->filter(ecore::EClass).eAttributes->select( e | e.name='green')->first().defaultValue" blue="aql:self->filter(ecore::EClass).eAttributes->select( e | e.name='blue')->first().defaultValue"/> </userColorsPalettes> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign index 5f66079621..cd9dbf5a7e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp-3790/VP-3790.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="VP-3790" version="10.0.0.201505222000"> +<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-3790" version="10.1.3.201511131800"> <ownedViewpoints name="VP-3790"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3790" domainClass="EPackage"> <defaultLayer name="Default"> @@ -50,14 +50,14 @@ </conditionnalStyles> </edgeMappings> <containerMappings name="package" semanticCandidatesExpression="var:self" domainClass="EPackage"> - <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='gray']"/> </style> <conditionnalStyles predicateExpression="aql:self.name = 'force base style'"> - <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']"/> @@ -136,14 +136,14 @@ </conditionnalStyles> </edgeMappingImports> <containerMappings xsi:type="description_1:ContainerMappingImport" name="p_import_1" semanticCandidatesExpression="var:self" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@defaultLayer/@containerMappings[name='package']"> - <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='red']"/> </style> <conditionnalStyles predicateExpression="aql:self.name = 'force level 1 style'"> - <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']"/> @@ -161,7 +161,7 @@ </style> </nodeMappings> <edgeMappingImports name="ref_import_2" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@additionalLayers[name='Level%201%20%3A%20red']/@edgeMappingImports[name='ref_import_1']"> - <conditionnalStyles predicateExpression="<%!(name == "force base style" || name == "force level 1 style")%>"> + <conditionnalStyles predicateExpression="aql:not (self.name = 'force base style' or self.name = 'force level 1 style')"> <style lineStyle="dot" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <beginLabelStyleDescription labelExpression="dot"> @@ -174,7 +174,7 @@ </conditionnalStyles> </edgeMappingImports> <edgeMappingImports name="st_import_2" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@additionalLayers[name='Level%201%20%3A%20red']/@edgeMappingImports[name='st_import_1']"> - <conditionnalStyles predicateExpression="<%!(name == "force base style" || name == "force level 1 style")%>"> + <conditionnalStyles predicateExpression="aql:not (self.name = 'force base style' or self.name = 'force level 1 style')"> <style lineStyle="dot" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> <beginLabelStyleDescription labelExpression="dot"> @@ -187,7 +187,7 @@ </conditionnalStyles> </edgeMappingImports> <containerMappings xsi:type="description_1:ContainerMappingImport" name="p_import_2" semanticCandidatesExpression="var:self" importedMapping="//@ownedViewpoints[name='VP-3790']/@ownedRepresentations[name='VP-3790']/@additionalLayers[name='Level%201%20%3A%20red']/@containerMappings[name='p_import_1']"> - <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.junit/data/unit/synchronization/trac2065.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/synchronization/trac2065.odesign index f7adde39b1..fed6e336aa 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/synchronization/trac2065.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/synchronization/trac2065.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" 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="trac2065" 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="trac2065" version="10.1.3.201511131800"> <ownedViewpoints name="trac2065" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram (All Create=true)" domainClass="EPackage"> <defaultLayer name="Default1"> - <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("n") && name.indexOf("*")!=-1]%>" domainClass="EClass"> - <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("bn")].eType%>" domainClass="EClass"> + <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('n') and e.name.index('*')<>-1)" domainClass="EClass"> + <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('bn')).eType" domainClass="EClass"> <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']"/> @@ -17,104 +17,104 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="Containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("c") && name.indexOf("*")!=-1]%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> - <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("n")].eType%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <containerMappings name="Containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('c') and e.name.index('*')<>-1)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('n')).eType" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> <style xsi:type="style:BundledImageDescription" 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> - <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("c")].eType%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('c')).eType" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> + <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="List containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("lc") && name.indexOf("*")!=-1]%>" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('lc') and e.name.index('*')<>-1)" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(All%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" 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='white']"/> @@ -125,8 +125,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20First%20Level%20Elements']" name="Diagram (First Level Create=false, Sub Create=true, Edges Create=true)" domainClass="EPackage"> <defaultLayer name="Default2"> - <nodeMappings name="Nodes (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("n") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass"> - <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("bn")].eType%>" domainClass="EClass"> + <nodeMappings name="Nodes (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('n') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('bn')).eType" domainClass="EClass"> <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']"/> @@ -139,104 +139,104 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="Containers (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("c") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> - <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("n")].eType%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <containerMappings name="Containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('c') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('n')).eType" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> <style xsi:type="style:BundledImageDescription" 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> - <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("c")].eType%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']"/> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('c')).eType" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']"/> + <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="List containers (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("lc") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('lc') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" 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='white']"/> @@ -244,16 +244,16 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop First Level Elements" precondition="<%name.indexOf("*")!=-1%>" forceRefresh="true" mappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop First Level Elements" precondition="aql:self.name.index('*')<>-1" forceRefresh="true" mappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -262,8 +262,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20diagram']" name="Diagram (First Level Create=true, Sub Create=false, Edges Create=true)" domainClass="EPackage"> <defaultLayer name="Default3"> - <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("n") && name.indexOf("*")!=-1]%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20nodes']"> - <borderedNodeMappings name="Border nodes (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("bn")].eType%>" createElements="false" domainClass="EClass"> + <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('n') and e.name.index('*')<>-1)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20nodes']"> + <borderedNodeMappings name="Border nodes (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('bn')).eType" createElements="false" domainClass="EClass"> <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']"/> @@ -276,104 +276,104 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="Containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("c") && name.indexOf("*")!=-1]%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20containers']"> - <subNodeMappings name="Nodes in containers (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("n")].eType%>" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20nodes']"> + <containerMappings name="Containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('c') and e.name.index('*')<>-1)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20containers']"> + <subNodeMappings name="Nodes in containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('n')).eType" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20nodes']"> <style xsi:type="style:BundledImageDescription" 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> - <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("c")].eType%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('c')).eType" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> + <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="List containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("lc") && name.indexOf("*")!=-1]%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20list%20containers']" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('lc') and e.name.index('*')<>-1)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Elements%20in%20list%20containers']" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" 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='white']"/> @@ -387,10 +387,10 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subContainerMappings[name='Containers%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subContainerMappings[name='Containers%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -400,8 +400,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -411,8 +411,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -422,10 +422,10 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -434,8 +434,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20First%20Level%20Elements']" name="Diagram (First Level Create=false, Sub Create=true, Edges Create=false)" domainClass="EPackage"> <defaultLayer name="Default4"> - <nodeMappings name="Nodes (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("n") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass"> - <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("bn")].eType%>" domainClass="EClass"> + <nodeMappings name="Nodes (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('n') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass"> + <borderedNodeMappings name="Border nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('bn')).eType" domainClass="EClass"> <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']"/> @@ -448,104 +448,104 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="Containers (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("c") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> - <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("n")].eType%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <containerMappings name="Containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('c') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> + <subNodeMappings name="Nodes in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('n')).eType" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']/@borderedNodeMappings[name='Border%20nodes%20(create=true)']"> <style xsi:type="style:BundledImageDescription" 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> - <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("c")].eType%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']"/> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('c')).eType" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']"/> + <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="List containers (create=false)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("lc") && name.indexOf("*")!=-1]%>" createElements="false" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('lc') and e.name.index('*')<>-1)" createElements="false" domainClass="EClass" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=true)']" 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='white']"/> @@ -553,16 +553,16 @@ </style> </containerMappings> <toolSections name="Tools"> - <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop First Level Elements" precondition="<%name.indexOf("*")!=-1%>" forceRefresh="true" mappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" dragSource="BOTH"> + <ownedTools xsi:type="tool:ContainerDropDescription" name="Drop First Level Elements" precondition="aql:self.name.index('*')<>-1" forceRefresh="true" mappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" dragSource="BOTH"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" containerViewExpression="var:newContainerView"/> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=false%2C%20Sub%20Create=true%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -571,8 +571,8 @@ </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram (First Level Create=true, Sub Create=false, Edges Create=false)" domainClass="EPackage"> <defaultLayer name="Default5"> - <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("n") && name.indexOf("*")!=-1]%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20BorderNodes']"> - <borderedNodeMappings name="Border nodes (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("bn")].eType%>" createElements="false" domainClass="EClass"> + <nodeMappings name="Nodes (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('n') and e.name.index('*')<>-1)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20BorderNodes']"> + <borderedNodeMappings name="Border nodes (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('bn')).eType" createElements="false" domainClass="EClass"> <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']"/> @@ -585,104 +585,104 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="List containers -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Border nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Nodes" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> Containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="<%eAllContents("EReference")[!containment].eType%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="Border nodes -> List containers" semanticCandidatesExpression="feature:eAllContents" createElements="false" sourceMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" targetMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='List%20containers%20(create=true)']" targetFinderExpression="aql:self.eAllContents(ecore::EReference)->select(e|not e.containment).eType"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <containerMappings name="Containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("c") && name.indexOf("*")!=-1]%>" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20BorderNodes'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Nodes'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Containers']"> - <subNodeMappings name="Nodes in containers (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("n")].eType%>" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']"> + <containerMappings name="Containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('c') and e.name.index('*')<>-1)" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20BorderNodes'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Nodes'] //@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Containers']"> + <subNodeMappings name="Nodes in containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('n')).eType" createElements="false" domainClass="EClass" reusedBorderedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']"> <style xsi:type="style:BundledImageDescription" 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> - <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=false)" semanticCandidatesExpression="<%eAllContents("EReference")[containment==true && name.startsWith("c")].eType%>" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> - <style xsi:type="style:FlatContainerStyleDescription"> + <subContainerMappings xsi:type="description_1:ContainerMappingImport" name="Containers in containers (create=false)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)->select( e | e.containment=true and e.name.startsWith('c')).eType" domainClass="EClass" importedMapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']"/> + <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="List containers (create=true)" semanticCandidatesExpression="<%eAllContents("EClass")[name.startsWith("lc") && name.indexOf("*")!=-1]%>" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Nodes']" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="List containers (create=true)" semanticCandidatesExpression="aql:self.eAllContents(ecore::EClass)->select( e | e.name.startsWith('lc') and e.name.index('*')<>-1)" domainClass="EClass" dropDescriptions="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@toolSections.0/@ownedTools[name='Drop%20Nodes']" reusedNodeMappings="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" 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='white']"/> @@ -696,8 +696,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=false)']/@defaultLayer/@nodeMappings[name='Nodes%20(create=true)']/@borderedNodeMappings[name='Border%20nodes%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -707,8 +707,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subNodeMappings[name='Nodes%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -718,8 +718,8 @@ <element name="element"/> <newViewContainer name="newContainerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="var:element"> - <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subContainerMappings[name='Containers%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> + <firstModelOperations xsi:type="tool_1:For" expression="var:element"> + <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='trac2065']/@ownedRepresentations[name='Diagram%20(First%20Level%20Create=true%2C%20Sub%20Create=false%2C%20Edges%20Create=true)']/@defaultLayer/@containerMappings[name='Containers%20(create=true)']/@subContainerMappings[name='Containers%20in%20containers%20(create=false)']" containerViewExpression="var:newContainerView"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign index 1134016d42..90a9465b63 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/ticket1843/ticket1843.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: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="ticket1843" version="10.0.0.201505222000"> +<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="ticket1843" version="10.1.3.201511131800"> <ownedViewpoints name="Ticket_1843" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Fixture" domainClass="EPackage"> + <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <edgeMappings name="EM_AssociationClass" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetMapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" targetFinderExpression="aql:self.eAllAttributes->select( e | e.name = 'target').eType" sourceFinderExpression="aql:self.eAllAttributes->select( e | e.name = 'source').eType" domainClass="EClass" useDomainElement="true"> <style> @@ -19,7 +20,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </borderedNodeMappings> - <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='gray']"/> @@ -55,7 +56,7 @@ <subModelOperations xsi:type="tool:CreateView" mapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@containerMappings[name='CM_EPackage']/@borderedNodeMappings[name='BN_DataType']" containerViewExpression="var:targetView"/> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%($source.ancestor && $target.ancestor).nFirst%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:(source.ancestors()->asSet()->intersection(target.ancestors()->asSet())->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EClass" referenceName="eClassifiers" variableName="klass"> <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Class' + self.ancestors()->filter(ecore::EPackage)->last().eAllContents(ecore::EClass)->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="EAttribute" referenceName="eStructuralFeatures"> @@ -66,7 +67,7 @@ <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="target"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="eType" valueExpression="var:targetType"/> </subModelOperations> - <subModelOperations xsi:type="tool:CreateEdgeView" mapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@edgeMappings[name='EM_AssociationClass']" containerViewExpression="<% $sourceView.eContainer("DDiagram") %>" sourceExpression="var:sourceType" targetExpression="var:targetType"/> + <subModelOperations xsi:type="tool:CreateEdgeView" mapping="//@ownedViewpoints[name='Ticket_1843']/@ownedRepresentations[name='Fixture']/@defaultLayer/@edgeMappings[name='EM_AssociationClass']" containerViewExpression="aql:sourceView.eContainerOrSelf(diagram::DDiagram) " sourceExpression="var:sourceType" targetExpression="var:targetType"/> </subModelOperations> </subModelOperations> </firstModelOperations> 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 ad63a24c05..afa812cf9f 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 @@ -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.0.201507271600"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" 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> @@ -12,75 +12,75 @@ <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']" semanticConditionExpression="<%filter("EStructuralFeature").derived == false%>"/> + <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@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"> - <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: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"> - <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="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="<%eContents.filter("EClass")%>" createElements="false" domainClass="EClass"> + <nodeMappings name="EC EClass" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass"> <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> - <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%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass'] //@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='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%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass'] //@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='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" synchronizationLock="true" sourceMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']/@subNodeMappings[name='EClassPackage']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']/@subNodeMappings[name='EClassPackage']" 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%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']/@subNodeMappings[name='EClassPackage']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']/@subNodeMappings[name='EClassPackage']" 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']"/> @@ -88,7 +88,7 @@ </style> </conditionnalStyles> </edgeMappings> - <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']"/> @@ -96,38 +96,38 @@ <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.self.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="EC External EClass" semanticCandidatesExpression="<%allRoots.eAllContents("EClass") - eContents.filter("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%name%> in <%eResourceName%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <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> </containerMappings> - <containerMappings name="Design Package" semanticCandidatesExpression="<%eContents.filter("EPackage")%>" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']"> - <subNodeMappings name="EClassPackage" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" createElements="false" semanticElements="<%eContents.filter("EClass")%>" domainClass="EClass"> + <containerMappings name="Design Package" semanticCandidatesExpression="aql:self.eContents()->filter(ecore::EPackage)" domainClass="EPackage" reusedContainerMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']"> + <subNodeMappings name="EClassPackage" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Name']" semanticCandidatesExpression="feature:eAllContents" createElements="false" semanticElements="aql:self.eContents()->filter(ecore::EClass)" domainClass="EClass"> <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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </subNodeMappings> - <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']"/> @@ -140,7 +140,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="<%eContents.filter("EClass")%>"> + <firstModelOperations xsi:type="tool:For" expression="aql:self.eContents()->filter(ecore::EClass)"> <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='Design%20Package']/@subNodeMappings[name='EClassPackage']" containerViewExpression="var:containerView"/> </firstModelOperations> </initialOperation> @@ -149,7 +149,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool:For" expression="<%eContents.filter("EClass")%>"> + <firstModelOperations xsi:type="tool:For" expression="aql:self.eContents()->filter(ecore::EClass)"> <subModelOperations xsi:type="tool_1:CreateView" mapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@nodeMappings[name='EC%20EClass']" containerViewExpression="var:containerView"/> </firstModelOperations> </initialOperation> @@ -159,7 +159,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> @@ -169,7 +169,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> @@ -179,7 +179,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool:CreateInstance" typeName="EClass" referenceName="eClassifiers"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="new Class <%eContainer().eContents().filter("EClass").nSize%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:'new Class ' + self.eContainer().eContents()->filter(ecore::EClass)->size()"/> </firstModelOperations> </initialOperation> </tools> @@ -198,7 +198,7 @@ <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -238,7 +238,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"/> @@ -263,7 +263,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> @@ -278,7 +278,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> @@ -288,8 +288,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> @@ -303,12 +303,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> @@ -325,18 +325,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> @@ -355,9 +355,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> @@ -366,9 +366,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> @@ -376,11 +376,11 @@ <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> @@ -394,7 +394,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> @@ -408,7 +408,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> @@ -421,23 +421,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."/> @@ -447,7 +448,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"> @@ -460,37 +461,37 @@ <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 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"> @@ -498,9 +499,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']"/> @@ -513,22 +514,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']"/> @@ -536,15 +538,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']"/> @@ -557,7 +559,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> @@ -586,7 +588,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> @@ -601,7 +603,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> @@ -650,9 +652,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> @@ -662,12 +664,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"/> @@ -688,12 +690,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> @@ -710,18 +712,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> @@ -731,8 +733,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']"/> @@ -740,7 +742,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']"/> @@ -754,7 +756,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> @@ -764,7 +766,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"/> @@ -779,41 +781,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"> - <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"> + <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']"/> @@ -827,15 +830,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> @@ -845,15 +848,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> @@ -863,15 +866,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> @@ -881,15 +884,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> @@ -901,7 +904,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> @@ -909,8 +912,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']"/> @@ -920,22 +923,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" 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" 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']"/> @@ -950,19 +953,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']"/> @@ -971,15 +976,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']"/> @@ -987,7 +992,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"> @@ -995,15 +1000,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']"/> @@ -1013,15 +1018,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']"/> @@ -1029,7 +1034,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"> @@ -1037,15 +1042,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']"/> @@ -1057,7 +1062,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"> @@ -1065,7 +1070,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"> @@ -1075,36 +1080,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']"/> @@ -1117,8 +1124,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"> - <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> @@ -1128,21 +1136,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> @@ -1153,29 +1162,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> @@ -1184,18 +1193,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."/> @@ -1212,19 +1221,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> @@ -1232,12 +1241,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> @@ -1251,15 +1261,15 @@ <ownedViewpoints name="BorderedNodeView" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="borderedNodeView" domainClass="EPackage"> <defaultLayer name="Default"> - <containerMappings name="PackageListContainer" semanticCandidatesExpression="<%eSubpackages%>" domainClass="EPackage" childrenPresentation="List"> - <borderedNodeMappings name="BorderedClass" semanticCandidatesExpression="<%eClassifiers%>" domainClass="EClass"> + <containerMappings name="PackageListContainer" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage" childrenPresentation="List"> + <borderedNodeMappings name="BorderedClass" semanticCandidatesExpression="aql:self.eClassifiers" domainClass="EClass"> <style xsi:type="style:SquareDescription" 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> </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']"/> @@ -1295,7 +1305,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.junit/data/unit/tool/ecore.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/ecore.odesign index 8ceeac4e71..94d75ee640 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 @@ -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.0.201507271600"> <ownedViewpoints name="Design" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" name="Entities" titleExpression="<%name%> package entities" domainClass="EPackage" enablePopupBars="true"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.0/@ownedTools[name='External%20EClass%20from%20treeview']" 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,60 +12,60 @@ <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference'] //@ownedViewpoints[name='Design']/@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']/@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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="//@ownedViewpoin" 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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="//@ownedViewpoin" 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%>"> - <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']/@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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%eSuperTypes%>" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> - <style targetArrow="InputClosedArrow" sizeComputationExpression="1" routingStyle="manhattan"> + <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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eSuperTypes" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectESupertype']"> + <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']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> - <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']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetMapping="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" targetFinderExpression="aql:self.eType" sourceFinderExpression="feature:eContainer" targetExpression="" domainClass="EReference" useDomainElement="true" reconnections="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.3/@ownedTools[name='ReconnectEReference']"> + <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']/@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="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']/@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.name.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> - <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="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,23 +120,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='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.self.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="EC External EClass" semanticCandidatesExpression="<%allRoots.eAllContents("EClass") - eContents.filter("EClass")%>" createElements="false" domainClass="EClass" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" tooltipExpression="<%name%> in <%eResourceName%>" backgroundStyle="GradientTopToBottom"> + <containerMappings name="EC External EClass" semanticCandidatesExpression="aql:self.allRoots().eAllContents(ecore::EClass) - self.eContents()->filter(ecore::EClass)" createElements="false" domainClass="EClass" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" tooltipExpression="aql:self.name + ' in ' + self.eResource().getURI().lastSegment()" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> @@ -149,7 +150,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 +159,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 +169,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> @@ -188,7 +189,7 @@ <firstModelOperations xsi:type="tool:CreateInstance" typeName="EEnum" referenceName="eClassifiers"/> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> + <ownedTools xsi:type="tool_1:ContainerDropDescription" name="External EClass from treeview" forceRefresh="true" mappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20External%20EClass']" dragSource="PROJECT_EXPLORER"> <oldContainer name="oldSemanticContainer"/> <newContainer name="newSemanticContainer"/> <element name="element"/> @@ -228,7 +229,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"/> @@ -253,7 +254,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> @@ -267,12 +268,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"> @@ -292,7 +293,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> @@ -302,8 +303,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> @@ -316,11 +317,11 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool:If" conditionExpression="<%$source!=element.eContainer()%>"> + <firstModelOperations 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> - <subModelOperations xsi:type="tool:If" conditionExpression="<%$source==element.eContainer()%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:source = element.eContainer()"> <subModelOperations xsi:type="tool:SetValue" featureName="eReferenceType" valueExpression="var:element"/> </subModelOperations> </firstModelOperations> @@ -334,11 +335,11 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool:If" conditionExpression="<%$source!=element.eContainer()%>"> + <firstModelOperations xsi:type="tool:If" conditionExpression="aql:source <> element.eContainer()"> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:target"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/> </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:source"> <subModelOperations xsi:type="tool:SetValue" featureName="eSuperTypes" valueExpression="var:element"/> </subModelOperations> @@ -359,9 +360,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> @@ -370,9 +371,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> @@ -380,25 +381,25 @@ <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:If" conditionExpression="<%getOperationParametersFromString($0)%>"> - <subModelOperations xsi:type="tool:For" expression="<%getOperationParametersFromString($0)%>"> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eParameters.nSize()<i%>"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getOperationParametersFromString(arg0)"> + <subModelOperations xsi:type="tool:For" expression="aql:self.getOperationParametersFromString(arg0)"> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eParameters->size()<i"> <subModelOperations xsi:type="tool:CreateInstance" typeName="EParameter" referenceName="eParameters"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getParameterNameFromString($i)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($i)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($i)%>"/> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getParameterNameFromString(i)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(i)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(i)"/> </subModelOperations> </subModelOperations> </subModelOperations> - <subModelOperations xsi:type="tool:If" conditionExpression="<%eParameters.nSize()>i%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%eParameters.nGet(i)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%getParameterNameFromString($i)%>"/> - <subModelOperations xsi:type="tool:If" conditionExpression="<%getTypeIfWritten($i)%>"> - <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="<%getTypeIfWritten($i)%>"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.eParameters->size()>i"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.eParameters->at(i + 1)"> + <subModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.getParameterNameFromString(i)"/> + <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.getTypeIfWritten(i)"> + <subModelOperations xsi:type="tool:SetValue" featureName="eType" valueExpression="aql:self.getTypeIfWritten(i)"/> </subModelOperations> </subModelOperations> </subModelOperations> @@ -410,8 +411,8 @@ </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'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%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']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@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']/@ownedRepresentations[name='Entities']/@defaultLayer/@toolSections.2/@ownedTools[name='New%20Package%20Entities'] //@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']/@toolSections.0/@ownedTools[name='Create%20Blank%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']/@defaultLayer/@containerMappings[name='EC%20EClass'] //@ownedViewpoints[name='Design']/@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']"/> @@ -419,7 +420,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']"/> @@ -433,7 +434,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> @@ -447,7 +448,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> @@ -460,23 +461,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."/> @@ -486,7 +488,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']" name="Blank Entities" titleExpression="blank diagram" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Hide class content"> @@ -499,45 +501,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"> - <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"> + <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%>"> + <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"> <style lineStyle="dash" targetArrow="InputClosedArrow" sizeComputationExpression="2" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> @@ -545,9 +547,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']"/> @@ -560,22 +562,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="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']"/> @@ -583,15 +586,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']"/> @@ -604,7 +607,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> @@ -633,7 +636,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> @@ -647,12 +650,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"> @@ -672,7 +675,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> @@ -721,9 +724,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> @@ -733,12 +736,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"/> @@ -753,41 +756,42 @@ </defaultLayer> </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']"/> @@ -801,15 +805,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> @@ -819,15 +823,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> @@ -837,15 +841,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> @@ -855,15 +859,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> @@ -875,7 +879,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> @@ -883,8 +887,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']"/> @@ -894,22 +898,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" 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" 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']"/> @@ -924,19 +928,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']"/> @@ -945,15 +951,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']"/> @@ -961,7 +967,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"> @@ -969,15 +975,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']"/> @@ -987,15 +993,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']"/> @@ -1003,7 +1009,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"> @@ -1011,15 +1017,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']"/> @@ -1031,7 +1037,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"> @@ -1039,7 +1045,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"> @@ -1049,36 +1055,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']"/> @@ -1091,8 +1099,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> @@ -1102,21 +1111,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> @@ -1127,29 +1137,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> @@ -1158,18 +1168,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."/> @@ -1186,19 +1196,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> @@ -1206,12 +1216,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> @@ -1223,7 +1234,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.junit/data/unit/tool/hide-reveal/tc-2330/tc2330.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/hide-reveal/tc-2330/tc2330.odesign index 947bd1861f..8b5cce52be 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/hide-reveal/tc-2330/tc2330.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/hide-reveal/tc-2330/tc2330.odesign @@ -1,35 +1,35 @@ <?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" 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="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" 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="2330" version="10.1.0.201507271600"> <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" filterKind="COLLAPSE" 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.junit/data/unit/tool/tc1909/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc1909/My.odesign index 73adf1a450..584745bef2 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc1909/My.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc1909/My.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/description/tool/1.1.0" name="zzz" 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="zzz" version="10.1.3.201511131800"> <ownedViewpoints name="zzz" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Test" domainClass="EPackage"> <defaultLayer name="Default"> - <edgeMappings name="relation" semanticCandidatesExpression="<%eAllContents("EReference")%>" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='zzz']/@ownedRepresentations[name='Test']/@defaultLayer/@containerMappings[name='classe']" targetMapping="//@ownedViewpoints[name='zzz']/@ownedRepresentations[name='Test']/@defaultLayer/@containerMappings[name='classe']" targetFinderExpression="<%eType%>" sourceFinderExpression="feature:eContainer" domainClass="EReference" useDomainElement="true"> - <style> + <edgeMappings name="relation" semanticCandidatesExpression="aql:self.eAllContents(ecore::EReference)" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='zzz']/@ownedRepresentations[name='Test']/@defaultLayer/@containerMappings[name='classe']" targetMapping="//@ownedViewpoints[name='zzz']/@ownedRepresentations[name='Test']/@defaultLayer/@containerMappings[name='classe']" targetFinderExpression="aql:self.eType" 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']"/> @@ -12,14 +12,14 @@ </style> </edgeMappings> <containerMappings name="classe" semanticCandidatesExpression="feature:eAllContents" domainClass="EClass"> - <subNodeMappings name="Attribute" semanticCandidatesExpression="<%eAttributes%>" domainClass="EAttribute"> + <subNodeMappings name="Attribute" semanticCandidatesExpression="aql:self.eAttributes" domainClass="EAttribute"> <style xsi:type="style:SquareDescription"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <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']"/> @@ -31,7 +31,7 @@ <element name="element"/> <elementView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="<%name%>A"/> + <firstModelOperations xsi:type="tool:SetValue" featureName="name" valueExpression="aql:self.name + 'A'"/> </initialOperation> </ownedTools> </toolSections> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign index 602aefc139..37fd652e8c 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tool/tc931/uml2.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" 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 modelers" 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="uml2 modeler" name="UML2 modelers" version="10.1.0.201507271600"> <ownedViewpoints name="UML Behavioral Modeling" modelFileExtension="uml"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Activity Diagram" titleExpression="<%name%> Activity Diagram" domainClass="Activity"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Activity Diagram" titleExpression="aql:self.name + ' Activity Diagram'" domainClass="Activity"> <defaultLayer name="Activity"> - <edgeMappings name="AD_ControlFlow_ActivityNode2ControlNode" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode'] //@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subNodeMappings[name='AD_ControlNode']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subNodeMappings[name='AD_ControlNode'] //@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']" targetFinderExpression="<%source%>" sourceFinderExpression="<%target%>" domainClass="ControlFlow" useDomainElement="true"> + <edgeMappings name="AD_ControlFlow_ActivityNode2ControlNode" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode'] //@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subNodeMappings[name='AD_ControlNode']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subNodeMappings[name='AD_ControlNode'] //@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']" targetFinderExpression="aql:self.source" sourceFinderExpression="aql:self.target" domainClass="ControlFlow" useDomainElement="true"> <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%guard != null && source.filter("DecisionNode").nSize() >0%>"> + <conditionnalStyles predicateExpression="aql:self.guard <> null and source.oclIsKindOf(uml::DecisionNode)"> <style sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> <centerLabelStyleDescription showIcon="false" labelExpression="[<%guard.body.nFirst()%>]"> @@ -19,7 +19,7 @@ </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="AD_ObjectFlow2ObjectFlow" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="ObjectFlow" useDomainElement="true"> + <edgeMappings name="AD_ObjectFlow2ObjectFlow" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="ObjectFlow" useDomainElement="true"> <style sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <centerLabelStyleDescription> @@ -27,7 +27,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="AD_ObjectFlow2Parameter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@borderedNodeMappings[name='AD_Parameter']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="ObjectFlow" useDomainElement="true"> + <edgeMappings name="AD_ObjectFlow2Parameter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@borderedNodeMappings[name='AD_Parameter']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="ObjectFlow" useDomainElement="true"> <style sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <centerLabelStyleDescription> @@ -35,7 +35,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="AD_ObjectFlow2DataStore" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_DataStore']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="ObjectFlow" useDomainElement="true"> + <edgeMappings name="AD_ObjectFlow2DataStore" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_DataStore']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="ObjectFlow" useDomainElement="true"> <style sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <centerLabelStyleDescription> @@ -43,7 +43,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="AD_DataStore2ObjectFlow" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_DataStore']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetFinderExpression="<%target%>" sourceFinderExpression="<%source%>" domainClass="ObjectFlow" useDomainElement="true"> + <edgeMappings name="AD_DataStore2ObjectFlow" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_DataStore']" targetMapping="//@ownedViewpoints[name='UML%20Behavioral%20Modeling']/@ownedRepresentations[name='Activity%20Diagram']/@defaultLayer/@containerMappings[name='AD_Activity']/@subContainerMappings[name='AD_ExecutableNode']/@borderedNodeMappings[name='Pin']" targetFinderExpression="aql:self.target" sourceFinderExpression="aql:self.source" domainClass="ObjectFlow" useDomainElement="true"> <style sizeComputationExpression="" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_green']"/> <centerLabelStyleDescription> @@ -124,14 +124,14 @@ </conditionnalStyles> </subNodeMappings> <subNodeMappings name="Comment" semanticCandidatesExpression="feature:eAllContents" domainClass="Comment"> - <style xsi:type="style:NoteDescription" borderSizeComputationExpression="1" labelExpression="<%body%>" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW"> + <style xsi:type="style:NoteDescription" borderSizeComputationExpression="1" labelExpression="aql:self.body" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <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> </subNodeMappings> <subContainerMappings name="AD_DataStore" semanticCandidatesExpression="feature:eAllContents" domainClass="DataStoreNode"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="Liquid"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -139,61 +139,61 @@ </style> </subContainerMappings> <subContainerMappings name="AD_ExecutableNode" semanticCandidatesExpression="feature:eContents" domainClass="ExecutableNode"> - <borderedNodeMappings name="Pin" semanticCandidatesExpression="<%ownedElement[~target.filter("Element") == null]%>" domainClass="Pin"> + <borderedNodeMappings name="Pin" semanticCandidatesExpression="aql:self.ownedElement->select( e | e.eInverse('target')->filter(uml::Element) = null)" domainClass="Pin"> <style xsi:type="style:SquareDescription" sizeComputationExpression="1" resizeKind="NSEW"> <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> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" roundedCorner="true"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" roundedCorner="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']"/> <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 predicateExpression="<%getAppliedStereotypes().nSize() > 0 && filter("CallOperationAction").nSize() >0 && operation == null%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" labelExpression="<%"<<"+getAppliedStereotypes().nFirst().name+">>\n"+name%>" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() > 0 and self.oclIsKindOf(uml::CallOperationAction) and self.operation = null"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:'<<'+self.getAppliedStereotypes()->first().name+'>>\n'+self.name" roundedCorner="true"> <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_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%getAppliedStereotypes().nSize() == 0 && filter("CallOperationAction").nSize() >0 && operation !=null%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" labelExpression="<%operation.name%>" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() = 0 and self.oclIsKindOf(uml::CallOperationAction) and self.operation <>null"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:self.operation.name" roundedCorner="true"> <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_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%getAppliedStereotypes().nSize() > 0 && filter("CallOperationAction").nSize() >0 && operation !=null%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" labelExpression="<%"<<"+getAppliedStereotypes().nFirst().name+">>\n"+operation.name%>" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() > 0 and self.oclIsKindOf(uml::CallOperationAction) and self.operation <>null"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" labelExpression="aql:'<<'+self.getAppliedStereotypes()->first().name+'>>\n'+ self.operation.name" roundedCorner="true"> <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_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%getAppliedStereotypes().nSize() == 0 && filter("CallOperationAction").nSize() >0 && operation == null%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() = 0 and self.oclIsKindOf(uml::CallOperationAction) and self.operation = null"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" roundedCorner="true"> <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_yellow']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%getAppliedStereotypes().nSize() > 0 && filter("OpaqueAction").nSize() >0%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" showIcon="false" labelExpression="<%"<<"+getAppliedStereotypes().nFirst().name+">>\n"+body.nFirst()%>" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() > 0 and self.oclIsKindOf(uml::OpaqueAction)"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" showIcon="false" labelExpression="aql:'<<'+self.getAppliedStereotypes()->first().name+'>>\n'+self.body->first()" roundedCorner="true"> <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='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%getAppliedStereotypes().nSize() == 0 && filter("OpaqueAction").nSize() >0%>"> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" showIcon="false" labelExpression="<%body.nFirst()%>" roundedCorner="true"> + <conditionnalStyles predicateExpression="aql:self.getAppliedStereotypes()->size() = 0 and self.oclIsKindOf(uml::OpaqueAction)"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" showIcon="false" labelExpression="aql:self.body->first()" roundedCorner="true"> <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='white']"/> @@ -201,7 +201,7 @@ </style> </conditionnalStyles> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" roundedCorner="true" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelSize="10" roundedCorner="true" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -215,7 +215,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="InitialNode" referenceName="node"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Initial_<%$container.node.filter("InitialNode").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Initial_' + container.node->filter(uml::InitialNode)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -224,7 +224,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="ActivityFinalNode" referenceName="node"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="ActivityFinal_<%$container.node.filter("ActivityFinalNode").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'ActivityFinal_' + container.node->filter(uml::ActivityFinalNode)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -233,7 +233,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="DecisionNode" referenceName="node"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Decision_<%$container.node.filter("DecisionNode").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Decision_' + container.node->filter(uml::DecisionNode)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -242,7 +242,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="MergeNode" referenceName="node"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="Merge_<%$container.node.filter("MergeNode").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'Merge_' + container.node->filter(uml::MergeNode)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> @@ -251,12 +251,12 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="OpaqueAction" referenceName="node"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="OpaqueAction_<%$container.node.filter("OpaqueAction").nSize()%>"/> - <subModelOperations xsi:type="tool_1:SetValue" featureName="body" valueExpression="// TODO body of <%$instance.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'OpaqueAction_' + container.node->filter(uml::OpaqueAction)->size()"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="body" valueExpression="aql:'// TODO body of ' + instance.name"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="Call Operation Action" precondition="<%$container.filter("Activity")%>" forceRefresh="true" candidatesExpression="<%getRootContainer().eAllContents("Operation")%>" message="Select the target operation of the call operation action to create" iconPath="/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" windowTitle="New Call Operation Action" windowImagePath=""> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="Call Operation Action" precondition="aql:container.oclIsKindOf(uml::Activity)" forceRefresh="true" candidatesExpression="aql:self.eResource().getContent()->first().eAllContents(uml::Operation)" message="Select the target operation of the call operation action to create" iconPath="/org.eclipse.uml2.uml.edit/icons/full/obj16/CallOperationAction.gif" windowTitle="New Call Operation Action" windowImagePath=""> <element name="element"/> <containerView name="containerView"/> <container name="container"/> @@ -273,9 +273,9 @@ <sourceViewVariable name="sourceView"/> <targetViewVariable name="targetView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="ControlFlow" referenceName="edge"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="<%$source.name%>_To_<%$target.name%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:source.name + '_To_' + target.name"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="source" valueExpression="var:source"/> <subModelOperations xsi:type="tool_1:SetValue" featureName="target" valueExpression="var:target"/> </subModelOperations> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign index 537b830b39..9a2c261149 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/VP-3834/VP-3834.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-3834" version="10.0.0.201505222000"> <ownedViewpoints name="VP-3834_Viewpoint" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() == null"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() = null"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <nodeMappings name="EClassMapping" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass"> @@ -19,7 +19,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EPackageMapping" preconditionExpression="aql:self.eContainer <> null" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@nodeMappings[name='EClassMapping']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> + <containerMappings name="EPackageMapping" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@nodeMappings[name='EClassMapping']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign index c781f03247..64cb54c9da 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/palette/VP-3600.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="10.0.0.201505222000"> +<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="Doremi-2847"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="BlankDiagram" domainClass="EPackage"> <defaultLayer name="Default"> @@ -26,7 +26,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </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='light_blue']"/> @@ -87,7 +87,7 @@ <additionalLayers name="ExclusiveLayer"> <toolSections name="TestSection"> <ownedTools xsi:type="tool:NodeCreationDescription" name="createClass" nodeMappings="//@ownedViewpoints[name='Doremi-2847']/@ownedRepresentations[name='BlankDiagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"> - <filters precondition="<%self.ownedDiagramElements.nSize()==1%>" elementsToListen="var:self"> + <filters precondition="aql:self.ownedDiagramElements->size()=1" elementsToListen="var:self"> <listeners domainClass="DDiagram" featureName="ownedDiagramElements"/> </filters> <variable name="container"/> @@ -125,7 +125,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </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='light_blue']"/> @@ -192,7 +192,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </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='light_blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign index 2e5bd929a7..c9570f86d5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/paneBasedSelectionWizard/paneBasedSelection.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: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="paneBasedSelection" version="10.0.0.201505222000"> +<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="paneBasedSelection" version="10.1.3.201511131800"> <ownedViewpoints name="paneBasedSelectionTests" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PaneBasedSelectionTestDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() == null"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="PaneBasedSelectionTestDiagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() = null"> <defaultLayer name="Default"> <nodeMappings name="Class" semanticCandidatesExpression="feature:eContents" domainClass="EClass"> <style xsi:type="style:SquareDescription"> @@ -16,7 +16,7 @@ </style> </edgeMappings> <containerMappings name="Package" semanticCandidatesExpression="feature:eAllContents" domainClass="EPackage" reusedNodeMappings="//@ownedViewpoints[name='paneBasedSelectionTests']/@ownedRepresentations[name='PaneBasedSelectionTestDiagram']/@defaultLayer/@nodeMappings[name='Class']"> - <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='gray']"/> @@ -34,7 +34,7 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" name="paneSelectionTest2" precondition="false" message="message" candidatesExpression="<%$containerView.eContainer("DDiagram").target.eAllContents%>" tree="true" rootExpression="aql:containerView.eContainerOrSelf(DDiagram).target.eContents" childrenExpression="feature:eContents" preSelectedCandidatesExpression="aql:containerView.eContainerOrSelf(diagram::DDiagram).target.eContents()->filter(ecore::EPackage)->select( e | e.name='testPackage')"> + <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" name="paneSelectionTest2" precondition="false" message="message" candidatesExpression="aql:containerView.eContainerOrSelf(diagram::DDiagram).target.eAllContents()" tree="true" rootExpression="aql:containerView.eContainerOrSelf(DDiagram).target.eContents" childrenExpression="feature:eContents" preSelectedCandidatesExpression="aql:containerView.eContainerOrSelf(diagram::DDiagram).target.eContents()->filter(ecore::EPackage)->select( e | e.name='testPackage')"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign index 30e5fc17a9..1bf8064216 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/variablefilter/ticketvp1063/vp-1063.odesign @@ -1,15 +1,15 @@ <?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="10.0.0.201505222000"> +<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="vp1063"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="vp1063" domainClass="EPackage"> <filters xsi:type="filter:CompositeFilterDescription" name="Classifier"> - <filters xsi:type="filter:VariableFilter" semanticConditionExpression="<%$EClass.nContains(current)%>"> + <filters xsi:type="filter:VariableFilter" semanticConditionExpression="aql:EClass->includes(self)"> <ownedVariables candidatesExpression="aql:self.eClassifiers" multiple="true" name="EClass"/> </filters> </filters> <defaultLayer name="Default"> <containerMappings name="EClass" domainClass="EClass"> - <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']"/> @@ -17,7 +17,7 @@ </style> </containerMappings> <containerMappings name="EEnum" domainClass="EEnum"> - <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']"/> @@ -25,7 +25,7 @@ </style> </containerMappings> <containerMappings name="EPackage" domainClass="EPackage"> - <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.junit/data/unit/viewpoint_uri/ecoreToReuse.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/viewpoint_uri/ecoreToReuse.odesign index 65c6da38a5..ef40c489c4 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/viewpoint_uri/ecoreToReuse.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/viewpoint_uri/ecoreToReuse.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" 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" 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"> <defaultLayer name="Default"> <reusedMappings xsi:type="description_1:NodeMapping" href="viewpoint:/org.eclipse.sirius.sample.ecore.design/Documentation#//@ownedViewpoints[name='Documentation']/@ownedRepresentationExtensions[name='Entities']/@layers[name='Documentation']/@nodeMappings[name='EC%20Doc%20Annotation']"/> </defaultLayer> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vp-1688/vp-1688.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vp-1688/vp-1688.odesign index a54fb535f8..95a32bd72d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vp-1688/vp-1688.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vp-1688/vp-1688.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="VP-1688" 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-1688" version="10.1.0.201507271600"> <ownedViewpoints name="VP-1688" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-1688" domainClass="EPackage"> <defaultLayer name="Default"> @@ -17,7 +17,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='orange']"/> </style> </nodeMappings> - <edgeMappings name="ClassUse" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="<%eReferences.eType%>"> + <edgeMappings name="ClassUse" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetFinderExpression="aql:self.eReferences.eType"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -25,7 +25,7 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="PackageUse" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="<%eReferences.eType.eContainer.nMinimize%>"> + <edgeMappings name="PackageUse" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='VP-1688']/@ownedRepresentations[name='VP-1688']/@defaultLayer/@nodeMappings[name='Package']" targetFinderExpression="aql:self.eReferences.eType.eContainer()->asSet()"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> @@ -38,10 +38,10 @@ <menuItemDescription xsi:type="tool:OperationAction" name="Group Classes"> <view name="views"/> <initialOperation> - <firstModelOperations xsi:type="tool:If" conditionExpression="<%$views.target.filter("EClass").nSize > 1%>"> - <subModelOperations xsi:type="tool:ChangeContext" browseExpression="<%$views.target.eContainer%>"> + <firstModelOperations xsi:type="tool:If" conditionExpression="aql:views.target->filter(ecore::EClass)->size() > 1"> + <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views.target.eContainer()->first()"> <subModelOperations xsi:type="tool:CreateInstance" typeName="ecore.EPackage" referenceName="eSubpackages" variableName="pkg"> - <subModelOperations xsi:type="tool:For" expression="<%$views.target.filter("EClass")%>" iteratorName="klass"> + <subModelOperations xsi:type="tool:For" expression="aql:views.target->filter(ecore::EClass)" iteratorName="klass"> <subModelOperations xsi:type="tool:MoveElement" newContainerExpression="var:pkg" featureName="eClassifiers"/> </subModelOperations> <subModelOperations xsi:type="tool:ChangeContext" browseExpression="var:pkg"> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign index 53ab53095c..9ec6875426 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/validateVSMWithNoStyle.odesign @@ -1,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" 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/diagram/description/1.1.0" version="10.1.3.201511131800"> <ownedViewpoints name="2475"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Diagram" domainClass="EPackage"> <defaultLayer name="Default"> <nodeMappings name="node" domainClass="EClass"> - <conditionnalStyles predicateExpression="<%%>"/> + <conditionnalStyles predicateExpression="aql:OrderedSet{}"/> </nodeMappings> <nodeMappings xsi:type="description_1:NodeMappingImport" name="nodeImport" domainClass="EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']"/> - <edgeMappings name="relation" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetFinderExpression="<%%>"/> + <edgeMappings name="relation" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@nodeMappings[name='node']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetFinderExpression="aql:OrderedSet{}"/> <edgeMappings name="elementEdge" sourceMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']" targetMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='containerImport']" domainClass="EReference" useDomainElement="true"/> <edgeMappingImports name="edgeImport" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@edgeMappings[name='relation']"/> <containerMappings name="container" domainClass="EClass"> - <conditionnalStyles predicateExpression="<%%>"/> + <conditionnalStyles predicateExpression="aql:OrderedSet{}"/> </containerMappings> <containerMappings xsi:type="description_1:ContainerMappingImport" name="containerImport" domainClass="EClass" importedMapping="//@ownedViewpoints[name='2475']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='container']"/> </defaultLayer> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign index cbd7358231..1e9200e766 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/vsm/valideVSMWithDiagramExtension.odesign @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" name="VP-3834" version="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-3834" version="10.1.3.201511131800"> <ownedViewpoints name="VP-3834_Viewpoint" modelFileExtension="ecore"> - <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="<%eContainer == null%>"> + <ownedRepresentations xsi:type="description_1:DiagramDescription" name="VP-3834_Diagram" initialisation="true" domainClass="EPackage" preconditionExpression="aql:self.eContainer() = null"> <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/> <defaultLayer name="Default"> <nodeMappings name="EClassMapping" semanticCandidatesExpression="[eClassifiers/]" domainClass="ecore.EClass"> @@ -19,8 +19,8 @@ </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="EPackageMapping" preconditionExpression="<%eContainer != null%>" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@nodeMappings[name='EClassMappingBis']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> - <style xsi:type="style:FlatContainerStyleDescription"> + <containerMappings name="EPackageMapping" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="[eSubpackages/]" createElements="false" domainClass="ecore.EPackage" reusedNodeMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@nodeMappings[name='EClassMappingBis']" reusedContainerMappings="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> + <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']"/> @@ -88,8 +88,8 @@ </style> </conditionnalStyles> </edgeMappingImports> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingBis" preconditionExpression="<%eContainer != null %>" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingBis" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="[eSubpackages/]" domainClass="ecore.EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@defaultLayer/@containerMappings[name='EPackageMapping']"> + <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']"/> @@ -110,20 +110,26 @@ <conditionnalStyles predicateExpression="[true/]"> <style xsi:type="style:BracketEdgeStyleDescription" sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <beginLabelStyleDescription labelFormat="bold_italic"> + <beginLabelStyleDescription> + <labelFormat>italic</labelFormat> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </beginLabelStyleDescription> - <centerLabelStyleDescription labelFormat="bold_italic"> + <centerLabelStyleDescription> + <labelFormat>italic</labelFormat> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </centerLabelStyleDescription> - <endLabelStyleDescription labelFormat="bold_italic"> + <endLabelStyleDescription> + <labelFormat>italic</labelFormat> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </endLabelStyleDescription> </style> </conditionnalStyles> </edgeMappingImports> - <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="<%eContainer != null %>" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']"> - <style xsi:type="style:ShapeContainerStyleDescription"> + <containerMappings xsi:type="description_1:ContainerMappingImport" name="EPackageMappingTer" preconditionExpression="aql:self.eContainer() <> null" semanticCandidatesExpression="aql:self.oclAsType(ecore::EPackage).eSubpackages" domainClass="EPackage" childrenPresentation="List" importedMapping="//@ownedViewpoints[name='VP-3834_Viewpoint']/@ownedRepresentations[name='VP-3834_Diagram']/@additionalLayers[name='L1']/@containerMappings[name='EPackageMappingBis']"> + <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']"/> |