fixed Bug 442161: wrong snap for "Г"-like routing

Change-Id: Icb2e1938decfdd9533666d4cda081568e1d367ab
Signed-off-by: mgolubev <golubev@montages.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/linklf/router/SnapToGridRectilinearRouter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/linklf/router/SnapToGridRectilinearRouter.java
index bfb8b3c21fc..0857376a0cd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/linklf/router/SnapToGridRectilinearRouter.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/linklf/router/SnapToGridRectilinearRouter.java
@@ -15,9 +15,14 @@ import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.OrthogonalRouterUtilit
 import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.RectilinearRouter;
 import org.eclipse.papyrus.infra.gmfdiag.common.linklf.DiagramGridSpec;
 
+@SuppressWarnings("restriction")
 public class SnapToGridRectilinearRouter extends RectilinearRouter2 {
 
 	private DiagramGridSpec myGridSpec;
+	
+	public SnapToGridRectilinearRouter() {
+		super();
+	}
 
 	public void setEditPartViewer(EditPartViewer viewer) {
 		if (myGridSpec != null && myGridSpec.getViewer() == viewer) {
@@ -148,6 +153,11 @@ public class SnapToGridRectilinearRouter extends RectilinearRouter2 {
 
 	public static void insertPointsProducingNotAlignedRectilinearSegments(PointList line, int sourceAnchorRelativeLocation, int targetAnchorRelativeLocation, SnapToGrid snapper) {
 		insertPointsProducingNotAlignedRectilinearSegments(line, sourceAnchorRelativeLocation, targetAnchorRelativeLocation);
+		if (asVerticalOrHorizontal(sourceAnchorRelativeLocation) != asVerticalOrHorizontal(targetAnchorRelativeLocation)) {
+			//for "|_"-like routing we don't need snapping, the added bendpoint is determined fully by anchors
+			return;
+		}
+		// so we are in "_|~"-like routing
 		if (snapper != null) {
 			PrecisionPoint addedForSource = new PrecisionPoint(line.getPoint(1));
 			PrecisionPoint snappedForSource = addedForSource.getPreciseCopy();