[444759] Fix jump links status problem

If you enable the "specific default values" in connections preference
page and set it to "Rectilinear", all edges, created after that, have
the jump links set to "Above" instead of "None".

And also fix an activation problem at opening when the checkbox is checked (the combo is gray). This problem is here since the commit 9057209.

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

2 files changed, 4 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramConnectionsPreferencePage.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramConnectionsPreferencePage.java
index 5236ee6b22..82cbf88c16 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramConnectionsPreferencePage.java
@@ -111,8 +111,6 @@ public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
                 getPreferenceStore().setValue(IPreferenceConstants.PREF_LINE_STYLE, Routing.get(((Combo) evt.getSource()).getText()).getValue());
             }
         });
-        // Set the initial state of the lineStyle field
-        enableLineStyleField(getPreferenceStore().getBoolean(SiriusDiagramCorePreferences.PREF_ENABLE_OVERRIDE));
     }
 
     /**
@@ -128,6 +126,9 @@ public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
         enableOverrideFieldEditor.load();
         lineStyleFieldEditor.setPreferenceStore(diagramCorePreferenceStore);
         lineStyleFieldEditor.load();
+
+        // Set the initial state of the lineStyle field
+        enableLineStyleField(diagramCorePreferenceStore.getBoolean(SiriusDiagramCorePreferences.PREF_ENABLE_OVERRIDE));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DEdgeViewFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DEdgeViewFactory.java
index 68dbe86e19..e399da8617 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DEdgeViewFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DEdgeViewFactory.java
@@ -82,7 +82,7 @@ public class DEdgeViewFactory extends AbstractDesignerEdgeFactory {
         // changing default routing style to manhattan
         final RoutingStyle rstyle = (RoutingStyle) view.getStyle(NotationPackage.eINSTANCE.getRoutingStyle());
         rstyle.setJumpLinkType(JumpLinkType.get(JumpLinkType.SEMICIRCLE));
-        rstyle.setJumpLinkStatus(JumpLinkStatus.get(JumpLinkStatus.ABOVE));
+        rstyle.setJumpLinkStatus(JumpLinkStatus.get(JumpLinkStatus.NONE));
         rstyle.setRouting(Routing.RECTILINEAR_LITERAL);
     }