diff options
| author | Vincent Lorenzo | 2014-05-26 16:38:38 +0000 |
|---|---|---|
| committer | Vincent Lorenzo | 2014-05-26 16:38:38 +0000 |
| commit | b2a2e7cb88a37d7a87cb1ce6bf5bb9baff4afaf9 (patch) | |
| tree | e504aa8d80416a82a3aaaa88b1987722ba51a02d | |
| parent | 320780ef506f4b368a28e83fbef9a8df6fade590 (diff) | |
| download | org.eclipse.papyrus-b2a2e7cb88a37d7a87cb1ce6bf5bb9baff4afaf9.tar.gz org.eclipse.papyrus-b2a2e7cb88a37d7a87cb1ce6bf5bb9baff4afaf9.tar.xz org.eclipse.papyrus-b2a2e7cb88a37d7a87cb1ce6bf5bb9baff4afaf9.zip | |
https://bugs.eclipse.org/bugs/show_bug.cgi?id=435032 feedback for retarget is always OK
2 files changed, 1 insertions, 5 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java index c76ff3e5688..357a107e32f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java @@ -40,7 +40,6 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer; import org.eclipse.gmf.runtime.draw2d.ui.figures.IAnchorableFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
import org.eclipse.papyrus.infra.gmfdiag.common.helper.CustomFeedbackHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.FigureWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusConnectionEndpointHandle;
import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
import org.eclipse.papyrus.infra.gmfdiag.common.utils.Util;
@@ -231,8 +230,6 @@ public class PapyrusConnectionEndEditPolicy extends ConnectionEndpointEditPolicy // PointList newPoints = initialPoints.getCopy();
PointList newPoints = getInitialPointList(request);
IFigure parent = getConnection().getParent();
- IFigure figureWrapper = new FigureWrapper(parent);
- dummyConnection.setParent(figureWrapper);
final Layer layer = DiagramEditPartsUtil.getDiagramFeedbackLayer(node);
dummyConnection.setParent(layer);
dummyConnection.setPoints(newPoints);//required?
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/routers/RectilinearGridRouter.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/routers/RectilinearGridRouter.java index 2ebe4902b0c..f589df6bb4e 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/routers/RectilinearGridRouter.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/routers/RectilinearGridRouter.java @@ -20,7 +20,6 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.PointList;
import org.eclipse.gef.EditPart;
import org.eclipse.gmf.runtime.draw2d.ui.internal.routers.RectilinearRouter;
-import org.eclipse.papyrus.infra.gmfdiag.common.helper.FigureWrapper;
import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;
/**
@@ -177,7 +176,7 @@ public class RectilinearGridRouter extends RectilinearRouter { protected void resetEndPointsToEdge(final Connection conn, final PointList newLine) {
final IFigure connectionParent = conn.getParent();
super.resetEndPointsToEdge(conn, newLine);
- if(connectionParent == null || connectionParent instanceof FigureWrapper || !(connectionParent instanceof ConnectionLayer) && connectionParent instanceof FreeformLayer) {
+ if(connectionParent == null || !(connectionParent instanceof ConnectionLayer) && connectionParent instanceof FreeformLayer) {
if(DiagramEditPartsUtil.isSnapToGridActive(this.anEditPart)) {
System.out.println("grid router////////////////////////////////////////////////////////:");
super.resetEndPointsToEdge(conn, newLine);
|