Commit 6714bcc7 authored by Martti Käärik's avatar Martti Käärik
Browse files

Use GateInstance name not GateReference name. 

Change-Id: I136695921a49c7ed02fe364fe8d1b6d2744b5a1b
parent 38d9971e

plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign

+3 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="TDL" version="10.1.3.201511131800">

<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/sequence/description/2.0.0" xmlns:description_2="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" name="TDL" version="12.0.0.2017041100">

  <ownedViewpoints name="org.etsi.mts.tdl" label="TDL">

    <ownedRepresentations xsi:type="description_1:SequenceDiagramDescription" name="TestDescriptionDiagram" label="TDL Behavior" domainClass="tdl.TestDescription" enablePopupBars="true" endsOrdering="[getOccurrences()->select(e|eventEnds->includes(e))/]" instanceRolesOrdering="[testConfiguration.connection.endPoint->sortedBy(ref|ref.component.name + '.' + ref.gate.name)/]">

      <metamodel href="../tdl.ecore#/"/>
@@ -490,7 +490,7 @@ 
            </centerLabelStyleDescription>

          </style>

        </edgeMappings>

        <edgeMappings name="testConfiguration.connection" sourceMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateReference']" targetMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateReference']" targetFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.endPoint->sortedBy(g|g.name)->at(2).component and ref.gate = self.endPoint->sortedBy(g|g.name)->at(2).gate)/]" sourceFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.endPoint->sortedBy(g|g.name)->at(1).component and ref.gate = self.endPoint->sortedBy(g|g.name)->at(1).gate)/]" domainClass="tdl.Connection" useDomainElement="true">

        <edgeMappings name="testConfiguration.connection" sourceMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateReference']" targetMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateReference']" targetFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.endPoint->sortedBy(g|g.gate.name)->at(2).component and ref.gate = self.endPoint->sortedBy(g|g.gate.name)->at(2).gate)/]" sourceFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.endPoint->sortedBy(g|g.gate.name)->at(1).component and ref.gate = self.endPoint->sortedBy(g|g.gate.name)->at(1).gate)/]" domainClass="tdl.Connection" useDomainElement="true">

          <style targetArrow="NoDecoration" sizeComputationExpression="2" routingStyle="manhattan">

            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

            <centerLabelStyleDescription showIcon="false" labelExpression="[name/]">
@@ -773,7 +773,7 @@ 
          <subContainerMappings name="testConfiguration.configuration" semanticCandidatesExpression="[self/]" domainClass="tdl.TestConfiguration">

            <subContainerMappings name="testConfiguration.componentInstance" semanticCandidatesExpression="[componentInstance/]" domainClass="tdl.ComponentInstance" childrenPresentation="List">

              <borderedNodeMappings name="testConfiguration.gateReference" semanticCandidatesExpression="[type.gateInstance->collect(gate|tdl::TestConfiguration.allInstances()->select(conf|conf.componentInstance->includes(self)).connection.endPoint->select(ep|ep.component = self)->any(ep|ep.gate = gate))/]" domainClass="tdl.GateReference">

                <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="[name + ' : ' + gate.type.name/]" labelAlignment="LEFT" resizeKind="NSEW">

                <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="[gate.name + ' : ' + gate.type.name/]" labelAlignment="LEFT" resizeKind="NSEW">

                  <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

                  <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

                  <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>