Merge "Bug 439208 - [Sequence Diagram] After using Create message, new life line position is wrong "

1 files changed, 13 insertions, 5 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
index 83ec2e7a949..c862e8dc09c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/util/LifelineHeadUtil.java
@@ -76,6 +76,9 @@ public class LifelineHeadUtil {
 					continue;

 				}

 				LifelineEditPart lifeline = (LifelineEditPart) object;

+				if (SequenceUtil.isCreateMessageEndLifeline(lifeline)) {

+					continue;

+				}

 				LifelineFigure primaryShape = lifeline.getPrimaryShape();

 				RectangleFigure figure = primaryShape.getFigureLifelineNameContainerFigure();

 				Rectangle r = figure.getBounds().getCopy();

@@ -113,12 +116,14 @@ public class LifelineHeadUtil {
 		while (parent instanceof LifelineEditPart) {

 			parent = parent.getParent();

 		}

-		List<?> childrenList = parent.getChildren();

-		for (Object object : childrenList) {

-			if (toMovedLifelines.contains(object) || !(object instanceof LifelineEditPart)) {

-				continue;

+		if (!SequenceUtil.isCreateMessageEndLifeline(lifeline)) {

+			List<?> childrenList = parent.getChildren();

+			for (Object object : childrenList) {

+				if (toMovedLifelines.contains(object) || !(object instanceof LifelineEditPart)) {

+					continue;

+				}

+				toMovedLifelines.add((LifelineEditPart) object);

 			}

-			toMovedLifelines.add((LifelineEditPart) object);

 		}

 		if (toMovedLifelines.isEmpty()) {

 			return;

@@ -218,6 +223,9 @@ public class LifelineHeadUtil {
 		}

 

 		// 4. move children of linked lifelines.

+		if (SequenceUtil.isCreateMessageEndLifeline(lifeline)) {

+			return;

+		}

 		List<LifelineEditPart> toMovedLifelines = new ArrayList<LifelineEditPart>();

 		collectLifelines(toMovedLifelines, lifeline);

 		List<ShapeNodeEditPart> children = LifelineEditPartUtil.getChildShapeNodeEditPart(lifeline);