[463485] Fix regression since the snapToAll feature

* Detected with test
RefreshWithCustomizedStyleFromAppearanceTabTests.testChangeRoutingObstructionsFromAppearanceSection
for DEdgeEditPart change
* Detected in test
CenteredEdgesTest.testResizingCenteredTargetBorderNodeWithZoom125()
since changes in GraphicalFilter that uses PrecisionPoint

Bug: 463485
Change-Id: Ia56b51505178d7e97ae48d6019b1d74518b2cc2e
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

2 files changed, 5 insertions, 5 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
index 5fc158012f..4a2aa8f306 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/DEdgeEditPart.java
@@ -143,7 +143,7 @@ public class DEdgeEditPart extends AbstractDiagramEdgeEditPart {
         if (EditPolicy.CONNECTION_BENDPOINTS_ROLE.equals(key)) {
             if (editPolicy instanceof ConnectionLineSegEditPolicy) {
                 super.installEditPolicy(key, new TreeLayoutConnectionLineSegEditPolicy());
-            } else if (editPolicy.getClass().equals(ConnectionBendpointEditPolicy.class)) {
+            } else if (editPolicy != null && editPolicy.getClass().equals(ConnectionBendpointEditPolicy.class)) {
                 super.installEditPolicy(key, new SiriusConnectionBendpointEditPolicy());
             } else {
                 super.installEditPolicy(key, editPolicy);
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/CenteredEdgesTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/CenteredEdgesTest.java
index e06c118416..f7e32e326e 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/CenteredEdgesTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/CenteredEdgesTest.java
@@ -882,17 +882,17 @@ public class CenteredEdgesTest extends AbstractSiriusSwtBotGefTestCase {
         editor.click(targetPoint);
     }
 
-    private Rectangle getAbsoluteBounds(IGraphicalEditPart part) {
+    private PrecisionRectangle getAbsoluteBounds(IGraphicalEditPart part) {
         IFigure figure = part.getFigure();
         PrecisionRectangle r = new PrecisionRectangle(figure.getBounds());
         figure.getParent().translateToAbsolute(r);
         return r;
     }
 
-    private PrecisionPoint getProportionalPoint(Rectangle bounds, PrecisionPoint proportions) {
+    private PrecisionPoint getProportionalPoint(PrecisionRectangle bounds, PrecisionPoint proportions) {
         PrecisionPoint result = new PrecisionPoint(bounds.getTopLeft());
-        double xOffest = bounds.width * proportions.preciseX();
-        double yOffset = bounds.height * proportions.preciseY();
+        double xOffest = bounds.preciseWidth() * proportions.preciseX();
+        double yOffset = bounds.preciseHeight() * proportions.preciseY();
         result.translate(xOffest, yOffset);
         return result;
     }