From 068e438d2670fa5ba5c33353db392176e0eaaa5c Mon Sep 17 00:00:00 2001
From: kaarik <martti.kaarik@elvior.com>
Date: Wed, 4 Oct 2017 09:07:56 +0300
Subject: [PATCH] Need to provide virtual ends also for interactions otherwise
 reordering does't work.

Change-Id: I268e438a9fc905f7799cd087b0009d8f377e43bc
---
 .../description/TDL.odesign                                    | 2 +-
 .../etsi/mts/tdl/graphical/extensions/BehaviourProvider.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
index 522a062d..abd633cb 100644
--- a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
+++ b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
@@ -39,7 +39,7 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </nodeMappings>
-        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="interaction" semanticCandidatesExpression="[allBehaviours()/]" sourceMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@nodeMappings[name='gateReference']/@borderedNodeMappings[name='lifelineExecution']" targetMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@nodeMappings[name='gateReference']/@borderedNodeMappings[name='lifelineExecution']" targetFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.targetGate.component and ref.gate = self.targetGate.gate)/]" sourceFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.owner().oclAsType(tdl::Interaction).sourceGate.component and ref.gate = self.owner().oclAsType(tdl::Interaction).sourceGate.gate)/]" targetExpression="[self.owner()/]" domainClass="tdl.Target" useDomainElement="true" sendingEndFinderExpression="[self.owner()/]" receivingEndFinderExpression="[self.owner()/]">
+        <edgeMappings xsi:type="description_1:BasicMessageMapping" name="interaction" semanticCandidatesExpression="[allBehaviours()/]" semanticElements="[self.owner()/]" sourceMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@nodeMappings[name='gateReference']/@borderedNodeMappings[name='lifelineExecution']" targetMapping="//@ownedViewpoints[name='org.etsi.mts.tdl']/@ownedRepresentations[name='TestDescriptionDiagram']/@defaultLayer/@nodeMappings[name='gateReference']/@borderedNodeMappings[name='lifelineExecution']" targetFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.targetGate.component and ref.gate = self.targetGate.gate)/]" sourceFinderExpression="[diagram.diagramElements.target->select(e|e.oclIsKindOf(tdl::GateReference))->asSet().oclAsType(tdl::GateReference)->any(ref|ref.component = self.owner().oclAsType(tdl::Interaction).sourceGate.component and ref.gate = self.owner().oclAsType(tdl::Interaction).sourceGate.gate)/]" targetExpression="[self.owner()/]" domainClass="tdl.Target" useDomainElement="true" sendingEndFinderExpression="[self.owner()/]" receivingEndFinderExpression="[self.owner().getEnd()/]">
           <style sizeComputationExpression="2">
             <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <centerLabelStyleDescription showIcon="false" labelExpression="[ serialise(self.owner().oclAsType(tdl::Interaction).argument) /]">
diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/extensions/BehaviourProvider.java b/plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/extensions/BehaviourProvider.java
index 9ac226c3..a91398cb 100644
--- a/plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/extensions/BehaviourProvider.java
+++ b/plugins/org.etsi.mts.tdl.graphical.viewpoint/src/org/etsi/mts/tdl/graphical/extensions/BehaviourProvider.java
@@ -19,7 +19,6 @@ import org.etsi.mts.tdl.CombinedBehaviour;
 import org.etsi.mts.tdl.Connection;
 import org.etsi.mts.tdl.ExceptionalBehaviour;
 import org.etsi.mts.tdl.GateReference;
-import org.etsi.mts.tdl.Interaction;
 import org.etsi.mts.tdl.MultipleCombinedBehaviour;
 import org.etsi.mts.tdl.PeriodicBehaviour;
 import org.etsi.mts.tdl.SingleCombinedBehaviour;
@@ -98,7 +97,7 @@ public class BehaviourProvider {
 			
 		default:
 			items.add(behaviour);
-			if (behaviour instanceof AtomicBehaviour && !(behaviour instanceof Interaction))
+			if (behaviour instanceof AtomicBehaviour)
 				items.add(getEnd(behaviour));
 			break;
 		}
-- 
GitLab