From 0a118dc921494e5901956ebae12408bd20fba102 Mon Sep 17 00:00:00 2001 From: Nicolas FAUVERGUE Date: Fri, 14 Sep 2018 15:54:45 +0200 Subject: Bug 514126 - [ActivityDiagram][ActivityParameterNode] It should be possible to put this node on the top of the activity Change-Id: Ic636d93765acddf0e6d47ca5b42010391f65e550 Signed-off-by: Pauline DEVILLE Signed-off-by: Nicolas FAUVERGUE --- .../ActivityParameterNodePositionLocator.java | 25 ---------------------- 1 file changed, 25 deletions(-) (limited to 'plugins') diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java index df4299cecab..d26990f91b6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/locator/ActivityParameterNodePositionLocator.java @@ -20,7 +20,6 @@ import org.eclipse.draw2d.PositionConstants; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator; import org.eclipse.papyrus.uml.diagram.common.locator.AdvancedBorderItemLocator; import org.eclipse.papyrus.uml.diagram.common.locator.ISideAffixedNodeBorderItemLocator; @@ -70,30 +69,6 @@ public class ActivityParameterNodePositionLocator extends AdvancedBorderItemLoca return realLocation; } - /** - * Find the closest side when x,y is inside parent. - * - * @param proposedLocation - * @param parentBorder - * @return draw constant - */ - public static int findClosestSideOfParent(Rectangle proposedLocation, Rectangle parentBorder) { - - int side = BorderItemLocator.findClosestSideOfParent(proposedLocation, parentBorder); - - // relocate side for North - if (side == PositionConstants.NORTH) { - Point parentCenter = parentBorder.getCenter(); - Point childCenter = proposedLocation.getCenter(); - if (childCenter.x < parentCenter.x) { - return PositionConstants.WEST; - } else { - return PositionConstants.EAST; - } - } - return side; - } - /** * Ensure the suggested location actually lies on the parent boundary. The * side takes precedence. -- cgit v1.2.3