diff options
| author | Aurelien Didier | 2021-12-06 12:25:02 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2021-12-07 10:06:07 +0000 |
| commit | 9c51e6deb3a2c3fdfa393ce8a02f2053d469a25f (patch) | |
| tree | 18d7609c0f8c3cf3f8031cc29d9648ed7b47259b | |
| parent | 5dc804133ec38df01129b7130bd6311675f6825c (diff) | |
| download | org.eclipse.papyrus-9c51e6deb3a2c3fdfa393ce8a02f2053d469a25f.tar.gz org.eclipse.papyrus-9c51e6deb3a2c3fdfa393ce8a02f2053d469a25f.tar.xz org.eclipse.papyrus-9c51e6deb3a2c3fdfa393ce8a02f2053d469a25f.zip | |
Correct deletion of sequence diagram element.
Change-Id: Ie26ff428ede92d21dc5cd89a8c3b99bf741cfa9e
Signed-off-by: Aurelien Didier <aurelien.didier51@gmail.com>
2 files changed, 9 insertions, 10 deletions
diff --git a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign index cdd1f3b99bd..04f29ae4601 100644 --- a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign +++ b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign @@ -264,10 +264,9 @@ <containerView name="containerView"/> <initialOperation> <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self"> - <subModelOperations xsi:type="tool_1:If" conditionExpression="service:element.isNotReply"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> - <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="service:delete"/> - </subModelOperations> + <subModelOperations xsi:type="tool_1:If" conditionExpression="service:element.isNotReply"/> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:element"> + <subModelOperations xsi:type="tool_1:ChangeContext" browseExpression="service:delete"/> </subModelOperations> </firstModelOperations> </initialOperation> diff --git a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/src/org/eclipse/papyrus/uml/sirius/sequence/diagram/services/MessageService.java b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/src/org/eclipse/papyrus/uml/sirius/sequence/diagram/services/MessageService.java index 9a9613b197e..b73b363429f 100644 --- a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/src/org/eclipse/papyrus/uml/sirius/sequence/diagram/services/MessageService.java +++ b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/src/org/eclipse/papyrus/uml/sirius/sequence/diagram/services/MessageService.java @@ -1060,12 +1060,12 @@ public class MessageService { .getReceiveEvent(); if (receiveMessage != null) { // If message is a synchronous message delete also the reply message - if (MessageSort.SYNCH_CALL_LITERAL.equals(message.getMessageSort())) { - final Message reply = getReplyMessage(message); - if (reply != null) { - delete(reply); - } - } +// if (MessageSort.SYNCH_CALL_LITERAL.equals(message.getMessageSort())) { +// final Message reply = getReplyMessage(message); +// if (reply != null) { +// delete(reply); +// } +// } final BehaviorExecutionSpecification execution = ExecutionService.getInstance().getExecution(receiveMessage); if (execution != null) { |