Bug 489116: [Sequence Diagram] Update locator of Time Contraint

- Change name of TimeMarkElementPositionLocator with the OLD prefix
- In the XYLayoutEditPolicy , Time Contraint UML parent is the
Interaction instead of the Lifeline. 
- TimeMarkElementPositionLocator should not refer to the DotLine figure
anymore.

Change-Id: I8a798dcae24feb96ecad26815e6569f8a06f830c
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>

4 files changed, 15 insertions, 14 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java
index 9aa57d8fa57..624d8da8f4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/OLDLifelineEditPart.java
@@ -109,7 +109,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineSelectionE
 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDLifelineXYLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineDotLineCustomFigure;

 import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure;

-import org.eclipse.papyrus.uml.diagram.sequence.locator.TimeMarkElementPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.OLDTimeMarkElementPositionLocator;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.util.CommandHelper;

@@ -353,21 +353,21 @@ public class OLDLifelineEditPart extends LifelineEditPart {
 		// Affixed locator for Lifelines to place element with a time bar

 		if (childEditPart instanceof TimeConstraintEditPart) {

 			// update the locator with edit part reference

-			TimeMarkElementPositionLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			OLDTimeMarkElementPositionLocator locator = new OLDTimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

 			locator.setEditPart(childEditPart);

 			getBorderedFigure().getBorderItemContainer().add(((TimeConstraintEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 		if (childEditPart instanceof TimeObservationEditPart) {

 			// update the locator with edit part reference

-			TimeMarkElementPositionLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			OLDTimeMarkElementPositionLocator locator = new OLDTimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

 			locator.setEditPart(childEditPart);

 			getBorderedFigure().getBorderItemContainer().add(((TimeObservationEditPart) childEditPart).getFigure(), locator);

 			return true;

 		}

 		if (childEditPart instanceof DurationConstraintEditPart) {

 			// update the locator with edit part reference

-			TimeMarkElementPositionLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			OLDTimeMarkElementPositionLocator locator = new OLDTimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

 			locator.setEditPart(childEditPart);

 			getBorderedFigure().getBorderItemContainer().add(((DurationConstraintEditPart) childEditPart).getFigure(), locator);

 			return true;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/TimeMarkElementPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/OLDTimeMarkElementPositionLocator.java
index c1c446c3879..57ce2a52b1a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/TimeMarkElementPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/locator/OLDTimeMarkElementPositionLocator.java
@@ -54,7 +54,7 @@ import org.eclipse.uml2.uml.TimeObservation;
 /**

  * This class is used to constrain the position of a Time/Duration related object on a Lifeline.

  */

-public class TimeMarkElementPositionLocator extends AdvancedBorderItemLocator {

+public class OLDTimeMarkElementPositionLocator extends AdvancedBorderItemLocator {

 

 	/**

 	 * The edit part which figure is located.

@@ -63,17 +63,17 @@ public class TimeMarkElementPositionLocator extends AdvancedBorderItemLocator {
 	private EditPart editPart = null;

 

 	/** Constructor **/

-	public TimeMarkElementPositionLocator(IFigure parentFigure) {

+	public OLDTimeMarkElementPositionLocator(IFigure parentFigure) {

 		super(parentFigure);

 	}

 

 	/** Constructor **/

-	public TimeMarkElementPositionLocator(IFigure borderItem, IFigure parentFigure, Rectangle constraint) {

+	public OLDTimeMarkElementPositionLocator(IFigure borderItem, IFigure parentFigure, Rectangle constraint) {

 		super(borderItem, parentFigure, constraint);

 	}

 

 	/** Constructor **/

-	public TimeMarkElementPositionLocator(IFigure parentFigure, int preferredSide) {

+	public OLDTimeMarkElementPositionLocator(IFigure parentFigure, int preferredSide) {

 		super(parentFigure, preferredSide);

 	}

 

@@ -141,6 +141,7 @@ public class TimeMarkElementPositionLocator extends AdvancedBorderItemLocator {
 	 *

 	 * @return <code>Rectangle</code> that is the bounds of the parent dot line.

 	 */

+	@Deprecated

 	protected Rectangle getParentDotLineBorder() {

 		// get the dot line of the lifeline if available

 		for (Object childFig : getParentFigure().getChildren()) {

@@ -163,7 +164,7 @@ public class TimeMarkElementPositionLocator extends AdvancedBorderItemLocator {
 	@Override

 	protected Point locateOnParent(Point suggestedLocation, int suggestedSide, IFigure borderItem) {

 		int[] horizontalGap = getHorizontalGap();

-		Rectangle bounds = getParentDotLineBorder();

+		Rectangle bounds = getParentBorder();

 		int parentFigureXCenter = bounds.getCenter().x;

 		int parentFigureHeight = bounds.height;

 		int parentFigureY = bounds.y;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java
index e3c576426f6..9e8dc30c24e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/referencialgrilling/LifeLineXYLayoutEditPolicy.java
@@ -108,7 +108,7 @@ public class LifeLineXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEd
 			ViewAndElementDescriptor descriptor=(req).getViewAndElementDescriptor();
 			IElementType elementType = (IElementType) descriptor.getElementAdapter().getAdapter(IElementType.class);
 			if (ElementUtil.isTypeOf(elementType, UMLDIElementTypes.ACTION_EXECUTION_SPECIFICATION_SHAPE)||
-					ElementUtil.isTypeOf(elementType, UMLDIElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION_SHAPE)){
+					ElementUtil.isTypeOf(elementType, UMLDIElementTypes.BEHAVIOR_EXECUTION_SPECIFICATION_SHAPE) ||ElementUtil.isTypeOf(elementType, UMLDIElementTypes.TIME_CONSTRAINT_SHAPE)){
 				// get the element descriptor
 				CreateElementRequestAdapter requestAdapter =
 						req.getViewAndElementDescriptor().getCreateElementRequestAdapter();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
index f6345f3b96b..af00eb727db 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src-gen/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDLifeLineLayoutE
 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OLDLifelineXYLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.figures.LifelineFigure;

 import org.eclipse.papyrus.uml.diagram.sequence.locator.CenterLocator;

-import org.eclipse.papyrus.uml.diagram.sequence.locator.TimeMarkElementPositionLocator;

+import org.eclipse.papyrus.uml.diagram.sequence.locator.OLDTimeMarkElementPositionLocator;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.ConnectLifeLineToGrillingEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.referencialgrilling.GrillingBasedResizableShapeEditPolicy;

@@ -194,7 +194,7 @@ public class LifelineEditPart extends RoundedCompartmentEditPart {
 

 		// Papyrus Gencode :Affixed locator for Lifelines to place element with a time bar

 		if (childEditPart instanceof TimeConstraintEditPart) {

-			IBorderItemLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			IBorderItemLocator locator = new CenterLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((TimeConstraintEditPart) childEditPart).getFigure(),

 					locator);

 			return true;

@@ -202,7 +202,7 @@ public class LifelineEditPart extends RoundedCompartmentEditPart {
 

 		// Papyrus Gencode :Affixed locator for Lifelines to place element with a time bar

 		if (childEditPart instanceof TimeObservationEditPart) {

-			IBorderItemLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			IBorderItemLocator locator = new CenterLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((TimeObservationEditPart) childEditPart).getFigure(),

 					locator);

 			return true;

@@ -210,7 +210,7 @@ public class LifelineEditPart extends RoundedCompartmentEditPart {
 

 		// Papyrus Gencode :Affixed locator for Lifelines to place element with a time bar

 		if (childEditPart instanceof DurationConstraintEditPart) {

-			IBorderItemLocator locator = new TimeMarkElementPositionLocator(getMainFigure(), PositionConstants.NONE);

+			IBorderItemLocator locator = new CenterLocator(getMainFigure(), PositionConstants.NONE);

 			getBorderedFigure().getBorderItemContainer().add(((DurationConstraintEditPart) childEditPart).getFigure(),

 					locator);

 			return true;