Commit 524b0564 authored by Martti Käärik's avatar Martti Käärik
Browse files

Creation tools for Assignment and Assertion. 

Change-Id: I74416f30ea6d83b3938c182f5a14835cf7344cdf
parent e89f389d

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

+30 −0
Original line number Original line Diff line number Diff line
@@ -582,6 +582,21 @@ 
            <startingEndPredecessor name="startingEndPredecessor"/>

            <startingEndPredecessor name="startingEndPredecessor"/>

            <finishingEndPredecessor name="finishingEndPredecessor"/>

            <finishingEndPredecessor name="finishingEndPredecessor"/>

          </ownedTools>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createAsignment" label="Assignment" candidatesExpression="[getVariables()/]">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

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

                <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="createTimerStartAction" id="org.etsi.mts.tdl.graphical.viewpoint.createAction">

                  <parameters name="startingEndPredecessor" value="[container/]"/>

                  <parameters name="diagramElement" value="[containerView/]"/>

                  <parameters name="element" value="[element/]"/>

                  <parameters name="class" value="Assignment"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createBreak" label="Break" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']">

          <ownedTools xsi:type="tool:InteractionUseCreationTool" name="createBreak" label="Break" containerMappings="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@containerMappings[name='globalAction']">

            <variable name="variable"/>

            <variable name="variable"/>

            <viewVariable name="viewVariable"/>

            <viewVariable name="viewVariable"/>
@@ -629,6 +644,21 @@ 
              </firstModelOperations>

              </firstModelOperations>

            </initialOperation>

            </initialOperation>

          </ownedTools>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createAssertion" label="Assertion" candidatesExpression="[getVerdicts()/]">

            <element name="element"/>

            <containerView name="containerView"/>

            <container name="container"/>

            <initialOperation>

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

                <subModelOperations xsi:type="tool_1:ExternalJavaAction" name="createMessageAction" id="org.etsi.mts.tdl.graphical.viewpoint.createAction">

                  <parameters name="startingEndPredecessor" value="[container/]"/>

                  <parameters name="diagramElement" value="[containerView/]"/>

                  <parameters name="element" value="[element/]"/>

                  <parameters name="class" value="Assertion"/>

                </subModelOperations>

              </firstModelOperations>

            </initialOperation>

          </ownedTools>

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createTestDescriptionReference" label="Test Description Reference" candidatesExpression="[getTestDescriptions()/]">

          <ownedTools xsi:type="tool_1:SelectionWizardDescription" name="createTestDescriptionReference" label="Test Description Reference" candidatesExpression="[getTestDescriptions()/]">

            <element name="element"/>

            <element name="element"/>

            <containerView name="containerView"/>

            <containerView name="containerView"/>

plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/sirius/actions/CreateAction.java

+20 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,19 @@ public class CreateAction implements IExternalJavaAction { 
			BehaviourModifications.addBlock(endPredecessor, (MultipleCombinedBehaviour) target);

			BehaviourModifications.addBlock(endPredecessor, (MultipleCombinedBehaviour) target);

			return;

			return;

			

			

		case tdlPackage.ASSIGNMENT:

			for (ComponentInstance c: new ModelHelper().getTestDescription(endPredecessor).getTestConfiguration().getComponentInstance()) {

				if (c.getType().getVariable().contains(element)) {

					behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);

					VariableUse assignmentVarUse = tdlFactory.eINSTANCE.createVariableUse();

					assignmentVarUse.setVariable((Variable) element);

					((Assignment)behaviour).setVariable(assignmentVarUse);

					((Assignment)behaviour).setComponentInstance(c);

					break;

				}

			}

			break;

			

		case tdlPackage.BREAK:

		case tdlPackage.BREAK:

		case tdlPackage.STOP:

		case tdlPackage.STOP:

			behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);

			behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);
@@ -106,6 +119,13 @@ public class CreateAction implements IExternalJavaAction { 
			}

			}

			break;

			break;

			

			

		case tdlPackage.ASSERTION:

			behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);

			DataInstanceUse assertionDataUse = tdlFactory.eINSTANCE.createDataInstanceUse();

			assertionDataUse.setDataInstance((DataInstance) element);

			((Assertion)behaviour).setOtherwise(assertionDataUse);

			break;

			

		case tdlPackage.VERDICT_ASSIGNMENT:

		case tdlPackage.VERDICT_ASSIGNMENT:

			behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);

			behaviour = (Behaviour) EcoreUtil.create((EClass) eClass);

			DataInstanceUse verdictDataUse = tdlFactory.eINSTANCE.createDataInstanceUse();

			DataInstanceUse verdictDataUse = tdlFactory.eINSTANCE.createDataInstanceUse();