Commit 070c1bdd authored by Martti Käärik's avatar Martti Käärik
Browse files

Value assignment is now a separate class. 

Change-Id: Id28320ca36961d4a4ddf9324a63e47128a2709ac
parent 6942f59e

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

+44 −4
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ 
            <centerLabelStyleDescription showIcon="false" labelExpression="[ serialise(self.owner().oclAsType(tdl::Message).argument) /]">

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

            </centerLabelStyleDescription>

            <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.variable.oclIsUndefined()) then '' else self.variable.name endif /]">

            <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.valueAssignment->any(true).oclIsUndefined()) then '' else self.valueAssignment->any(true).variable.name endif /]">

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

            </endLabelStyleDescription>

          </style>

          <conditionnalStyles predicateExpression="[self.owner().oclAsType(tdl::Interaction).target->asSequence()->indexOf(self) > 1/]">

            <style sizeComputationExpression="2">

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

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.variable.oclIsUndefined()) then '' else self.variable.name endif /]">

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.valueAssignment->any(true).oclIsUndefined()) then '' else self.valueAssignment->any(true).variable.name endif /]">

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

              </endLabelStyleDescription>

            </style>
@@ -60,7 +60,7 @@ 
          <conditionnalStyles predicateExpression="[self.owner().oclIsKindOf(tdl::Message) and self.owner().oclAsType(tdl::Message).target->asSequence()->indexOf(self) > 1 and self.owner().oclAsType(tdl::Message).isTrigger/]">

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

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

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.variable.oclIsUndefined()) then '' else self.variable.name endif /]">

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.valueAssignment->any(true).oclIsUndefined()) then '' else self.valueAssignment->any(true).variable.name endif /]">

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

              </endLabelStyleDescription>

            </style>
@@ -71,7 +71,7 @@ 
              <centerLabelStyleDescription showIcon="false" labelExpression="[ serialise(self.owner().oclAsType(tdl::Interaction).argument) /]">

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

              </centerLabelStyleDescription>

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.variable.oclIsUndefined()) then '' else self.variable.name endif /]">

              <endLabelStyleDescription showIcon="false" labelExpression="[ if (self.valueAssignment->any(true).oclIsUndefined()) then '' else self.valueAssignment->any(true).variable.name endif /]">

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

              </endLabelStyleDescription>

            </style>
@@ -1339,6 +1339,46 @@ 
            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>

          </style>

        </containerMappings>

        <containerMappings name="collectionDataType" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[packagedElement/]" domainClass="tdl.CollectionDataType">

          <subContainerMappings name="collectionDataType.name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.CollectionDataType" childrenPresentation="List">

            <subNodeMappings name="name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.CollectionDataType">

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[name/]" labelPosition="node" 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>

            </subNodeMappings>

            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="Structured Data Type">

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

              <labelFormat>bold</labelFormat>

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

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

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

            </style>

          </subContainerMappings>

          <subContainerMappings name="collectionDataType.itemType" semanticCandidatesExpression="[self/]" domainClass="tdl.CollectionDataType" childrenPresentation="List">

            <subNodeMappings name="itemType" semanticCandidatesExpression="[itemType/]" domainClass="tdl.DataType">

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="['' + if isOptional then '[ ' + self.name + ' : ' + dataType.name + ' ]' else self.name + ' : ' + dataType.name endif/]" labelAlignment="LEFT" labelPosition="node" resizeKind="NSEW">

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

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

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

              </style>

            </subNodeMappings>

            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false" labelExpression="Member" labelAlignment="LEFT">

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

              <labelFormat>bold</labelFormat>

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

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

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

            </style>

          </subContainerMappings>

          <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" showIcon="false">

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

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

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

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

          </style>

        </containerMappings>

        <containerMappings name="dataResourceMapping" semanticCandidatesExpression="[packagedElement/]" domainClass="tdl.DataResourceMapping">

          <subContainerMappings name="dataResourceMapping.name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.DataResourceMapping" childrenPresentation="List">

            <subNodeMappings name="name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.DataResourceMapping">