Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-12-08 17:46:34 +0000
committerGerrit Code Review @ Eclipse.org2014-12-08 17:46:34 +0000
commitc3f8ad6ffa3cdc7a6c5a6d16b9f299c5ab8ecbb5 (patch)
tree7689e5b92e255695447d3ffe5c3366a750219a01 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence
parentf3f88b94c1cb7fa922dad7beb64113c599336210 (diff)
parent3af54b54fa8fae086c4ecc036b951f1a92315d39 (diff)
downloadorg.eclipse.papyrus-c3f8ad6ffa3cdc7a6c5a6d16b9f299c5ab8ecbb5.tar.gz
org.eclipse.papyrus-c3f8ad6ffa3cdc7a6c5a6d16b9f299c5ab8ecbb5.tar.xz
org.eclipse.papyrus-c3f8ad6ffa3cdc7a6c5a6d16b9f299c5ab8ecbb5.zip
Merge "Bug 451320 - [Sequence Diagram] Creation of message when it starts/ends at the execution specification leads to incorrect execution of 'undo' command"
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence')
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java
index 89261bad068..8a03aae6d43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/OccurrenceSpecificationHelper.java
@@ -104,6 +104,10 @@ public class OccurrenceSpecificationHelper {
execution.setFinish(newEnd);
}
if (canBeRemoved(oldEnd, newEnd, isStart)) {
+ // "coveredBy" is bidirectional so must be cleaned prior to deletion of element itself
+ // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=451320
+ oldEnd.getCovereds().clear();
+
EcoreUtil.remove(oldEnd);
}
return true;

Back to the top