Commit 3087283b authored by Martti Käärik's avatar Martti Käärik
Browse files

Fix: time labels/constraints attachable to Targets (Interactions) as well. 

Change-Id: Iccac844e4af511780b44ddbe68376677a1f6e259
parent c1f6cc33

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -553,7 +553,7 @@ 
              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="[self/]">

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

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

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

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

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

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

                  <parameters name="target" value="[variable/]"/>

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

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

                </subModelOperations>

                </subModelOperations>

              </firstModelOperations>

              </firstModelOperations>
@@ -786,25 +786,25 @@ 
            <finishingEndPredecessor name="finishingEndPredecessor"/>

            <finishingEndPredecessor name="finishingEndPredecessor"/>

            <coveredLifelines name="coveredLifelines"/>

            <coveredLifelines name="coveredLifelines"/>

          </ownedTools>

          </ownedTools>

          <ownedTools xsi:type="tool_1:ToolDescription" name="createTimeLabel" label="Time Label" precondition="[oclIsKindOf(AtomicBehaviour)/]">

          <ownedTools xsi:type="tool_1:ToolDescription" name="createTimeLabel" label="Time Label" precondition="[oclIsKindOf(AtomicBehaviour) or oclIsKindOf(Target)/]">

            <element name="element"/>

            <element name="element"/>

            <elementView name="elementView"/>

            <elementView name="elementView"/>

            <initialOperation>

            <initialOperation>

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

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

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

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

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

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

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

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

                </subModelOperations>

                </subModelOperations>

              </firstModelOperations>

              </firstModelOperations>

            </initialOperation>

            </initialOperation>

          </ownedTools>

          </ownedTools>

          <ownedTools xsi:type="tool_1:ToolDescription" name="createTimeConstraint" label="Time Constraint" precondition="[oclIsKindOf(AtomicBehaviour)/]">

          <ownedTools xsi:type="tool_1:ToolDescription" name="createTimeConstraint" label="Time Constraint" precondition="[oclIsKindOf(AtomicBehaviour) or oclIsKindOf(Target)/]">

            <element name="element"/>

            <element name="element"/>

            <elementView name="elementView"/>

            <elementView name="elementView"/>

            <initialOperation>

            <initialOperation>

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

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

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

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

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

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

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

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

                </subModelOperations>

                </subModelOperations>

              </firstModelOperations>

              </firstModelOperations>

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -150,11 +150,15 @@ public class CreateAction implements IExternalJavaAction { 




		case tdlPackage.TIME_LABEL:

		case tdlPackage.TIME_LABEL:

			TimeLabel tl = (TimeLabel) EcoreUtil.create((EClass) eClass);

			TimeLabel tl = (TimeLabel) EcoreUtil.create((EClass) eClass);

			if (element instanceof Target)

				element = element.eContainer();

			((AtomicBehaviour)element).setTimeLabel(tl);

			((AtomicBehaviour)element).setTimeLabel(tl);

			return;

			return;

			

			

		case tdlPackage.TIME_CONSTRAINT:

		case tdlPackage.TIME_CONSTRAINT:

			TimeConstraint tc = (TimeConstraint) EcoreUtil.create((EClass) eClass);

			TimeConstraint tc = (TimeConstraint) EcoreUtil.create((EClass) eClass);

			if (element instanceof Target)

				element = element.eContainer();

			((AtomicBehaviour)element).getTimeConstraint().add(tc);

			((AtomicBehaviour)element).getTimeConstraint().add(tc);

			return;

			return;