diff options
| author | cbrun | 2015-12-28 16:10:28 +0000 |
|---|---|---|
| committer | cbrun | 2016-01-04 14:28:11 +0000 |
| commit | b57d1f6f89e5888c8bd6afb5dcd0265ee68876db (patch) | |
| tree | b269fee7c8c44b47b401d87f6c27d6fbba81d6c0 | |
| parent | c646fd66dd7cd97429ad5cb45e30034d3bf707ff (diff) | |
| download | org.eclipse.sirius-b57d1f6f89e5888c8bd6afb5dcd0265ee68876db.tar.gz org.eclipse.sirius-b57d1f6f89e5888c8bd6afb5dcd0265ee68876db.tar.xz org.eclipse.sirius-b57d1f6f89e5888c8bd6afb5dcd0265ee68876db.zip | |
[478878] Migrate docbook sample VSM to AQL
And remove dependency from junit test plugin to query legacy
Bug: 478878
Change-Id: Id5ea765a6a4fa3858754505036316f0cd0b330d4
8 files changed, 330 insertions, 324 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF index 1e3665d8d8..b84221db23 100644 --- a/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.tests.junit/META-INF/MANIFEST.MF @@ -61,7 +61,6 @@ Require-Bundle: org.eclipse.sirius.tests.sample.benchmark, org.eclipse.core.expressions;bundle-version="3.4.101", org.eclipse.sirius.common.acceleo.mtl, org.eclipse.sirius.common.acceleo.mtl.ide, - org.eclipse.sirius.query.legacy, org.eclipse.sirius.tests.sample.migration, org.eclipse.sirius.tests.sample.migration.design, org.eclipse.acceleo.common;bundle-version="3.4.1", diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/AddSemanticElementTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/AddSemanticElementTest.java index 881205ff84..6b7f6161b8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/AddSemanticElementTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/AddSemanticElementTest.java @@ -122,6 +122,7 @@ public class AddSemanticElementTest extends DiagramIntegrityTestCase { // add a chapter in the semantic model. addTinySection(); + activateViewpoint("docbook1"); // create a diagram based on my semantic model (simple.docbook) myRepresentation = createRepresentation("evoluate view"); diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/DeleteSemanticElementTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/DeleteSemanticElementTest.java index 34c7b3e162..eadb98bb41 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/DeleteSemanticElementTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/DeleteSemanticElementTest.java @@ -126,8 +126,8 @@ public class DeleteSemanticElementTest extends DiagramIntegrityTestCase { // add a chapter in the semantic model. addTinySection(); addNote(); - - // create a diagram based on my semantic model (simple.docbook) + activateViewpoint("docbook1"); + // create a diagram based on my semantic model (simple.docbook) myRepresentation = createRepresentation("evoluate view"); // refresh the current representation. diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/MoveSemanticElementTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/MoveSemanticElementTest.java index 2a92584b84..a42db97c5a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/MoveSemanticElementTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/diagramintegrity/MoveSemanticElementTest.java @@ -26,6 +26,7 @@ public class MoveSemanticElementTest extends DiagramIntegrityTestCase { addTinySection(); addNote(); + activateViewpoint("docbook1"); // create a diagram based on my semantic model (simple.docbook) myRepresentation = createRepresentation("evoluate view"); diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.tests.sample.docbook.design/META-INF/MANIFEST.MF index b518ce880d..a09434f00e 100644 --- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.sirius.tests.sample.docbook.design;singleton:=t Bundle-Version: 4.0.0.qualifier Require-Bundle: org.eclipse.sirius.tests.sample.docbook, org.eclipse.sirius, + org.eclipse.sirius.common.acceleo.aql, org.eclipse.core.runtime Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.sirius.tests.sample.docbook.design.tool.SampleDocbookPlugin diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook.odesign b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook.odesign index e6edfaa802..7c8dc31483 100644 --- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook.odesign +++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook.odesign @@ -1,95 +1,95 @@ <?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="Docbook modelers" version="8.1.0"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="Docbook modelers" version="10.1.3.201511131800"> <ownedViewpoints name="docbook1" modelFileExtension="docbook"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20chapter%20note%20in%20diagram']" documentation="mon premier projet designer" name="obviousDiagram" initialisation="true" domainClass="Book"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <nodeMappings name="tiny section" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3" dropDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20tiny%20note%20in%20tiny%20section']"> <borderedNodeMappings name="tiny note" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:DotDescription" labelExpression="<%data%>" sizeComputationExpression="1"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.data" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="2" labelExpression="<%id%>" sizeComputationExpression="5"> + <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="2" labelExpression="aql:self.id" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <nodeMappings name="note" preconditionExpression="<%eContainer().eClass().name == "Sect2"%>" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="<%data%>" sizeComputationExpression="1"> + <nodeMappings name="note" preconditionExpression="aql:self.eContainer().eClass().name = 'Sect2'" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="aql:self.data" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </nodeMappings> - <edgeMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20link']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%followingSibling().nFirst()%>"> - <style> + <edgeMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20link']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.followingSiblings()->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> - <style> + <edgeMappings name="tinyToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="noteToTitle" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='note']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetFinderExpression="<%eContainer("Chapter").eAllContents("Title").nFirst()%>"> - <style> + <edgeMappings name="noteToTitle" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='note']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetFinderExpression="aql:self.eContainerOrSelf(docbook::Chapter).eAllContents(docbook::Title)->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="TitleToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>"> - <style> + <edgeMappings name="TitleToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetFinderExpression="<%followingSibling()%>"> - <style> + <edgeMappings name="tinyNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetFinderExpression="aql:self.followingSiblings()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterNoteToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%parent().eAllContents("Sect2").nFirst()%>"> - <style> + <edgeMappings name="chapterNoteToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eContainer().eAllContents(docbook::Sect2)->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent().parent().parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection']"> - <style> + <edgeMappings name="tinyToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer().eContainer().eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterNoteToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="chapterNoteToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToChapterNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetFinderExpression="<%eContents().filter("Para")%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="chapterToChapterNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetFinderExpression="aql:self.eContents()->filter(docbook::Para)" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToBig" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetFinderExpression="<%eAllContents("Sect1")%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection']"> + <edgeMappings name="chapterToBig" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect1)" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="bigToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection']"> + <edgeMappings name="bigToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToMedium" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%eAllContents("Sect2")%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> + <edgeMappings name="chapterToMedium" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect2)" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="mediumToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent().parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> + <edgeMappings name="mediumToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer().eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToTiny" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetFinderExpression="<%eAllContents("Sect3")%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20source%20reconnection']"> + <edgeMappings name="chapterToTiny" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect3)" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20source%20reconnection'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -101,14 +101,14 @@ </edgeMappings> <containerMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20container'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20obvious']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter" dropDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20chapter%20note%20in%20chapter'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20big%20section%20in%20container']"> <borderedNodeMappings name="title" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Title"> - <style xsi:type="style:SquareDescription" labelExpression="<%data%>" width="2" height="3"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.data" width="2" height="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="chapNote" preconditionExpression="<%eContainer().eClass.name == "Chapter"%>" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:SquareDescription" labelExpression="<%data%>" width="2" height="3"> + <borderedNodeMappings name="chapNote" preconditionExpression="aql:self.eContainer().eClass().name = 'Chapter'" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.data" width="2" height="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -116,20 +116,20 @@ </borderedNodeMappings> <subContainerMappings name="big section" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1" dropDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20medium%20section%20in%20big%20section']"> <subNodeMappings name="medium section" detailDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20node']" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="4"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" 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='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%id%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.id"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%id%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.id"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> @@ -143,7 +143,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Chapter" referenceName="chapter"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<% "chap" + precedingSibling().nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:'chap' + self.precedingSiblings()->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </subModelOperations> </firstModelOperations> @@ -155,7 +155,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<% "Sect" + precedingSibling().nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:'Sect' + self.precedingSiblings()->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -203,7 +203,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"/> </firstModelOperations> </initialOperation> @@ -219,23 +219,23 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Para" referenceName="para"/> </firstModelOperations> </initialOperation> </ownedTools> <subSections name="navigation links"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw container" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw container" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw link" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw link" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -247,7 +247,7 @@ </ownedTools> </subSections> <subSections name="reconnections"> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note source reconnection" precondition="<%$target.eClass.name == "Para"%>" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note source reconnection" precondition="aql:target.eClass().name = 'Para'" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -255,12 +255,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target" featureName="para"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note target reconnection" precondition="<%$target.eClass.name == "Para"%>" forceRefresh="true"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note target reconnection" precondition="aql:target.eClass().name = 'Para'" forceRefresh="true"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -268,12 +268,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target" featureName="para"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note big section source reconnection" precondition="<%$target.eClass.name == "Sect1"%>" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note big section source reconnection" precondition="aql:target.eClass().name = 'Sect1'" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -281,12 +281,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target%>" featureName="sect1"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target" featureName="sect1"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note big section target reconnection" precondition="<%$target.eClass.name == "Sect1"%>" forceRefresh="true"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note big section target reconnection" precondition="aql:target.eClass().name = 'Sect1'" forceRefresh="true"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -294,12 +294,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target%>" featureName="sect1"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target" featureName="sect1"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note medium section source reconnection" precondition="<%$target.eClass.name == "Sect2"%>" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note medium section source reconnection" precondition="aql:target.eClass().name = 'Sect2'" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -307,12 +307,12 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target.eAllContents("Sect1").nFirst()%>" featureName="sect2"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target.eAllContents(docbook::Sect1)->first()" featureName="sect2"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note medium section target reconnection" precondition="<%$target.eClass.name == "Sect2"%>" forceRefresh="true"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter note medium section target reconnection" precondition="aql:target.eClass().name = 'Sect2'" forceRefresh="true"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> @@ -320,58 +320,58 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target.eAllContents("Sect1").nFirst()%>" featureName="sect2"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target.eAllContents(docbook::Sect1)->first()" featureName="sect2"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="medium section target reconnection" precondition="<%$target.eClass.name == "Sect2"%>" forceRefresh="true"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="medium section target reconnection" precondition="aql:target.eClass().name = 'Sect2'" forceRefresh="true"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter target reconnection" precondition="<%$target.eClass.name == "Chapter"%>" forceRefresh="true"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter target reconnection" precondition="aql:target.eClass().name = 'Chapter'" forceRefresh="true"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$target.eAllContents("Sect2").nFirst()%>" featureName="sect3"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:target.eAllContents(docbook::Sect2)->first()" featureName="sect3"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter source reconnection" precondition="<%$target.eClass.name == "Chapter"%>" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="chapter source reconnection" precondition="aql:target.eClass().name = 'Chapter'" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.targetNode.target%>"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$target.eAllContents("Sect2").nFirst()%>" featureName="sect3"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.targetNode.target"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:target.eAllContents(docbook::Sect2)->first()" featureName="sect3"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> </ownedTools> - <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="medium section source reconnection" precondition="<%$target.eClass.name == "Sect2"%>" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> + <ownedTools xsi:type="tool:ReconnectEdgeDescription" name="medium section source reconnection" precondition="aql:target.eClass().name = 'Sect2'" forceRefresh="true" reconnectionKind="RECONNECT_SOURCE"> <source name="source"/> <target name="target"/> <sourceView name="sourceView"/> <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.targetNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.targetNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> @@ -430,9 +430,9 @@ <newViewContainer name="newContainerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$newContainerView.target.eAllContents("Sect2").nFirst()%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:newContainerView.target.eAllContents(docbook::Sect2)->first()" featureName="para"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$newContainerView.target.eAllContents("Sect2").nFirst()%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:newContainerView.target.eAllContents(docbook::Sect2)->first()" featureName="para"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -441,86 +441,88 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="evoluate view" initialisation="true" domainClass="Book" reusedMappings="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@containerMappings[name='info']/@borderedNodeMappings[name='author']"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <nodeMappings name="chapt" detailDescriptions="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20node'] //@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate']" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='chapter']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </nodeMappings> - <nodeMappings name="big sect" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='big%20sect']" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Sect1"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <nodeMappings name="big sect" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='big%20sect']" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Sect1"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> <nodeMappings name="med sect" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='med%20sect']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> <nodeMappings name="tiny sect" deletionDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@ownedTools[name='delete%20tiny%20section']" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='tiny%20sect']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="2"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" 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> </nodeMappings> - <nodeMappings name="paragraphe" preconditionExpression="<%parent().eClass.name == "Chapter"%>" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:DotDescription" labelExpression="<%data%>" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> + <nodeMappings name="paragraphe" preconditionExpression="aql:self.eContainer().eClass().name = 'Chapter'" labelDirectEdit="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.data" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </nodeMappings> - <edgeMappings name="belong To Chapter" semanticCandidatesExpression="feature:eAllContents" semanticElements="<%parent()%>" documentation="This edge has a different style if it represents the first BigSection of the chapter." sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> - <style> + <edgeMappings name="belong To Chapter" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self.eContainer()" documentation="This edge has a different style if it represents the first BigSection of the chapter." sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> - <conditionnalStyles predicateExpression="<%self.eContainer().sect1.nFirst == self && self.eContainer().id != "newChapterId"%>"> + <conditionnalStyles predicateExpression="aql:self.eContainer().sect1->first() = self and self.eContainer().id <> 'newChapterId'"> <style lineStyle="dash" sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="3" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="ConditionalStyle"> + <centerLabelStyleDescription showIcon="false" labelExpression="ConditionalStyle"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> - <conditionnalStyles predicateExpression="<%self.eContainer().sect1.nFirst == self && self.eContainer().id == "newChapterId"%>"> + <conditionnalStyles predicateExpression="aql:self.eContainer().sect1->first() = self and self.eContainer().id = 'newChapterId'"> <style lineStyle="dash" sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="3" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_red']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="OtherConditionalStyle"> + <centerLabelStyleDescription showIcon="false" labelExpression="OtherConditionalStyle"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="belong to big sect" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> - <style> + <edgeMappings name="belong to big sect" semanticCandidatesExpression="feature:eAllContents" semanticElements="" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="belong to med section" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> - <style> + <edgeMappings name="belong to med section" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="note mapping" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetFinderExpression="<%parent().eAllContents("Sect3").nFirst()%>" sourceFinderExpression="<%parent()%>" targetExpression="var:self" domainClass="Para" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="note mapping" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetFinderExpression="aql:self.eContainer().eAllContents(docbook::Sect3)->first()" sourceFinderExpression="aql:self.eContainer()" targetExpression="var:self" domainClass="Para" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%data%>"> + <centerLabelStyleDescription labelExpression="aql:self.data"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <containerMappings name="title" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Title"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%data%>"> + <containerMappings name="title" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Title"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.data"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -528,14 +530,14 @@ </style> </containerMappings> <containerMappings name="info" semanticCandidatesExpression="feature:eAllContents" domainClass="Info" reusedNodeMappings="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" reusedContainerMappings="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='evoluate%20view']/@containerMappings[name='title']"> - <borderedNodeMappings name="author" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Author"> - <style xsi:type="style:DotDescription" labelExpression="<%personname%>" sizeComputationExpression="<%3%>"> + <borderedNodeMappings name="author" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Author"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.personname"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> </style> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_chocolate']"/> @@ -554,7 +556,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eContents.filter("Chapter").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eContents()->filter(docbook::Chapter)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </firstModelOperations> </initialOperation> @@ -563,7 +565,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Info").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Info)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Author" referenceName="author"/> </firstModelOperations> </initialOperation> @@ -579,7 +581,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Chapter").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Chapter)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"/> </firstModelOperations> </initialOperation> @@ -588,7 +590,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect1").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect1)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect2" referenceName="sect2"/> </firstModelOperations> </initialOperation> @@ -597,7 +599,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"/> </firstModelOperations> </initialOperation> @@ -618,8 +620,8 @@ <elementView name="view"/> <containerView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.parent().parent().parent()%>"> - <subModelOperations xsi:type="tool_1:For" expression="<%eContents().filter("Para")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainer().eContainer().eContainer()"> + <subModelOperations xsi:type="tool_1:For" expression="aql:self.eContents()->filter(docbook::Para)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> @@ -628,22 +630,22 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Ce wizard sert à faire un truc ou un machin je ne sais plus ..." name="multiple selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>" multiple="true"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Ce wizard sert à faire un truc ou un machin je ne sais plus ..." name="multiple selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')" multiple="true"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> @@ -654,7 +656,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='obviousDiagram']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -700,7 +702,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect1"/> </firstModelOperations> </initialOperation> @@ -713,7 +715,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect2"/> </firstModelOperations> </initialOperation> @@ -726,7 +728,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> @@ -736,14 +738,14 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="chapterDiagram" initialisation="true" domainClass="Chapter"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> - <edgeMappings name="section1ToParagraphe" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@containerMappings[name='section1']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@containerMappings[name='paragraphe']" targetFinderExpression="<%eContents().filter("Para")%>" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@toolSection/@ownedTools[name='listContainerReconnection']"> + <metamodel href="http://docbook.org/ns/docbook#/"/> + <edgeMappings name="section1ToParagraphe" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@containerMappings[name='section1']" targetMapping="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@containerMappings[name='paragraphe']" targetFinderExpression="aql:self.eContents()->filter(docbook::Para)" reconnections="//@ownedViewpoints[name='docbook1']/@ownedRepresentations[name='chapterDiagram']/@toolSection/@ownedTools[name='listContainerReconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> <containerMappings name="section1" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1" 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='red']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -751,7 +753,7 @@ </style> </containerMappings> <containerMappings name="paragraphe" semanticCandidatesExpression="feature:eAllContents" domainClass="Para" 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='light_purple']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> @@ -766,7 +768,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.targetNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.targetNode.target"> <subModelOperations xsi:type="tool_1:RemoveElement"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="para"/> </subModelOperations> @@ -779,16 +781,16 @@ </ownedViewpoints> <ownedViewpoints documentation="This ViewPoint is oriented writer.
This viewPoint aimed to be a little more functionally oriented than was docbook1." name="docbookWriter" modelFileExtension="docbook"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="To organize a book with chapter below each other" name="VerticalBookOrganizer" initialisation="true" domainClass="Book"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <containerMappings name="Chapter" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='VerticalBookOrganizer']/@toolSection/@subSections[name='navigation']/@ownedTools[name='initVerticalBookOrganizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter"> <borderedNodeMappings name="Medium section" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1"> - <style xsi:type="style:SquareDescription" labelExpression="<%title.data%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.title.data"> <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" labelExpression="<%title.data%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.title.data"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -806,25 +808,26 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="To organize a book with chapter connected each other with arrows.
Mappings used in this diagram (non-exhaustive list) :
- Container Mapping (Flat Container Style)
- Node Mapping (Note Description)
- Edge Mapping
Tools use in this diagram (non-exhaustive list) :
- Node Creation
- Container Creation
- Direct Edit Label (Chapter title)
- Drag&drop
- Reconnect" name="BookOrganizer" initialisation="true" domainClass="Book" init="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20book%20organizer']"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> - <edgeMappings name="2NextChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']" targetFinderExpression="<%followingSibling().nFirst()%>" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextChapter']"> - <style sizeComputationExpression="1" routingStyle="tree" foldingStyle="SOURCE"> + <metamodel href="http://docbook.org/ns/docbook#/"/> + <edgeMappings name="2NextChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']" targetFinderExpression="aql:self.followingSiblings()->first()" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextChapter']"> + <style routingStyle="tree" foldingStyle="SOURCE"> <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> - <conditionnalStyles predicateExpression="<%(self.eContainer().chapter - self.eContainer().chapter.nLast).nLast == self%>"> + <conditionnalStyles predicateExpression="aql:(self.eContainer().chapter->asSet() - self.eContainer().chapter->last()->asSet())->last() = self"> <style lineStyle="dash" sizeComputationExpression="3" routingStyle="manhattan"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> - <centerLabelStyleDescription labelSize="16" labelFormat="bold" labelExpression="<%"lastChapter"%>"> + <centerLabelStyleDescription labelSize="16" labelExpression="aql:'lastChapter'"> + <labelFormat>bold</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="2NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']/@subContainerMappings[name='2BigSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']/@subContainerMappings[name='2BigSection']" targetFinderExpression="<%followingSibling().nFirst()%>" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextBigSection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="2NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']/@subContainerMappings[name='2BigSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@containerMappings[name='2Chapter']/@subContainerMappings[name='2BigSection']" targetFinderExpression="aql:self.followingSiblings()->first()" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextBigSection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -833,21 +836,21 @@ </edgeMappings> <containerMappings name="2Chapter" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20chapter%20organizer'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" labelDirectEdit="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='DirectEdit']/@ownedTools[name='ChapterTitleDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter" dropDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Drag%27n%27Drop']/@ownedTools[name='BigSection%20In%20Chapter']"> <subContainerMappings name="2BigSection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20chapter%20organizer'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" labelDirectEdit="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='DirectEdit']/@ownedTools[name='ChapterTitleDirectEdit']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1" childrenPresentation="List"> - <subNodeMappings name="2MediumSection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" semanticCandidatesExpression="<%sect2%>" domainClass="Sect2"> - <style xsi:type="style:NoteDescription" labelExpression="<%title.data%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <subNodeMappings name="2MediumSection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" semanticCandidatesExpression="aql:self.sect2" domainClass="Sect2"> + <style xsi:type="style:NoteDescription" labelExpression="aql:self.title.data" 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='yellow']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%title.data%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.title.data" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="2" labelExpression="<%title.data%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="2" labelExpression="aql:self.title.data" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> @@ -861,9 +864,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Chapter" referenceName="chapter"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="Chap<%eContainer.chapter.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:'Chap' + self.eContainer().chapter->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="Title<%eContainer.eContainer.chapter.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'Title' + self.eContainer().eContainer().chapter->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -873,9 +876,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<%eContainer.eContainer.chapter.nSize%>.<%eContainer.sect1.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:self.eContainer().eContainer().chapter->size() + '.' + self.eContainer().sect1->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="Title<%eContainer.eContainer.sect1.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'Title' + self.eContainer().eContainer().sect1->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -885,16 +888,16 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect2" referenceName="sect2"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<%eContainer.id%>.<%eContainer.sect2.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:self.eContainer().id + '.' + self.eContainer().sect2->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="title<%eContainer.eContainer.sect2.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'title' + self.eContainer().eContainer().sect2->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> </ownedTools> </subSections> <subSections documentation="The tools to navigate between diagram" name="Navigation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="Navigate to book organizer" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="Navigate to book organizer" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -905,10 +908,10 @@ <mask mask="{0}"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="<%title == null%>"> + <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:self.title = null"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </subModelOperations> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%title%>"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.title"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="var:arg0"/> </subModelOperations> </firstModelOperations> @@ -923,7 +926,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer().moveChapterBeforeAnother($target, $source)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer().moveChapterBeforeAnother(target, source)"/> </initialOperation> <edgeView name="edgeView"/> </ownedTools> @@ -934,7 +937,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer().moveBigSectionBeforeAnother($target, $source)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer().moveBigSectionBeforeAnother(target, source)"/> </initialOperation> <edgeView name="edgeView"/> </ownedTools> @@ -955,17 +958,17 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="To organize the sections of a particular chapter." name="ChapterOrganizer" domainClass="Book"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> - <edgeMappings name="5NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']" targetFinderExpression="<%followingSibling().nFirst()%>" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextBigSection']"> - <style sizeComputationExpression="1"> + <metamodel href="http://docbook.org/ns/docbook#/"/> + <edgeMappings name="5NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']" targetFinderExpression="aql:self.followingSiblings()->first()" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextBigSection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="5NextMediumSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']/@subContainerMappings[name='5MediumSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']/@subContainerMappings[name='5MediumSection']" targetFinderExpression="<%followingSibling().nFirst()%>" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextMediumSection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="5NextMediumSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']/@subContainerMappings[name='5MediumSection']" targetMapping="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@containerMappings[name='5BigSection']/@subContainerMappings[name='5MediumSection']" targetFinderExpression="aql:self.followingSiblings()->first()" targetExpression="" reconnections="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ChapterOrganizer']/@toolSection/@subSections[name='Reconnection']/@ownedTools[name='ChangeNextMediumSection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -975,20 +978,20 @@ <containerMappings name="5BigSection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1"> <subContainerMappings name="5MediumSection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2" childrenPresentation="List"> <subNodeMappings name="5TinySection" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3"> - <style xsi:type="style:NoteDescription" labelExpression="<%title.data%>" labelAlignment="LEFT" sizeComputationExpression="1"> + <style xsi:type="style:NoteDescription" labelExpression="aql:self.title.data" 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='yellow']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%title.data%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.title.data"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%title.data%>" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.title.data" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> @@ -1002,9 +1005,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<%eContainer.eContainer.chapter.nSize%>.<%eContainer.sect1.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:self.eContainer().eContainer().chapter->size() + '.' + self.eContainer().sect1->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="Title<%eContainer.eContainer.sect1.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'Title' + self.eContainer().eContainer().sect1->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1014,9 +1017,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect2" referenceName="sect2"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<%eContainer.eContainer.eContainer.chapter.nSize%>.<%eContainer.eContainer.sect1.nSize%>.<%eContainer.sect2.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:self.eContainer().eContainer().eContainer().chapter->size() + '.' + self.eContainer().eContainer().sect1->size() + '.' + self.eContainer().sect2->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="Title<%eContainer.eContainer.sect2.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'Title' + self.eContainer().eContainer().sect2->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1026,9 +1029,9 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<%eContainer.eContainer.eContainer.eContainer.chapter.nSize%>.<%eContainer.eContainer.eContainer.sect3.nSize%>.<%eContainer.eContainer.sect2.nSize%>.<%eContainer.sect3.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:self.eContainer().eContainer().eContainer().eContainer().chapter->size() + '.' + self.eContainer().eContainer().eContainer().sect3->size()+ '.' + self.eContainer().eContainer().sect2->size() + '.' + self.eContainer().sect3->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="title<%eContainer.eContainer.sect3.nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="aql:'title' + self.eContainer().eContainer().sect3->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -1049,7 +1052,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer().moveBigSectionBeforeAnother($target, $source)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer().moveBigSectionBeforeAnother(target, source)"/> </initialOperation> <edgeView name="edgeView"/> </ownedTools> @@ -1060,7 +1063,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$source.eContainer().moveMediumSectionBeforeAnother($target, $source)%>"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:source.eContainer().moveMediumSectionBeforeAnother(target, source)"/> </initialOperation> <edgeView name="edgeView"/> </ownedTools> @@ -1068,9 +1071,9 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="ParagraphOrganizer" domainClass="Book"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> - <nodeMappings name="6Paragraphe" semanticCandidatesExpression="<%self.para%>" domainClass="Para"> - <style xsi:type="style:NoteDescription" showIcon="false" labelExpression="<%getBeginningOfParagraph(50)%>" sizeComputationExpression="2"> + <metamodel href="http://docbook.org/ns/docbook#/"/> + <nodeMappings name="6Paragraphe" semanticCandidatesExpression="aql:self.para" domainClass="Para"> + <style xsi:type="style:NoteDescription" showIcon="false" labelExpression="aql:self.getBeginningOfParagraph(50)" 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']"/> @@ -1101,61 +1104,61 @@ </ownedViewpoints> <ownedViewpoints documentation="This ViewPoint is oriented book publisher.
This viewPoint aimed to be a little more functionally oriented than was docbook1." name="docbookPublisher" modelFileExtension="docbook"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="To see the POI (the Points Of Interest) ie see chapters depending on their size (number of words).
- Edge Mapping
- Node Mapping
" name="Book POI" initialisation="true" domainClass="Book"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <nodeMappings name="3Chapter" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Chapter%20POI']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='navigate%20to%20chapter%20POI'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20book%20organizer'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='navigate%20to%20book%20POI']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter"> - <style xsi:type="style:SquareDescription" labelSize="16" showIcon="false" labelExpression="<%id%>-<%title.data%>" sizeComputationExpression="<%(para.data.split(" ").nSize() + sect1.para.data.split(" ").nSize() + sect1.sect2.para.data.split(" ").nSize() + sect1.sect2.sect3.para.data.split(" ").nSize()) / 100%>"> + <style xsi:type="style:SquareDescription" labelSize="16" showIcon="false" labelExpression="aql:self.id + '-' + self.title.data" sizeComputationExpression="aql:(self.para.data.tokenize()->size() + self.sect1.para.data.tokenize()->size() + self.sect1.sect2.para.data.tokenize()->size() + self.sect1.sect2.sect3.para.data.tokenize()->size()) / 100"> <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='dark_blue']"/> </style> </nodeMappings> <nodeMappings name="3Big section" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='navigate%20to%20book%20POI'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20book%20organizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1"> - <style xsi:type="style:SquareDescription" labelSize="16" showIcon="false" labelExpression="<%id%>-<%title.data%>" sizeComputationExpression="<%(para.data.split(" ").nSize() + sect2.para.data.split(" ").nSize() + sect2.sect3.para.data.split(" ").nSize()) / 100%>"> + <style xsi:type="style:SquareDescription" labelSize="16" showIcon="false" labelExpression="aql:self.id + '-' + self.title.data" sizeComputationExpression="aql:(self.para.data.tokenize()->size() + self.sect2.para.data.tokenize()->size() + self.sect2.sect3.para.data.tokenize()->size()) / 100"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> <nodeMappings name="3Medium section" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20book%20organizer'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='navigate%20to%20book%20POI']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelSize="14" showIcon="false" labelExpression="<%id%>-<%title.data%>" sizeComputationExpression="<%(para.data.split(" ").nSize() + sect3.para.data.split(" ").nSize()) / 100%>"> + <style xsi:type="style:SquareDescription" labelSize="14" showIcon="false" labelExpression="aql:self.id + '-' + self.title.data" sizeComputationExpression="aql:(self.para.data.tokenize()->size() + self.sect3.para.data.tokenize()->size()) / 100"> <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> <nodeMappings name="3Tiny section" detailDescriptions="//@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='ParagraphOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20paragraph%20organizer'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='navigate%20to%20book%20POI'] //@ownedViewpoints[name='docbookWriter']/@ownedRepresentations[name='BookOrganizer']/@toolSection/@subSections[name='Navigation']/@ownedTools[name='Navigate%20to%20book%20organizer']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3"> - <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="<%id%>-<%title.data%>" sizeComputationExpression="<%(para.data.split(" ").nSize())) / 100%>"> + <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="aql:self.id + '-' + self.title.data" sizeComputationExpression="aql:(self.para.data.tokenize()->size())) / 100"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_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> - <edgeMappings name="3ChapterToBigSection" semanticCandidatesExpression="feature:eAllContents" documentation="This edge shows that a chapter contains a big section." sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetFinderExpression="<%sect1%>"> - <style sizeComputationExpression="1"> + <edgeMappings name="3ChapterToBigSection" semanticCandidatesExpression="feature:eAllContents" documentation="This edge shows that a chapter contains a big section." sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetFinderExpression="aql:self.sect1"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="3BigSectionToMediumSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Medium%20section']" targetFinderExpression="<%sect2%>"> - <style lineStyle="dash" sizeComputationExpression="1"> + <edgeMappings name="3BigSectionToMediumSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Medium%20section']" targetFinderExpression="aql:self.sect2"> + <style lineStyle="dash"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription showIcon="false" labelExpression="<%""%>"> + <centerLabelStyleDescription showIcon="false" labelExpression="aql:''"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="3MediumSectionToTinySection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Medium%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Tiny%20section']" targetFinderExpression="<%sect3%>"> - <style lineStyle="dash_dot" sizeComputationExpression="1"> + <edgeMappings name="3MediumSectionToTinySection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Medium%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Tiny%20section']" targetFinderExpression="aql:self.sect3"> + <style lineStyle="dash_dot"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> <centerLabelStyleDescription showIcon="false"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> - <edgeMappings name="3NextChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetFinderExpression="<%followingSibling().nFirst()%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="3NextChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Chapter']" targetFinderExpression="aql:self.followingSiblings()->first()"> + <style sizeComputationExpression="2"> <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']"/> @@ -1164,7 +1167,7 @@ </edgeMappings> <toolSection documentation="All the tools of this diagram" name="Tools"> <subSections name="Navigation"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate to book POI" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate to book POI" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -1173,8 +1176,8 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="To see the POI (the Points Of Interest) of a chapter ie see big sections of this chapter depending on their size (number of words).
- Edge Mapping
- Node Mapping Import" name="Chapter POI" reusedMappings="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Medium%20section'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Tiny%20section'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@edgeMappings[name='3BigSectionToMediumSection'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@edgeMappings[name='3ChapterToBigSection'] //@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@edgeMappings[name='3MediumSectionToTinySection']"> - <edgeMappings name="4NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetFinderExpression="<%followingSibling().nFirst()%>"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="4NextBigSection" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetMapping="//@ownedViewpoints[name='docbookPublisher']/@ownedRepresentations[name='Book%20POI']/@nodeMappings[name='3Big%20section']" targetFinderExpression="aql:self.followingSiblings()->first()"> + <style sizeComputationExpression="2"> <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']"/> diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbookLayers.odesign b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbookLayers.odesign index c2db334342..da0f8d0ee1 100644 --- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbookLayers.odesign +++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbookLayers.odesign @@ -1,8 +1,8 @@ <?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: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="Docbook modelers" version="8.1.0"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns: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="Docbook modelers" version="10.1.3.201511131800"> <ownedViewpoints name="docbook1-layers" modelFileExtension="docbook"> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="evoluate view" initialisation="true" domainClass="Book" reusedMappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@containerMappings[name='info']/@borderedNodeMappings[name='author']"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <filters xsi:type="filter:CompositeFilterDescription" name="hide things"> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='paragraphe']"/> <filters xsi:type="filter:MappingFilter" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='paragraphe']"/> @@ -12,102 +12,103 @@ </concerns> <defaultLayer name="default"> <nodeMappings name="chapt" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate']" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='chapter']" domainClass="Chapter"> - <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="<%id%>" sizeComputationExpression="<%20%>"> + <style xsi:type="style:GaugeCompositeStyleDescription" labelExpression="aql:self.id" 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']"/> - <sections maxValueExpression="<%10%>" valueExpression="<%eContents().nSize()%>" label="section1"> + <sections maxValueExpression="10" valueExpression="aql:self.eContents()->size()" label="section1"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </sections> - <sections minValueExpression="<%1%>" maxValueExpression="<%10%>" valueExpression="<%eContents().nSize()%>" label="section2"> + <sections minValueExpression="1" maxValueExpression="10" valueExpression="aql:self.eContents()->size()" label="section2"> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </sections> </style> </nodeMappings> - <nodeMappings name="big sect" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='big%20sect']" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Sect1"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <nodeMappings name="big sect" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='big%20sect']" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Sect1"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </style> </nodeMappings> <nodeMappings name="med sect" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='med%20sect']" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> <nodeMappings name="tiny sect" deletionDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@ownedTools[name='delete%20tiny%20section']" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='tiny%20sect']" domainClass="Sect3"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="2"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" 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> </nodeMappings> - <nodeMappings name="paragraphe" preconditionExpression="<%parent().eClass.name == "Chapter"%>" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" domainClass="Para"> - <style xsi:type="style:DotDescription" labelExpression="<%data%>" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> + <nodeMappings name="paragraphe" preconditionExpression="aql:self.eContainer().eClass().name = 'Chapter'" labelDirectEdit="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" domainClass="Para"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.data" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </nodeMappings> - <edgeMappings name="belong To Chapter" documentation="This edge has a different style if it represents the first BigSection of the chapter." sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> - <style> + <edgeMappings name="belong To Chapter" documentation="This edge has a different style if it represents the first BigSection of the chapter." sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> - <conditionnalStyles predicateExpression="<%self.eContainer().sect1.nFirst == self%>"> + <conditionnalStyles predicateExpression="aql:self.eContainer().sect1->first() = self"> <style lineStyle="dash" sourceArrow="InputArrow" targetArrow="NoDecoration" sizeComputationExpression="3" routingStyle="tree"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> - <centerLabelStyleDescription labelFormat="italic" showIcon="false" labelExpression="ConditionalStyle"> + <centerLabelStyleDescription showIcon="false" labelExpression="ConditionalStyle"> + <labelFormat>italic</labelFormat> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </conditionnalStyles> </edgeMappings> - <edgeMappings name="belong to big sect" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='big%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> - <style> + <edgeMappings name="belong to big sect" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='big%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="belong to med section" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='med%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> - <style> + <edgeMappings name="belong to med section" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='med%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="note mapping" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='tiny%20sect']" targetFinderExpression="<%parent().eAllContents("Sect3").nFirst()%>" sourceFinderExpression="<%parent()%>" targetExpression="var:self" domainClass="Para" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="note mapping" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='tiny%20sect']" targetFinderExpression="aql:self.eContainer().eAllContents(docbook::Sect3)->first()" sourceFinderExpression="aql:self.eContainer()" targetExpression="var:self" domainClass="Para" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%data%>"> + <centerLabelStyleDescription labelExpression="aql:self.data"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="info" semanticCandidatesExpression="" domainClass="Info" reusedNodeMappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='big%20sect']" reusedContainerMappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@containerMappings[name='title']"> - <borderedNodeMappings name="author" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Author"> - <style xsi:type="style:SquareDescription" labelExpression="<%personname%>" sizeComputationExpression="<%3%>"> + <borderedNodeMappings name="author" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Author"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.personname"> <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_yellow']"/> </style> - <conditionnalStyles predicateExpression="<%getRootContainer().eAllContents("Author").nSize()>3%>"> - <style xsi:type="style:SquareDescription" labelExpression="<%personname%>" sizeComputationExpression="<%6%>" labelPosition="node"> + <conditionnalStyles predicateExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Author)->size()>3"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.personname" sizeComputationExpression="6" labelPosition="node"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/> </style> </conditionnalStyles> </borderedNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression=""> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression=""> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/> </style> </containerMappings> - <containerMappings name="title" semanticCandidatesExpression="<%getRootContainer().eAllContents()%>" domainClass="Title" childrenPresentation="List"> - <style xsi:type="style:FlatContainerStyleDescription" backgroundStyle="Liquid"> + <containerMappings name="title" semanticCandidatesExpression="aql:self.eResource().getContents()->first().eAllContents()" domainClass="Title" childrenPresentation="List"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" backgroundStyle="Liquid"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> @@ -126,7 +127,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eContents.filter("Chapter").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eContents()->filter(docbook::Chapter)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </firstModelOperations> </initialOperation> @@ -135,9 +136,9 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Info").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Info)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Author" referenceName="author"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="personname" valueExpression="<%"Author"+getRootContainer().eAllContents("Author").nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="personname" valueExpression="aql:self.'Author'+eResource().getContents()->first().eAllContents(docbook::Author)->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -153,7 +154,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Chapter").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Chapter)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"/> </firstModelOperations> </initialOperation> @@ -162,7 +163,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect1").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect1)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect2" referenceName="sect2"/> </firstModelOperations> </initialOperation> @@ -171,7 +172,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"/> </firstModelOperations> </initialOperation> @@ -192,8 +193,8 @@ <elementView name="view"/> <containerView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.parent().parent().parent()%>"> - <subModelOperations xsi:type="tool_1:For" expression="<%eContents().filter("Para")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainer().eContainer().eContainer()"> + <subModelOperations xsi:type="tool_1:For" expression="aql:self.eContents()->filter(docbook::Para)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> @@ -202,45 +203,45 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Ce wizard sert a faire un truc ou un machin je ne sais plus ..." name="multiple selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>" multiple="true"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" documentation="Ce wizard sert a faire un truc ou un machin je ne sais plus ..." name="multiple selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')" multiple="true"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> </ownedTools> <ownedTools xsi:type="tool:BehaviorTool" name="change para name"> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%getRootContainer().eAllContents("Para")%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:self.eResource().getContents()->first().eAllContents(docbook::Para)"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="behavior"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="deleteSubChapterView" candidatesExpression="<%getRootContainer().eAllContents("Chapter")%>"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="deleteSubChapterView" candidatesExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Chapter)"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.eAllContents()%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.eAllContents()"> <subModelOperations xsi:type="tool_1:DeleteView"/> </firstModelOperations> </initialOperation> </ownedTools> <subSections name="navigation links"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate to evoluate" browseExpression="<%parent()%>" diagramDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate to evoluate" browseExpression="aql:self.eContainer()" diagramDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -286,7 +287,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect1"/> </firstModelOperations> </initialOperation> @@ -299,7 +300,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect2"/> </firstModelOperations> </initialOperation> @@ -312,7 +313,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> @@ -323,21 +324,21 @@ </defaultLayer> <additionalLayers name="optionnal layer"> <decorationDescriptionsSet> - <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="deco1" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" preconditionExpression="<%eAllContents().nSize > 4%>" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']"/> + <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="deco1" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" preconditionExpression="aql:self.eAllContents()->size() > 4" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@nodeMappings[name='chapt']"/> <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="deco2" position="NORTH_EAST" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@edgeMappings[name='belong%20To%20Chapter']"/> <decorationDescriptions xsi:type="description_1:MappingBasedDecoration" name="deco4" position="CENTER" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" mappings="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@containerMappings[name='info']"/> - <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="deco3" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" preconditionExpression="<%parent().eAllContents() > 4%>" domainClass="Sect1"/> + <decorationDescriptions xsi:type="description:SemanticBasedDecoration" name="deco3" decoratorPath="/org.eclipse.sirius.diagram/icons/layer_active.gif" preconditionExpression="aql:self.eContainer().eAllContents() > 4" domainClass="Sect1"/> </decorationDescriptionsSet> </additionalLayers> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="cross" initialisation="true" domainClass="Book"> - <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="cross creation" precondition="<%parent.eAllContents("Sect1").nSize() > 5%>" browseExpression="<%parent%>" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']"> + <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="cross creation" precondition="aql:self.eContainer().eAllContents(docbook::Sect1)->size() > 5" browseExpression="aql:self.eContainer()" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']"> <containerViewVariable name="containerView"/> <representationNameVariable name="tableName"/> </ownedRepresentationCreationDescriptions> - <ownedLineMappings name="chapterCross" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']/@ownedRepresentationCreationDescriptions[name='edit%20creation']" domainClass="Chapter" semanticCandidatesExpression="" headerLabelExpression="<%id%>"/> - <ownedColumnMappings name="big" headerLabelExpression="<%id%>" domainClass="Sect1"/> - <intersection name="cross cell" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']/@ownedRepresentationCreationDescriptions[name='edit%20from%20cell'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate']" lineMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedLineMappings[name='chapterCross']" columnMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedColumnMappings.0" labelExpression="<%id%>" useDomainClass="true" columnFinderExpression="<%parent()%>" lineFinderExpression="<%parent().parent()%>" semanticCandidatesExpression="" domainClass="Sect2" preconditionExpression=""> + <ownedLineMappings name="chapterCross" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']/@ownedRepresentationCreationDescriptions[name='edit%20creation']" domainClass="Chapter" semanticCandidatesExpression="" headerLabelExpression="aql:self.id"/> + <ownedColumnMappings name="big" headerLabelExpression="aql:self.id" domainClass="Sect1"/> + <intersection name="cross cell" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']/@ownedRepresentationCreationDescriptions[name='edit%20from%20cell'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate']" lineMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedLineMappings[name='chapterCross']" columnMapping="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedColumnMappings.0" labelExpression="aql:self.id" useDomainClass="true" columnFinderExpression="aql:self.eContainer()" lineFinderExpression="aql:self.eContainer().eContainer()" semanticCandidatesExpression="" domainClass="Sect2" preconditionExpression=""> <directEdit> <variables name="element" documentation="The currently edited element."/> <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/> @@ -360,16 +361,16 @@ </intersection> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:EditionTableDescription" name="edit" initialisation="true" domainClass="Book"> - <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="edit creation" precondition="<%parent.eAllContents("Sect1").nSize() > 7%>" browseExpression="<%parent()%>" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']"> + <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="edit creation" precondition="aql:self.eContainer().eAllContents(docbook::Sect1)->size() > 7" browseExpression="aql:self.eContainer()" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']"> <containerViewVariable name="containerView"/> <representationNameVariable name="tableName"/> </ownedRepresentationCreationDescriptions> - <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="edit from cell" browseExpression="<%getRootContainer().filter("Book")%>" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']"> + <ownedRepresentationCreationDescriptions xsi:type="description_2:TableCreationDescription" name="edit from cell" browseExpression="aql:self.eResource().getContents()->first()->filter(docbook::Book)" tableDescription="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='edit']"> <containerViewVariable name="containerView"/> <representationNameVariable name="tableName"/> </ownedRepresentationCreationDescriptions> - <ownedLineMappings name="chapterEdit" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedRepresentationCreationDescriptions[name='cross%20creation']" domainClass="Chapter" semanticCandidatesExpression="" headerLabelExpression="Chapitre <%id%>"/> - <ownedColumnMappings name="chapter" headerLabelExpression="Id" canEdit="false" featureName="id" labelExpression="<%id%>"/> + <ownedLineMappings name="chapterEdit" detailDescriptions="//@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='evoluate%20view']/@defaultLayer/@toolSections.0/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate'] //@ownedViewpoints[name='docbook1-layers']/@ownedRepresentations[name='cross']/@ownedRepresentationCreationDescriptions[name='cross%20creation']" domainClass="Chapter" semanticCandidatesExpression="" headerLabelExpression="aql:'Chapitre ' + self.id"/> + <ownedColumnMappings name="chapter" headerLabelExpression="Id" canEdit="false" featureName="id" labelExpression="aql:self.id"/> </ownedRepresentations> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook_extended.odesign b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook_extended.odesign index eb07ac0c05..b59d7af6ad 100644 --- a/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook_extended.odesign +++ b/plugins/org.eclipse.sirius.tests.sample.docbook.design/model/docbook_extended.odesign @@ -1,102 +1,102 @@ <?xml version="1.0" encoding="ASCII"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="8.1.0"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" version="10.1.3.201511131800"> <ownedViewpoints name="docbook_extended" modelFileExtension="docbook"> <ownedRepresentations xsi:type="description_1:DiagramDescription" dropDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20chapter%20note%20in%20diagram']" documentation="mon premier projet designer" name="obviousDiagram" domainClass="Book" init="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20obvious']"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <nodeMappings name="tiny section" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3" dropDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20tiny%20note%20in%20tiny%20section']"> <borderedNodeMappings name="tiny note" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:DotDescription" labelExpression="<%data%>" sizeComputationExpression="1"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.data" 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']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='red']"/> </style> </borderedNodeMappings> - <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="2" labelExpression="<%id%>" sizeComputationExpression="5"> + <style xsi:type="style:SquareDescription" borderSizeComputationExpression="2" labelSize="2" labelExpression="aql:self.id" 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']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> - <nodeMappings name="note" preconditionExpression="<%eContainer().eClass().name == "Sect2"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="<%data%>" sizeComputationExpression="1"> + <nodeMappings name="note" preconditionExpression="aql:self.eContainer().eClass().name = 'Sect2'" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="aql:self.data" sizeComputationExpression="1"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </nodeMappings> <nodeMappings name="cita" semanticCandidatesExpression="feature:eAllContents" domainClass="Citation"> - <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="<%data%>" sizeComputationExpression="1"> + <style xsi:type="style:SquareDescription" labelSize="2" labelExpression="aql:self.data" 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='light_orange']"/> </style> </nodeMappings> - <edgeMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20link']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%followingSibling().nFirst()%>"> - <style> + <edgeMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20link']" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.followingSiblings()->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> - <style> + <edgeMappings name="tinyToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="noteToTitle" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='note']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetFinderExpression="<%eContainer("Chapter").eAllContents("Title").nFirst()%>"> - <style> + <edgeMappings name="noteToTitle" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='note']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetFinderExpression="aql:self.eContainerOrSelf(docbook::Chapter).eAllContents(docbook::Title)->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="TitleToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>"> - <style> + <edgeMappings name="TitleToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='title']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetFinderExpression="<%followingSibling()%>"> - <style> + <edgeMappings name="tinyNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']/@borderedNodeMappings[name='tiny%20note']" targetFinderExpression="aql:self.followingSiblings()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterNoteToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%parent().eAllContents("Sect2").nFirst()%>"> - <style> + <edgeMappings name="chapterNoteToMed" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eContainer().eAllContents(docbook::Sect2)->first()"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="tinyToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent().parent().parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> - <style> + <edgeMappings name="tinyToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer().eContainer().eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20target%20reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterNoteToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="chapterNoteToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToChapterNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetFinderExpression="<%eContents().filter("Para")%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> - <style sizeComputationExpression="1"> + <edgeMappings name="chapterToChapterNote" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@borderedNodeMappings[name='chapNote']" targetFinderExpression="aql:self.eContents()->filter(docbook::Para)" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> + <style> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToBig" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetFinderExpression="<%eAllContents("Sect1")%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> + <edgeMappings name="chapterToBig" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect1)" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="bigToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection']"> + <edgeMappings name="bigToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20big%20section%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToMedium" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="<%eAllContents("Sect2")%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection']"> + <edgeMappings name="chapterToMedium" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect2)" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20target%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20target%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="mediumToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="<%parent().parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> + <edgeMappings name="mediumToChapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']/@subContainerMappings[name='big%20section']/@subNodeMappings[name='medium%20section']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetFinderExpression="aql:self.eContainer().eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20note%20medium%20section%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="chapterToTiny" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetFinderExpression="<%eAllContents("Sect3")%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20source%20reconnection']"> + <edgeMappings name="chapterToTiny" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@containerMappings[name='chapter']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@nodeMappings[name='tiny%20section']" targetFinderExpression="aql:self.eAllContents(docbook::Sect3)" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='medium%20section%20source%20reconnection'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='reconnections']/@ownedTools[name='chapter%20source%20reconnection']"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> @@ -108,14 +108,14 @@ </edgeMappings> <containerMappings name="chapter" detailDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20container'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20obvious']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter" dropDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20big%20section%20in%20container'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20chapter%20note%20in%20chapter']"> <borderedNodeMappings name="title" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" semanticElements="" domainClass="Title"> - <style xsi:type="style:SquareDescription" labelExpression="<%data%>" width="2" height="3"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.data" width="2" height="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_orange']"/> </style> </borderedNodeMappings> - <borderedNodeMappings name="chapNote" preconditionExpression="<%eContainer().eClass.name == "Chapter"%>" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:SquareDescription" labelExpression="<%data%>" width="2" height="3"> + <borderedNodeMappings name="chapNote" preconditionExpression="aql:self.eContainer().eClass().name = 'Chapter'" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20bordered%20node']" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.data" width="2" height="3"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> @@ -123,20 +123,20 @@ </borderedNodeMappings> <subContainerMappings name="big section" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1" dropDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='drag%26drop']/@ownedTools[name='drop%20medium%20section%20in%20big%20section']"> <subNodeMappings name="medium section" detailDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20node']" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']/@toolSection/@ownedTools[name='direct%20edit%20node%20and%20container']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="4"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" 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='green']"/> </style> </subNodeMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%id%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.id"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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> </subContainerMappings> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%id%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.id"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='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']"/> @@ -150,7 +150,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Chapter" referenceName="chapter"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<% "chap" + precedingSibling().nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:'chap' + self.precedingSiblings()->size()"/> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </subModelOperations> </firstModelOperations> @@ -162,7 +162,7 @@ <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="<% "Sect" + precedingSibling().nSize()%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="id" valueExpression="aql:'Sect' + self.precedingSiblings()->size()"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -187,7 +187,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"/> </firstModelOperations> </initialOperation> @@ -203,7 +203,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Para" referenceName="para"/> </firstModelOperations> </initialOperation> @@ -235,23 +235,23 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Para").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Para)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Citation" referenceName="citation"/> </firstModelOperations> </initialOperation> </ownedTools> <subSections name="navigation links"> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw container" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw container" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw link" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw link" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -271,7 +271,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target" featureName="para"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -284,7 +284,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target" featureName="para"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -297,7 +297,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target%>" featureName="sect1"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target" featureName="sect1"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -310,7 +310,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target%>" featureName="sect1"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target" featureName="sect1"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -323,7 +323,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.targetNode.target.eAllContents("Sect1").nFirst()%>" featureName="sect2"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.targetNode.target.eAllContents(docbook::Sect1)->first()" featureName="sect2"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -336,7 +336,7 @@ <element name="element"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:target"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$edgeView.sourceNode.target.eAllContents("Sect1").nFirst()%>" featureName="sect2"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:edgeView.sourceNode.target.eAllContents(docbook::Sect1)->first()" featureName="sect2"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -348,7 +348,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> @@ -361,8 +361,8 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.sourceNode.target%>"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$target.eAllContents("Sect2").nFirst()%>" featureName="sect3"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.sourceNode.target"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:target.eAllContents(docbook::Sect2)->first()" featureName="sect3"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -374,8 +374,8 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.targetNode.target%>"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$target.eAllContents("Sect2").nFirst()%>" featureName="sect3"/> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.targetNode.target"> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:target.eAllContents(docbook::Sect2)->first()" featureName="sect3"/> </firstModelOperations> </initialOperation> <edgeView name="edgeView"/> @@ -387,7 +387,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$edgeView.targetNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:edgeView.targetNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> @@ -446,9 +446,9 @@ <newViewContainer name="newContainerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$newContainerView.target.eAllContents("Sect2").nFirst()%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:newContainerView.target.eAllContents(docbook::Sect2)->first()" featureName="para"/> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="<%$newContainerView.target.eAllContents("Sect2").nFirst()%>" featureName="para"/> + <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="aql:newContainerView.target.eAllContents(docbook::Sect2)->first()" featureName="para"/> </subModelOperations> </firstModelOperations> </initialOperation> @@ -457,67 +457,67 @@ </toolSection> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:DiagramDescription" name="evoluate view" domainClass="Book" init="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate']"> - <metamodel href="platform:/org.eclipse.sirius.tests.sample.docbook/model/docbook.ecore#/"/> + <metamodel href="http://docbook.org/ns/docbook#/"/> <nodeMappings name="chapt" detailDescriptions="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20to%20evoluate'] //@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='navigation%20links']/@ownedTools[name='navigate%20throw%20node']" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='chapter']" semanticCandidatesExpression="feature:eAllContents" domainClass="Chapter"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/> </style> </nodeMappings> <nodeMappings name="big sect" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='big%20sect']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect1"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='green']"/> </style> </nodeMappings> <nodeMappings name="med sect" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='med%20sect']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect2"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="<%eAllContents().nSize()%>"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" sizeComputationExpression="aql:self.eAllContents()->size()"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </style> </nodeMappings> <nodeMappings name="tiny sect" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='tiny%20sect']" semanticCandidatesExpression="feature:eAllContents" domainClass="Sect3"> - <style xsi:type="style:SquareDescription" labelExpression="<%id%>" sizeComputationExpression="2"> + <style xsi:type="style:SquareDescription" labelExpression="aql:self.id" 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> </nodeMappings> - <nodeMappings name="paragraphe" preconditionExpression="<%parent().eClass.name == "Chapter"%>" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> - <style xsi:type="style:DotDescription" labelExpression="<%data%>" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> + <nodeMappings name="paragraphe" preconditionExpression="aql:self.eContainer().eClass().name = 'Chapter'" semanticCandidatesExpression="feature:eAllContents" domainClass="Para"> + <style xsi:type="style:DotDescription" labelExpression="aql:self.data" sizeComputationExpression="2" resizeKind="NORTH_SOUTH"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/> </style> </nodeMappings> - <edgeMappings name="belong To Chapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> - <style> + <edgeMappings name="belong To Chapter" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="belong to big sect" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> - <style> + <edgeMappings name="belong to big sect" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='big%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection2']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="belong to med section" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetFinderExpression="<%parent()%>" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> - <style> + <edgeMappings name="belong to med section" semanticCandidatesExpression="feature:eAllContents" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='med%20sect']" targetFinderExpression="aql:self.eContainer()" reconnections="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='reconnection']/@ownedTools[name='reconnection3']"> + <style sizeComputationExpression="[eContents()->size()/]"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </edgeMappings> - <edgeMappings name="note mapping" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetFinderExpression="<%parent().eAllContents("Sect3").nFirst()%>" sourceFinderExpression="<%parent()%>" targetExpression="var:self" domainClass="Para" useDomainElement="true"> - <style sizeComputationExpression="<%2%>"> + <edgeMappings name="note mapping" labelDirectEdit="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@toolSection/@subSections[name='direct%20edit']/@ownedTools[name='direct%20edit%20note']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" sourceMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='chapt']" targetMapping="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='evoluate%20view']/@nodeMappings[name='tiny%20sect']" targetFinderExpression="aql:self.eContainer().eAllContents(docbook::Sect3)->first()" sourceFinderExpression="aql:self.eContainer()" targetExpression="var:self" domainClass="Para" useDomainElement="true"> + <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> - <centerLabelStyleDescription labelExpression="<%data%>"> + <centerLabelStyleDescription labelExpression="aql:self.data"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </centerLabelStyleDescription> </style> </edgeMappings> <containerMappings name="title" semanticCandidatesExpression="feature:eAllContents" domainClass="Title"> - <style xsi:type="style:FlatContainerStyleDescription" labelExpression="<%data%>"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" labelExpression="aql:self.data"> <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/> @@ -536,7 +536,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Chapter").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Chapter)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect1" referenceName="sect1"/> </firstModelOperations> </initialOperation> @@ -545,7 +545,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect1").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect1)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect2" referenceName="sect2"/> </firstModelOperations> </initialOperation> @@ -554,7 +554,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eAllContents("Sect2").nFirst()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eAllContents(docbook::Sect2)->first()"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Sect3" referenceName="sect3"/> </firstModelOperations> </initialOperation> @@ -575,8 +575,8 @@ <elementView name="elementView"/> <containerView name="elementView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$element.parent().parent().parent()%>"> - <subModelOperations xsi:type="tool_1:For" expression="<%eContents().filter("Para")%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:element.eContainer().eContainer().eContainer()"> + <subModelOperations xsi:type="tool_1:For" expression="aql:self.eContents()->filter(docbook::Para)"> <subModelOperations xsi:type="tool_1:RemoveElement"/> </subModelOperations> <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> @@ -585,22 +585,22 @@ </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="multiple selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>" multiple="true"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="multiple selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')" multiple="true"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> </ownedTools> - <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="<%$containerView.eAllContents()[target.data == ""]%>"> + <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="single selection wizard" forceRefresh="true" candidatesExpression="aql:containerView.eAllContents()->select( e | e.target.data = '')"> <element name="element"/> <containerView name="containerView"/> <container name="container"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:For" expression="<%$element.target%>"> + <firstModelOperations xsi:type="tool_1:For" expression="aql:element.target"> <subModelOperations xsi:type="tool_1:SetValue" featureName="data" valueExpression="data value"/> </firstModelOperations> </initialOperation> @@ -609,7 +609,7 @@ <variable name="container"/> <viewVariable name="containerView"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%getRootContainer().eContents.filter("Chapter").nLast()%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:self.eResource().getContents()->first().eContents()->filter(docbook::Chapter)->last())"> <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Title" referenceName="title"/> </firstModelOperations> </initialOperation> @@ -620,7 +620,7 @@ <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> </ownedTools> - <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="<%getRootContainer()%>" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']"> + <ownedTools xsi:type="tool:DiagramCreationDescription" name="navigate throw node" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='docbook_extended']/@ownedRepresentations[name='obviousDiagram']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> @@ -666,7 +666,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect1"/> </firstModelOperations> </initialOperation> @@ -679,7 +679,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect2"/> </firstModelOperations> </initialOperation> @@ -692,7 +692,7 @@ <targetView name="targetView"/> <element name="element"/> <initialOperation> - <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="<%$sourceView.sourceNode.target%>"> + <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:sourceView.sourceNode.target"> <subModelOperations xsi:type="tool_1:MoveElement" newContainerExpression="var:target" featureName="sect3"/> </firstModelOperations> </initialOperation> |