Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Barbin2014-12-15 10:28:18 +0000
committerFlorian Barbin2014-12-15 10:44:58 +0000
commit1c72fa0bab233c87585c96f7ccce750cb64ea778 (patch)
treebd9f65f9583ab7e6eaff0703386c3c5ceed75f04
parent2c90adb386cdaf81633989ff94a3d964ab83d36b (diff)
downloadorg.eclipse.sirius-3.0.0M4.tar.gz
org.eclipse.sirius-3.0.0M4.tar.xz
org.eclipse.sirius-3.0.0M4.zip
[448739] Do not perform the edge centering during a reconnect.v3.0.0M4
That caused a NPE during the reconnect. See Comment 3: https://bugs.eclipse.org/bugs/show_bug.cgi?id=454014#c3 Bug: 448739 Change-Id: I87b9b7fddb3166fed727029a85119c4a3dacd498 Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/SiriusRectilinearRouter.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/SiriusRectilinearRouter.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/SiriusRectilinearRouter.java
index 4e8a9f7341..bd08522b8b 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/SiriusRectilinearRouter.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/SiriusRectilinearRouter.java
@@ -34,7 +34,11 @@ public class SiriusRectilinearRouter extends RectilinearRouter {
public void routeLine(Connection conn, int nestedRoutingDepth, PointList newLine) {
super.routeLine(conn, nestedRoutingDepth, newLine);
- handleEdgeCentering(conn, newLine);
+ // if the edge is currently reconnected for instance, we do not perform
+ // the centering.
+ if (!isReorienting(conn)) {
+ handleEdgeCentering(conn, newLine);
+ }
}
/**

Back to the top