Commit 30f48370 authored by Martti Käärik's avatar Martti Käärik
Browse files

Maping for non-connected GateInstances in TestConfigurations. 

Change-Id: I08ca0210d3adb10cf6d78639ab3882606ec38498
parent 14eca088

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -847,7 +847,7 @@ 
            </centerLabelStyleDescription>

            </centerLabelStyleDescription>

          </style>

          </style>

        </edgeMappings>

        </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.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">

        <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'] //@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateInstance']" 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'] //@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='testConfiguration']/@subContainerMappings[name='testConfiguration.configuration']/@subContainerMappings[name='testConfiguration.componentInstance']/@borderedNodeMappings[name='testConfiguration.gateInstance']" 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">

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

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

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

            <centerLabelStyleDescription showIcon="false" labelExpression="[name/]">

            <centerLabelStyleDescription showIcon="false" labelExpression="[name/]">
@@ -1137,6 +1137,13 @@ 
                </style>

                </style>

              </borderedNodeMappings>

              </borderedNodeMappings>

              <subNodeMappings name="testConfiguration.componentInstance.name" semanticCandidatesExpression="[self/]" domainClass="tdl.ComponentInstance">

              <subNodeMappings name="testConfiguration.componentInstance.name" semanticCandidatesExpression="[self/]" domainClass="tdl.ComponentInstance">

              <borderedNodeMappings name="testConfiguration.gateInstance" semanticCandidatesExpression="[type.gateInstance->reject(gate|owner().oclAsType(TestConfiguration).connection.endPoint.gate->includes(gate))/]" domainClass="tdl.GateInstance">

                <style xsi:type="style:SquareDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="[name + ' : ' + 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']"/>

                </style>

              </borderedNodeMappings>

                <style xsi:type="style:SquareDescription" borderSizeComputationExpression="-1" showIcon="false" labelExpression="[name + ' : ' + type.name/]" labelPosition="node" resizeKind="NSEW">

                <style xsi:type="style:SquareDescription" borderSizeComputationExpression="-1" showIcon="false" labelExpression="[name + ' : ' + type.name/]" labelPosition="node" resizeKind="NSEW">

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

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

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

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