diff options
| author | cbrun | 2015-12-28 12:54:04 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2015-12-30 09:20:55 +0000 |
| commit | c646fd66dd7cd97429ad5cb45e30034d3bf707ff (patch) | |
| tree | 2ca598b861c8058a04371d8e378381e7a278a203 | |
| parent | 2f823f2213ade14c29bdb6f03244fc1740f32fba (diff) | |
| download | org.eclipse.sirius-c646fd66dd7cd97429ad5cb45e30034d3bf707ff.tar.gz org.eclipse.sirius-c646fd66dd7cd97429ad5cb45e30034d3bf707ff.tar.xz org.eclipse.sirius-c646fd66dd7cd97429ad5cb45e30034d3bf707ff.zip | |
[478878] Migrate remaining expressions in junit tests plugin
Bug: 478878
Change-Id: I25958f0457ca9a84a1057b73c6745718e55c91c6
17 files changed, 178 insertions, 178 deletions
diff --git a/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign b/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign index 0fcdc67d62..b5029084d8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/sequence/unit/variablesAccess/variablesAccess.odesign @@ -100,7 +100,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign index aa2e3ee3ee..b81b293249 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/table/unit/refresh/tables.odesign @@ -462,13 +462,13 @@ <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="TestInitialWidth" domainClass="Model" initialHeaderColumnWidth="200"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <ownedLineMappings name="Class" domainClass="Class" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:'Class ' + self.name"/> - <ownedColumnMappings name="ClassName" headerLabelExpression="Name" initialWidth="250" featureName="<%name%>" labelExpression="aql:self.name"/> + <ownedColumnMappings name="ClassName" headerLabelExpression="Name" initialWidth="250" featureName="aql:self.name" labelExpression="aql:self.name"/> <ownedColumnMappings name="ClassIsAbstract" headerLabelExpression="isAbstract" initialWidth="100" featureName="isAbstract" labelExpression="aql:self.isAbstract"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:EditionTableDescription" name="TestColumnWithoutHeaderLabelExpression" domainClass="Model" initialHeaderColumnWidth="200"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> <ownedLineMappings name="Class" domainClass="Class" semanticCandidatesExpression="feature:eContents" headerLabelExpression="aql:'Class ' + self.name"/> - <ownedColumnMappings name="ClassName" headerLabelExpression="" initialWidth="250" featureName="<%name%>" labelExpression="aql:self.name"/> + <ownedColumnMappings name="ClassName" headerLabelExpression="" initialWidth="250" featureName="aql:self.name" labelExpression="aql:self.name"/> </ownedRepresentations> <ownedRepresentations xsi:type="description_2:DiagramDescription" name="Classes" initialisation="true" domainClass="Model"> <metamodel href="platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#/"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/acceleo/service.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/acceleo/service.odesign index 5f1971d3c5..a8c81dbd16 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/acceleo/service.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/acceleo/service.odesign @@ -3,7 +3,7 @@ <ownedViewpoints name="UML2 diagrams" modelFileExtension="uml"> <ownedRepresentations xsi:type="description_1:DiagramDescription" documentation="Use cases diagram" name="Use Cases" domainClass="Model"> <nodeMappings name="Acteur" semanticCandidatesExpression="feature:eAllContents" domainClass="Actor"> - <style xsi:type="style:BundledImageDescription" showIcon="false" labelExpression="<%actorNameService%>" sizeComputationExpression="4" shape="triangle"> + <style xsi:type="style:BundledImageDescription" showIcon="false" labelExpression="aql:self.actorNameService()" sizeComputationExpression="4" shape="triangle"> <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']"/> @@ -16,7 +16,7 @@ <viewVariable name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:CreateInstance" typeName="Actor" referenceName="packagedElement"> - <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="New Actor <%eContainer.eContents("Actor").nSize%>"/> + <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="aql:'New ACtor ' + self.eContainer().eContents()->filter(uml::Actor)->size()"/> </firstModelOperations> </initialOperation> </ownedTools> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign index d17a8d8301..c1c8355a7e 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/ecore_acceleo3.odesign @@ -1230,7 +1230,7 @@ </containerMappings> <containerMappings xsi:type="description_4:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_4:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Sequence%20Diagram']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false" labelExpression="[<%name%>]" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" showIcon="false" labelExpression="[aql:self.name]" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom"> <borderColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']"/> <labelColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']"/> <backgroundColor xsi:type="description:UserFixedColor" href="sequenceDiagram.odesign#//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign index a3152feb62..85fcc8978a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/interpreter/validateExpression/sequenceDiagram.odesign @@ -99,7 +99,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="aql:self" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20Example%20with%20Combined%20Fragments%20Support']/@defaultLayer/@toolSections.4/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="ocl : let _ends : Sequence(AbstractEnd) = Interaction.allInstances()->any(true).ends->asSequence()->select(e : AbstractEnd | e.oclIsKindOf(OperandEnd) or e.oclIsKindOf(CombinedFragmentEnd)) in let indexOfOperandEnd : Integer = _ends->indexOf(self.start) in let nextEnd : AbstractEnd = _ends->subSequence(indexOfOperandEnd+1, _ends->size())->first() in nextEnd"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/My.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/My.aird index 068549e11a..cb28e7195d 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/My.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/margin/My.aird @@ -116,7 +116,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivna4uS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivna4uS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -135,7 +135,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivopAOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivopAOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -154,7 +154,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivopBuS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ivopBuS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -173,7 +173,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHUssOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHUssOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> @@ -192,7 +192,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHXwAOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHXwAOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> @@ -211,7 +211,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHazUOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_rHazUOS1EeKH-OJR8wbplA" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> @@ -346,7 +346,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtm9j19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtm9j19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -365,7 +365,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnAT19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnAT19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -381,7 +381,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XDtnCz19EeO8172-f6hTJg" name="The border label VSM size is 10 "> <target xmi:type="ecore:EClass" href="My.ecore#//10"/> <semanticElements xmi:type="ecore:EClass" href="My.ecore#//10"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnDD19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnDD19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='List']"/> @@ -400,7 +400,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnFz19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnFz19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> @@ -419,7 +419,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnIj19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDtnIj19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="1" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> @@ -438,7 +438,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDuN4j19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="<%name%>" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_XDuN4j19EeO8172-f6hTJg" labelColor="239,41,41" labelAlignment="LEFT" borderSize="10" borderSizeComputationExpression="aql:self.name" borderColor="114,159,207" backgroundStyle="Liquid" backgroundColor="69,69,69" foregroundColor="255,255,255"> <description xmi:type="style:FlatContainerStyleDescription" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']/@style"/> </ownedStyle> <actualMapping xmi:type="description_1:ContainerMapping" href="margin.odesign#//@ownedViewpoints[name='margin']/@ownedRepresentations[name='Margin%20Diagram']/@defaultLayer/@containerMappings[name='Container']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/testInitOperation.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/testInitOperation.odesign index ad8241fbbb..ea8d93c5ad 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/testInitOperation.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/modelers/ecore/testInitOperation.odesign @@ -17,7 +17,7 @@ </nodeMappings> </defaultLayer> <toolSection name="tools"> - <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Create another dummy diagram" browseExpression="<%getRootContainer%>" diagramDescription="//@ownedViewpoints[name='CheckForInit']/@ownedRepresentations[name='DiagramWithEffect']"> + <ownedTools xsi:type="tool_1:DiagramCreationDescription" name="Create another dummy diagram" browseExpression="aql:self.eResource().getContents()->first()" diagramDescription="//@ownedViewpoints[name='CheckForInit']/@ownedRepresentations[name='DiagramWithEffect']"> <initialOperation/> <containerViewVariable name="containerView"/> <representationNameVariable name="diagramName"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign index 9fc752974c..ede15df829 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction.odesign @@ -112,7 +112,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> @@ -1885,7 +1885,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> @@ -3658,7 +3658,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign index ba52cabdae..f3bf3ab03a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/interaction_modified.odesign @@ -112,7 +112,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.7/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> @@ -1885,7 +1885,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy1']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> @@ -3658,7 +3658,7 @@ </containerMappings> <containerMappings xsi:type="description_1:CombinedFragmentMapping" name="Combined Fragment" preconditionExpression="aql:self.coveredParticipants->size()" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Delete%20Combined%20Fragment']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@ownedTools[name='Edit%20Combined%20Fragment']" semanticCandidatesExpression="feature:eAllContents" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.CombinedFragment" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.finish" coveredLifelinesExpression="aql:self.coveredParticipants"> <subContainerMappings xsi:type="description_1:OperandMapping" name="Operand" deletionDescription="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Delete%20Operand']" labelDirectEdit="//@ownedViewpoints[name='Interactions_Copy2']/@ownedRepresentations[name='Sequence%20Diagram%20on%20Interaction']/@defaultLayer/@toolSections.8/@subSections[name='Operands']/@ownedTools[name='Edit%20Operand']" semanticCandidatesExpression="aql:self.ownedOperands" semanticElements="var:self" synchronizationLock="true" domainClass="interactions.Operand" startingEndFinderExpression="aql:self.start" finishingEndFinderExpression="aql:self.getFinishingEnd()"> - <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[<%name%>]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> + <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="[aql:self.name]" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundStyle="GradientTopToBottom" backgroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']" foregroundColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Paleolitico']"/> </subContainerMappings> <style xsi:type="style:FlatContainerStyleDescription" arcWidth="1" arcHeight="1" borderSizeComputationExpression="1" borderColor="//@userColorsPalettes[name='Dutch%20Seas']/@entries[name='Dutch%20teal']" showIcon="false" labelExpression="aql:self.operator" labelColor="//@userColorsPalettes[name='Skyblue']/@entries[name='Evening_Skyblue']" labelAlignment="LEFT" backgroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']" foregroundColor="//@userColorsPalettes[name='Greens']/@entries[name='Interpolated%20green%20for%20Combined%20Fragments']"> <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.0"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign index caf9b5338d..dde28701ba 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/movida/tables.odesign @@ -13,7 +13,7 @@ <target xsi:type="contribution:DirectEObjectReference" value="//@ownedViewpoints[name='VP1']/@ownedRepresentations[name='Target_Table']/@ownedLineMappings[name='Classes']"/> <featureMask xsi:type="contribution:SetFeatureContribution"/> </contributions> - <ownedLineMappings name="ClassesSubset" semanticCandidatesExpression="<%eClassifiers[name.startsWith("A")]%>"/> + <ownedLineMappings name="ClassesSubset" semanticCandidatesExpression="aql:self.eClassifiers->select(c | c.name.startsWith('A')>"/> </ownedRepresentationExtensions> </ownedViewpoints> </description:Group> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign index 59ae5b6afc..1c6633c82a 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" documentation="org.eclipse.sirius.tests.data" name="RefreshTreeOdesign" version="8.0.0"> +<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" documentation="org.eclipse.sirius.tests.data" name="RefreshTreeOdesign" version="10.1.3.201511131800"> <ownedViewpoints name="Design" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="EPackageContent" domainClass="EPackage"> <subItemMappings name="EClasses" domainClass="EClass" semanticCandidatesExpression="feature:eContents"> @@ -8,8 +8,8 @@ <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="<%eContents()[isAbstract]%>" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> - <defaultStyle labelExpression="*<%name%>"> + <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.isAbstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> + <defaultStyle labelExpression="*aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> @@ -60,7 +60,7 @@ </subItemMappings> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="PreconditionOnMappings" domainClass="EPackage"> - <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="<%$view.target[isAbstract]%>" semanticCandidatesExpression="feature:eContents"> + <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="aql:view.target->select( e | e.isAbstract)" semanticCandidatesExpression="feature:eContents"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old index 8e503fb19d..b175358b58 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/vsm.odesign.old @@ -2,21 +2,21 @@ <description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/tree/description/1.0.0" documentation="org.eclipse.sirius.tests.data" name="RefreshTreeOdesign"> <ownedViewpoints name="Design" modelFileExtension="ecore"> <ownedRepresentations xsi:type="description_1:TreeDescription" name="EPackageContent" domainClass="EPackage"> - <subItemMappings name="EClasses" domainClass="EClass" semanticCandidatesExpression="<%eContents()%>"> + <subItemMappings name="EClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> </subItemMappings> - <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="<%eContents()[isAbstract]%>" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> - <defaultStyle labelExpression="*<%name%>"> + <subItemMappings name="AbstractClasses" domainClass="EClass" semanticCandidatesExpression="aql:self.eContents()->select(e | e.isAbstract)" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='EPackageContent']/@subItemMappings[name='EClasses']"> + <defaultStyle labelExpression="*aql:self.name"> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/> </defaultStyle> </subItemMappings> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Generic EMF Tree" domainClass="EObject"> - <subItemMappings name="EObject" domainClass="EObject" semanticCandidatesExpression="<%eContents()%>" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Generic%20EMF%20Tree']/@subItemMappings[name='EObject']"> + <subItemMappings name="EObject" domainClass="EObject" semanticCandidatesExpression="aql:self.eContents()" reusedTreeItemMappings="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Generic%20EMF%20Tree']/@subItemMappings[name='EObject']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -24,12 +24,12 @@ </subItemMappings> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="Generic EMF Tree With Inheritance" domainClass="EObject"> - <subItemMappings name="EObject Master" domainClass="EObject " semanticCandidatesExpression="<%eContents()%>"> + <subItemMappings name="EObject Master" domainClass="EObject " semanticCandidatesExpression="aql:self.eContents()"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> </defaultStyle> - <subItemMappings name="EObject Child" domainClass="EObject" semanticCandidatesExpression="<%eContents()%>" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Generic%20EMF%20Tree%20With%20Inheritance']/@subItemMappings[name='EObject%20Master']"> + <subItemMappings name="EObject Child" domainClass="EObject" semanticCandidatesExpression="aql:self.eContents()" specialize="//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Generic%20EMF%20Tree%20With%20Inheritance']/@subItemMappings[name='EObject%20Master']"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> @@ -60,7 +60,7 @@ </subItemMappings> </ownedRepresentations> <ownedRepresentations xsi:type="description_1:TreeDescription" name="PreconditionOnMappings" domainClass="EPackage"> - <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="<%$view.target[isAbstract]%>" semanticCandidatesExpression="<%eContents()%>"> + <subItemMappings name="EClasses" domainClass="Abstract EClass by Precondition" preconditionExpression="<%$view.target[isAbstract]%>" semanticCandidatesExpression="aql:self.eContents()"> <defaultStyle> <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/modifySession/My.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/modifySession/My.odesign index c4a2fc45a9..7f6c0286c1 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/session/modifySession/My.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/session/modifySession/My.odesign @@ -20,7 +20,7 @@ </containerMappings> <toolSections> <ownedTools xsi:type="tool:NodeCreationDescription" name="createEClass" nodeMappings="//@ownedViewpoints[name='DOREMI-2887']/@ownedRepresentations[name='Diagram']/@defaultLayer/@containerMappings[name='Package']/@subNodeMappings[name='Class']"> - <filters precondition="<%self.eContainer("DDiagram").ownedDiagramElements.length>0%>" elementsToListen="var:self"> + <filters precondition="aql:self.eContainerOrSelf(diagram::DDiagram).ownedDiagramElements->size() > 0" elementsToListen="var:self"> <listeners domainClass="DDiagram" featureName="ownedDiagramElements"/> </filters> <variable name="container"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign index 2819255149..e59b612a81 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket1176/test1176.odesign @@ -53,7 +53,7 @@ <associatedColor href="environment:/viewpoint#//@systemColors/@entries[name='black']"/> </colorSteps> <colorSteps associatedValue="1" associatedColor="//@userColorsPalettes[name=null]/@entries[name='bleu']"/> - <colorSteps associatedValue="<%10%>" associatedColor="//@userColorsPalettes[name=null]/@entries[name='rose']"/> + <colorSteps associatedValue="10" associatedColor="//@userColorsPalettes[name=null]/@entries[name='rose']"/> </entries> <entries xsi:type="description:InterpolatedColor" name="Interpolated Color 2" colorValueComputationExpression="aql:self.eContents()->size()"> <colorSteps> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.aird index 0a011bdc4b..356c3d5eaa 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/ticket2229/2229.aird @@ -647,7 +647,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQbXwJjDEeCTjf2eRUPO7Q" name="Square_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_fQbXwZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_fQbXwZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQbXwpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQbXw5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -658,7 +658,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQb-0JjDEeCTjf2eRUPO7Q" name="Square_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_fQcl4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_fQcl4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQcl4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQcl4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -669,7 +669,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQdM8JjDEeCTjf2eRUPO7Q" name="Square_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_fQdM8ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_fQdM8ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQdM8pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQdM85jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -680,7 +680,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQd0AJjDEeCTjf2eRUPO7Q" name="Square_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:Square" xmi:id="_fQd0AZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_fQd0AZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQd0ApjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQd0A5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -691,7 +691,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQebEJjDEeCTjf2eRUPO7Q" name="Lozenge_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQfCIJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQfCIJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQfCIZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQfCIpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -702,7 +702,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQfpMJjDEeCTjf2eRUPO7Q" name="Lozenge_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQfpMZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQfpMZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQfpMpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQfpM5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -713,7 +713,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQgQQJjDEeCTjf2eRUPO7Q" name="Lozenge_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQgQQZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQgQQZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQgQQpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQgQQ5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -724,7 +724,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQg3UJjDEeCTjf2eRUPO7Q" name="Lozenge_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQg3UZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_fQg3UZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQg3UpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQg3U5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -735,7 +735,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQheYJjDEeCTjf2eRUPO7Q" name="Ellipse_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQiFcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQiFcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQiFcZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQiFcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -746,7 +746,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQisgJjDEeCTjf2eRUPO7Q" name="Ellipse_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQisgZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQisgZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQisgpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQisg5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -757,7 +757,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQjTkJjDEeCTjf2eRUPO7Q" name="Ellipse_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQjTkZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQjTkZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQjTkpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQjTk5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -768,7 +768,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQj6oJjDEeCTjf2eRUPO7Q" name="Ellipse_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQkhsJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_fQkhsJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQkhsZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQkhspjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -779,7 +779,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQlIwJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Square_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQlv0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQlv0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQlv0ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQlv0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -790,7 +790,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQlv1JjDEeCTjf2eRUPO7Q" name="Bundle_Image_Square_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQmW4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQmW4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQmW4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQmW4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -801,7 +801,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQmW5JjDEeCTjf2eRUPO7Q" name="Bundle_Image_Square_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQm98JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQm98JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQm98ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQm98pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -812,7 +812,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQm99JjDEeCTjf2eRUPO7Q" name="Bundle_Image_Square_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQnlAJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQnlAJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQnlAZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQnlApjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -823,7 +823,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQoMEJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Stroke_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQoMEZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQoMEZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQoMEpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQoME5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -834,7 +834,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQozIJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Stroke_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQpaMJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQpaMJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQpaMZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQpaMpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -845,7 +845,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQpaNJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Stroke_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQqBQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQqBQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQqBQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQqBQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -856,7 +856,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQqoUJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Stroke_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQqoUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQqoUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQqoUpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQqoU5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -867,7 +867,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQr2cJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Triangle_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQsdgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQsdgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQsdgZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQsdgpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -878,7 +878,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQtEkJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Triangle_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQtEkZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQtEkZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQtEkpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQtEk5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -889,7 +889,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQtroJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Triangle_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQtroZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQtroZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQtropjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQtro5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -900,7 +900,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQuSsJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Triangle_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQuSsZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQuSsZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQuSspjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQuSs5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -911,7 +911,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQu5wJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Dot_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQvg0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQvg0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQvg0ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQvg0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -922,7 +922,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQwH4JjDEeCTjf2eRUPO7Q" name="Bundle_Image_Dot_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQwH4ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQwH4ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQwH4pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQwH45jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -933,7 +933,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQwu8JjDEeCTjf2eRUPO7Q" name="Bundle_Image_Dot_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQxWAJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQxWAJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQxWAZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQxWApjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -944,7 +944,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQxWBJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Dot_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQx9EJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQx9EJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQx9EZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQx9EpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -955,7 +955,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQykIJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Ring_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQykIZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQykIZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQykIpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQzLMJjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -966,7 +966,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQzLMpjDEeCTjf2eRUPO7Q" name="Bundle_Image_Ring_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQzyQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQzyQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQzyQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQzyQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -977,7 +977,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ0ZUJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Ring_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQ0ZUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQ0ZUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ0ZUpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ0ZU5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -988,7 +988,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ1AYJjDEeCTjf2eRUPO7Q" name="Bundle_Image_Ring_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQ1AYZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_fQ1AYZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ1AYpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ1AY5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -999,7 +999,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ1ncJjDEeCTjf2eRUPO7Q" name="Note_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ2OgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ2OgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ2OgZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ2OgpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1010,7 +1010,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ21kJjDEeCTjf2eRUPO7Q" name="Note_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ21kZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ21kZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ21kpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ21k5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1021,7 +1021,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ3coJjDEeCTjf2eRUPO7Q" name="Note_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ3coZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ3coZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ3copjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ3co5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1032,7 +1032,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ4DsJjDEeCTjf2eRUPO7Q" name="Note_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ4DsZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_fQ4DsZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ4DspjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ4Ds5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1043,7 +1043,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ4qwJjDEeCTjf2eRUPO7Q" name="Dot_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ5R0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="5"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ5R0JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="5"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ5R0ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ5R0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1054,7 +1054,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ544JjDEeCTjf2eRUPO7Q" name="Dot_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ544ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="5"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ544ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="5"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ544pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ5445jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1065,7 +1065,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ6f8JjDEeCTjf2eRUPO7Q" name="Dot_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ6f8ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="5"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ6f8ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="5"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ6f8pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ6f85jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1076,7 +1076,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ7HAJjDEeCTjf2eRUPO7Q" name="Dot_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ7HAZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="5"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_fQ7HAZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="5"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ7HApjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ7HA5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1087,7 +1087,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ8VIJjDEeCTjf2eRUPO7Q" name="Gauge_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ8VIZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ8VIZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ8VIpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1096,7 +1096,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ88MJjDEeCTjf2eRUPO7Q" name="Gauge_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ88MZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ88MZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ88MpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1105,7 +1105,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ9jQJjDEeCTjf2eRUPO7Q" name="Gauge_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ9jQZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ9jQZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ9jQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1114,7 +1114,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ-KUJjDEeCTjf2eRUPO7Q" name="Gauge_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ-KUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_fQ-KUZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ-KUpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1123,7 +1123,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ-xYJjDEeCTjf2eRUPO7Q" name="Workspace_Image_new EClass 1" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fQ_YcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fQ_YcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ_YcZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1132,7 +1132,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fQ__gJjDEeCTjf2eRUPO7Q" name="Workspace_Image_new EClass 2" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fQ__gZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fQ__gZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fQ__gpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1141,7 +1141,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fRAmkJjDEeCTjf2eRUPO7Q" name="Workspace_Image_new EClass 3" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRBNoJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRBNoJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRBNoZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1150,7 +1150,7 @@ <ownedDiagramElements xmi:type="diagram:DNode" xmi:id="_fRB0sJjDEeCTjf2eRUPO7Q" name="Workspace_Image_new EClass 4" width="20" height="20" resizeKind="NSEW"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRB0sZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRB0sZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRB0spjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1159,7 +1159,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRDC0JjDEeCTjf2eRUPO7Q" name="Flat_Container_new EClass 1" tooltipText="root.new EClass 1"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRDC0ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRDC0ZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRDC0pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRDC05jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1171,7 +1171,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRDp4JjDEeCTjf2eRUPO7Q" name="Flat_Container_new EClass 2" tooltipText="root.new EClass 2"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fREQ8JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fREQ8JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fREQ8ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fREQ8pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1183,7 +1183,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fREQ9ZjDEeCTjf2eRUPO7Q" name="Flat_Container_new EClass 3" tooltipText="root.new EClass 3"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRE4AJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRE4AJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRE4AZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRE4ApjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1195,7 +1195,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRFfEJjDEeCTjf2eRUPO7Q" name="Flat_Container_new EClass 4" tooltipText="root.new EClass 4"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRGGIJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_fRGGIJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRGGIZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Flat%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRGGIpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1207,7 +1207,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRGtMJjDEeCTjf2eRUPO7Q" name="Shape_Container_new EClass 1" tooltipText="root.new EClass 1"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRHUQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRHUQJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRHUQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:ShapeContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Shape%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRHUQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1218,7 +1218,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRH7UJjDEeCTjf2eRUPO7Q" name="Shape_Container_new EClass 2" tooltipText="root.new EClass 2"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRH7UZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRH7UZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRH7UpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:ShapeContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Shape%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRH7U5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1229,7 +1229,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRIiYJjDEeCTjf2eRUPO7Q" name="Shape_Container_new EClass 3" tooltipText="root.new EClass 3"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRJJcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRJJcJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRJJcZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:ShapeContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Shape%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRJJcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1240,7 +1240,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRJJdJjDEeCTjf2eRUPO7Q" name="Shape_Container_new EClass 4" tooltipText="root.new EClass 4"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRJwgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:ShapeContainerStyle" xmi:id="_fRJwgJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_fRJwgZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:ShapeContainerStyleDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Shape%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRJwgpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1251,7 +1251,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRKXkJjDEeCTjf2eRUPO7Q" name="Workspace_Image_Container_new EClass 1" tooltipText="root.new EClass 1"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%201"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRK-oJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRK-oJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Workspace%20Image%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRK-oZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1260,7 +1260,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRK-opjDEeCTjf2eRUPO7Q" name="Workspace_Image_Container_new EClass 2" tooltipText="root.new EClass 2"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%202"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRLlsJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRLlsJjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Workspace%20Image%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRLlsZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1269,7 +1269,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRMMwJjDEeCTjf2eRUPO7Q" name="Workspace_Image_Container_new EClass 3" tooltipText="root.new EClass 3"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%203"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRMMwZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRMMwZjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Workspace%20Image%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRMMwpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1278,7 +1278,7 @@ <ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_fRMz0JjDEeCTjf2eRUPO7Q" name="Workspace_Image_Container_new EClass 4" tooltipText="root.new EClass 4"> <target xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> <semanticElements xmi:type="ecore:EClass" href="2229.ecore#//new%20EClass%204"/> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRNa4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/2229/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_fRNa4JjDEeCTjf2eRUPO7Q" borderSize="4" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/2229/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="2229.odesign#//@ownedViewpoints[name='tc2229']/@ownedRepresentations[name='tc2229']/@defaultLayer/@containerMappings[name='EC%20EClass%20Workspace%20Image%20Container']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_fRNa4ZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.aird b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.aird index fb93bb184f..5284cc7b60 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.aird +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/style/vp973/vp973.aird @@ -841,7 +841,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZqEzQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZqEzQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqEzQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqEzQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -855,7 +855,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_ZqGocJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_ZqGocJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqGocZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqGocpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -869,7 +869,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ZqJrwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ZqJrwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqJrwZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqJrwpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -883,7 +883,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqNWIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqNWIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqNWIZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqNWIpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -897,7 +897,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqRnkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqRnkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqRnkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqRnkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -911,7 +911,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqVR8JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqVR8JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqVR8ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqVR8pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -925,7 +925,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqYVQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqYVQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqYVQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqYVQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -939,7 +939,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqaKcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqaKcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqaKcZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqaKcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -953,7 +953,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_ZqbYkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_ZqbYkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqbYkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqbYkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -967,7 +967,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zqd00JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zqd00JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zqd00ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zqd00pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -981,7 +981,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZqqpIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZqqpIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqqpIZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -993,7 +993,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_Zqr3QJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_Zqr3QJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zqr3QZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1008,7 +1008,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqwvwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqwvwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqwvwZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqwvwpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1022,7 +1022,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zqyk8JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zqyk8JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zqyk8ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zqyk8pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1036,7 +1036,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqzzEZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZqzzEZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqzzEpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqzzE5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1050,7 +1050,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zq1oQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zq1oQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq1oQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq1oQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1064,7 +1064,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zq22YZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zq22YZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq3dcJjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq3dcZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1078,7 +1078,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zq4rkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zq4rkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq4rkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq4rkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1092,7 +1092,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zq55sZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zq55sZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq55spjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq55s5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1106,7 +1106,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zq7u4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zq7u4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq7u4ZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1118,7 +1118,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zq89AZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zq89AZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq89ApjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq89A5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1132,7 +1132,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_Zq_ZQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_Zq_ZQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq_ZQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zq_ZQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1146,7 +1146,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZrIjMJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZrIjMJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrIjMZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrIjMpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1160,7 +1160,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZrKYYZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZrKYYZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrKYYpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1169,7 +1169,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZqtscJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZqtscJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqtscZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='Package']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZqtscpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1183,7 +1183,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ZrRGEJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_ZrRGEJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrRGEZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@containerMappings[name='Package']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrRGEpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1197,7 +1197,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrXMsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrXMsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrXMsZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrXMspjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1211,7 +1211,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zra3EJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zra3EJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zra3EZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zra3EpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1225,7 +1225,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZriL0JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZriL0JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZriL0ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZriL0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1239,7 +1239,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrjZ8ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrjZ8ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrjZ8pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrjZ85jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1253,7 +1253,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrpgkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZrpgkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrpgkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZrpgkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1267,7 +1267,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_ZrrVwZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_ZrrVwZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrr80JjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrr80ZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1281,7 +1281,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zrw1UJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zrw1UJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrw1UZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrw1UpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1295,7 +1295,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZryDcZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZryDcZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZryDcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1307,7 +1307,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zrz4oJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zrz4oJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrz4oZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zrz4opjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1321,7 +1321,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_Zr4xIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_Zr4xIJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zr4xIZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zr4xIpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1335,7 +1335,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_Zr6mUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_Zr6mUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zr6mUZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zr6mUpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1349,7 +1349,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZsDJMZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZsDJMZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsDJMpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1364,7 +1364,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsIBsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsIBsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsIBsZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsIBspjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1378,7 +1378,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsOIUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsOIUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsOIUZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsOIUpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1392,7 +1392,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsPWcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsPWcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsPWcZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsPWcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1406,7 +1406,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsRLoJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsRLoJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsRLoZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsRLopjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1420,7 +1420,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsYgYJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZsYgYJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsYgYZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsYgYpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1434,7 +1434,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_ZsaVkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_ZsaVkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsaVkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsaVkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1448,7 +1448,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ZsspcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_ZsspcJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsspcZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsspcpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1462,7 +1462,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZswT0ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_ZswT0ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZswT0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1474,7 +1474,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zs6r4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zs6r4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zs6r4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zs6r4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1488,7 +1488,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_ZtFrAJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_ZtFrAJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtFrAZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtFrApjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1502,7 +1502,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZtJ8cJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZtJ8cJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtJ8cZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtJ8cpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1516,7 +1516,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZtdecJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZtdecJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtdecZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1525,7 +1525,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZsE-YJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZsE-YJjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsE-YZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='Package']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZsE-YpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1543,7 +1543,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZtzcsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZtzcsJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtzcsZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZtzcspjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1557,7 +1557,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zt7_kJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zt7_kJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zt7_kZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zt7_kpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1571,7 +1571,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZuZSkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZuZSkJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZuZSkZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZuZSkpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1585,7 +1585,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZubHwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZubHwJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZubHwZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZubHwpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1599,7 +1599,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zuh1cJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zuh1cJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zuh1cZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zuh1cpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1613,7 +1613,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zuq_YJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zuq_YJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zuq_YZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zuq_YpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1627,7 +1627,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zuv34JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zuv34JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zuv34ZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1639,7 +1639,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zu1-gZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_Zu1-gZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zu2lkJjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zu2lkZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1653,7 +1653,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_ZvBksJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_ZvBksJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvCLwJjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvCLwZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1667,7 +1667,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZvDZ4ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZvDZ4ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvDZ4pjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvDZ45jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1681,7 +1681,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZvHrUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZvHrUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvHrUZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1693,7 +1693,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZvJggJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZvJggJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvJggZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvJggpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1710,7 +1710,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zvqd4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="dot"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zvqd4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="dot"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zvqd4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zvqd4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1724,7 +1724,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zvs6IJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="ring"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zvs6IJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="ring"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zvs6IZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Ring']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zvs6IpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1738,7 +1738,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZvuvUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_ZvuvUJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvuvUZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvuvUpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1752,7 +1752,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zv0O4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="stroke"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zv0O4JjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="stroke"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv0O4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Stroke']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv0O4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1766,7 +1766,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zv2EEJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" shape="triangle"> + <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_Zv2EEJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" shape="triangle"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv2EEZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:BundledImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Bundled%20Image%20Triangle']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv2EEpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1780,7 +1780,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zv6VgJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" strokeSizeComputationExpression="1"> + <ownedStyle xmi:type="diagram:Dot" xmi:id="_Zv6VgJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" strokeSizeComputationExpression="1"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv6VgZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:DotDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Dot']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv6VgpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1794,7 +1794,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zv7joZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Ellipse" xmi:id="_Zv7joZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv7jopjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:EllipseNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Ellipse']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv7jo5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1808,7 +1808,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zv9Y0ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:GaugeCompositeStyle" xmi:id="_Zv9Y0ZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <description xmi:type="style:GaugeCompositeStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Gauge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zv9Y0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1820,7 +1820,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_ZwEGgZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Lozenge" xmi:id="_ZwEGgZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwEGgpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:LozengeNodeDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Lozenge']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwEGg5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1834,7 +1834,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Note" xmi:id="_ZwLbQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>"> + <ownedStyle xmi:type="diagram:Note" xmi:id="_ZwLbQJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwLbQZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:NoteDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Note']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwLbQpjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1848,7 +1848,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZwNQcZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZwNQcZjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwNQcpjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Square']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwNQc5jDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1862,7 +1862,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZwPssJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> + <ownedStyle xmi:type="diagram:WorkspaceImage" xmi:id="_ZwPssJjDEeCTjf2eRUPO7Q" borderSize="1" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" workspacePath="/org.eclipse.sirius.tests.junit/images/logo_o.png"> <description xmi:type="style:WorkspaceImageDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='ClassMapping%20Workspace%20Image']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZwPssZjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> </ownedStyle> @@ -1871,7 +1871,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:Square" xmi:id="_ZvMj0JjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" width="20" height="20"> + <ownedStyle xmi:type="diagram:Square" xmi:id="_ZvMj0JjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" width="20" height="20"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvMj0ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:SquareDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@nodeMappings[name='Package']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_ZvMj0pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> @@ -1882,7 +1882,7 @@ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> <arrangeConstraints>KEEP_SIZE</arrangeConstraints> <arrangeConstraints>KEEP_RATIO</arrangeConstraints> - <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Zthv4JjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="<%eContainer().eContents().nSize()%>" backgroundStyle="GradientTopToBottom"> + <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_Zthv4JjDEeCTjf2eRUPO7Q" borderSizeComputationExpression="aql:self.eContainer().eContents()->size()" backgroundStyle="GradientTopToBottom"> <labelColor xmi:type="viewpoint:RGBValues" xmi:id="_Zthv4ZjDEeCTjf2eRUPO7Q"/> <description xmi:type="style:FlatContainerStyleDescription" href="vp973.odesign#//@ownedViewpoints[name='vp973']/@ownedRepresentations[name='vp973']/@defaultLayer/@containerMappings[name='Package2']/@style"/> <borderColor xmi:type="viewpoint:RGBValues" xmi:id="_Zthv4pjDEeCTjf2eRUPO7Q" red="138" green="226" blue="52"/> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/toolApplicability.odesign b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/toolApplicability.odesign index 85dd414b50..f7de31fd79 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/toolApplicability.odesign +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/tools/applicability/toolApplicability.odesign @@ -24,7 +24,7 @@ <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> </nodeMappings> - <edgeMappings name="RemoteRef" sourceMapping="//@ownedViewpoints[name='Test%20for%20tool%20applicability%20with%20extra%20mappings']/@ownedRepresentations[name='TestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Test%20for%20tool%20applicability%20with%20extra%20mappings']/@ownedRepresentations[name='TestDiagram']/@defaultLayer/@nodeMappings[name='Package']/@borderedNodeMappings[name='RemoteType']" targetFinderExpression="<%eStructuralFeatures.filter("EReference").eType%>"> + <edgeMappings name="RemoteRef" sourceMapping="//@ownedViewpoints[name='Test%20for%20tool%20applicability%20with%20extra%20mappings']/@ownedRepresentations[name='TestDiagram']/@defaultLayer/@nodeMappings[name='Class']" targetMapping="//@ownedViewpoints[name='Test%20for%20tool%20applicability%20with%20extra%20mappings']/@ownedRepresentations[name='TestDiagram']/@defaultLayer/@nodeMappings[name='Package']/@borderedNodeMappings[name='RemoteType']" targetFinderExpression="aql:self.eStructuralFeatures->filter(ecore::EReference).eType"> <style sizeComputationExpression="2"> <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/> </style> |