Commit 9c72a826 authored by Martti Käärik's avatar Martti Käärik
Browse files

Creation tools for data elements. 

Change-Id: Iba85fb1cff5ee4066153dc1a2c6d450bef95291a
parent 9b2f2901

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

+121 −7
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ 
            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>

          </style>

        </containerMappings>

        <containerMappings name="action" preconditionExpression="[not oclIsKindOf(Function)/]" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[packagedElement/]" domainClass="tdl.Action">

        <containerMappings name="action" preconditionExpression="[not oclIsKindOf(Function)/]" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editActionBody']" semanticCandidatesExpression="[packagedElement/]" domainClass="tdl.Action">

          <subContainerMappings name="action.name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.Action" 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.Action">

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[name/]" labelPosition="node" resizeKind="NSEW">
@@ -1024,8 +1024,8 @@ 
              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>

            </style>

          </subContainerMappings>

          <subContainerMappings name="action.body" semanticCandidatesExpression="[self/]" domainClass="tdl.Action" childrenPresentation="List">

            <subNodeMappings name="Body" semanticCandidatesExpression="[self/]" domainClass="tdl.Action">

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

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

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[_body/]" 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']"/>
@@ -1479,7 +1479,7 @@ 
            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>

          </style>

        </containerMappings>

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

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

          <subContainerMappings name="function.name" labelDirectEdit="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='editName']" semanticCandidatesExpression="[self/]" domainClass="tdl.Function" 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.Function">

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[name/]" labelPosition="node" resizeKind="NSEW">
@@ -1520,7 +1520,7 @@ 
            </style>

          </subContainerMappings>

          <subContainerMappings name="function.parameter" semanticCandidatesExpression="[self/]" domainClass="tdl.Function" childrenPresentation="List">

            <subNodeMappings name="Parameter" semanticCandidatesExpression="[formalParameter/]" domainClass="tdl.FormalParameter">

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

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[self.name + ' : ' + dataType.name/]" 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']"/>
@@ -1535,8 +1535,8 @@ 
              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>

            </style>

          </subContainerMappings>

          <subContainerMappings name="function.body" semanticCandidatesExpression="[self/]" domainClass="tdl.Action" childrenPresentation="List">

            <subNodeMappings name="Body" semanticCandidatesExpression="[self/]" domainClass="tdl.Action">

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

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

              <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="[_body/]" 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']"/>
@@ -1594,6 +1594,12 @@ 
              <firstModelOperations xsi:type="tool_1:SetValue" featureName="body" valueExpression="[arg0/]"/>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_2:DirectEditLabel" name="editActionBody" inputLabelExpression="[_body/]">

            <mask mask="{0}"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:SetValue" featureName="body" valueExpression="[arg0/]"/>

            </initialOperation>

          </ownedTools>

        </toolSections>

        <toolSections name="createFoundation" label="Foundation">

          <ownedTools xsi:type="tool_2:ContainerCreationDescription" name="createPackage" label="Package" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='package']">
@@ -1787,6 +1793,114 @@ 
            </initialOperation>

          </ownedTools>

        </toolSections>

        <toolSections name="createData" label="Data">

          <ownedTools xsi:type="tool_2:ContainerCreationDescription" name="createSimpleDataType" label="Simple Data Type" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='simpleDataType']">

            <variable name="container"/>

            <viewVariable name="containerView"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="SimpleDataType" referenceName="packagedElement"/>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_2:ContainerCreationDescription" name="createStructuredDataType" label="Structured Data Type" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='structuredDataType']">

            <variable name="container"/>

            <viewVariable name="containerView"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="StructuredDataType" referenceName="packagedElement"/>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createMember" label="Member" precondition="[oclIsKindOf(StructuredDataType)/]" candidatesExpression="[getDataTypes()/]" message="Select Type for Member">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Member" referenceName="member">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['a' + element.name/]"/>

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="dataType" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createSimpleDataInstance" label="Simple Data Instance" precondition="[oclIsKindOf(Package)/]" candidatesExpression="[getSimpleDataTypes()/]" message="Select Type for Data Instance">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="SimpleDataInstance" referenceName="packagedElement">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['a' + element.name/]"/>

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="dataType" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createStructuredDataInstance" label="Structured Data Instance" precondition="[oclIsKindOf(Package)/]" candidatesExpression="[getStructuredDataTypes()/]" message="Select Type for Data Instance">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="StructuredDataInstance" referenceName="packagedElement">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['a' + element.name/]"/>

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="dataType" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createMemberAssignment" label="Member Assignment" precondition="[oclIsKindOf(StructuredDataInstance)/]" candidatesExpression="[dataType.oclAsType(StructuredDataType).member/]" message="Select Member to create Assignment for">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="MemberAssignment" referenceName="memberAssignment">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="member" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_2:ContainerCreationDescription" name="createAction" label="Action" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='GenericDiagram']/@defaultLayer/@containerMappings[name='action']">

            <variable name="container"/>

            <viewVariable name="containerView"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Action" referenceName="packagedElement">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="an action"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createFunction" label="Function" precondition="[oclIsKindOf(Package)/]" candidatesExpression="[getDataTypes()/]" message="Select return type for Function">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="Function" referenceName="packagedElement">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="a function"/>

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="returnType" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createParameter" label="Parameter" precondition="[oclIsKindOf(Action)/]" candidatesExpression="[getDataTypes()/]" message="Select Type for Parameter">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[container/]">

                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="FormalParameter" referenceName="formalParameter">

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="['p' + element.name/]"/>

                  <subModelOperations xsi:type="tool_1:SetValue" featureName="dataType" valueExpression="[element/]"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

        </toolSections>

      </defaultLayer>

    </ownedRepresentations>

    <ownedJavaExtensions qualifiedClassName="org.etsi.mts.tdl.graphical.extensions.DataUseLabelProvider"/>

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/extensions/ModelHelper.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import org.etsi.mts.tdl.Function; 
import org.etsi.mts.tdl.GateType;

import org.etsi.mts.tdl.Package;

import org.etsi.mts.tdl.SimpleDataInstance;

import org.etsi.mts.tdl.SimpleDataType;

import org.etsi.mts.tdl.StructuredDataType;

import org.etsi.mts.tdl.Target;

import org.etsi.mts.tdl.TestConfiguration;

import org.etsi.mts.tdl.TestDescription;
@@ -75,6 +77,14 @@ public class ModelHelper { 
		return (List<Action>) getOf(context, tdlPackage.eINSTANCE.getAction());

	}



	public List<SimpleDataType> getSimpleDataTypes(EObject context) {

		return (List<SimpleDataType>) getOf(context, tdlPackage.eINSTANCE.getSimpleDataType());

	}



	public List<StructuredDataType> getStructuredDataTypes(EObject context) {

		return (List<StructuredDataType>) getOf(context, tdlPackage.eINSTANCE.getStructuredDataType());

	}



	public List<DataType> getDataTypes(EObject context) {

		return (List<DataType>) getOf(context, tdlPackage.eINSTANCE.getDataType());

	}