[444759] Fix NPE for Oblique routing style

Fix problem detected in
https://bugs.eclipse.org/bugs/show_bug.cgi?id=444759#c3

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

1 files changed, 7 insertions, 2 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 82cbf88c16..20a6178ea8 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
@@ -103,12 +103,17 @@ public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
         lineStyleCombo.add(DiagramUIMessages.ConnectionsPreferencePage_ConnectionView_Rectilinear_text);
         // Add the Tree value not managed by default by GMF in this preference
         // page.
-        lineStyleCombo.add("Tree");
+        lineStyleCombo.add(Routing.TREE_LITERAL.getLiteral());
         // Listen changes of combo to change GMF preference value used for
         // creation feedback.
         lineStyleCombo.addSelectionListener(new SelectionAdapter() {
             public void widgetSelected(SelectionEvent evt) {
-                getPreferenceStore().setValue(IPreferenceConstants.PREF_LINE_STYLE, Routing.get(((Combo) evt.getSource()).getText()).getValue());
+                String comboValue = ((Combo) evt.getSource()).getText();
+                if (DiagramUIMessages.ConnectionsPreferencePage_ConnectionView_Manual_text.equals(comboValue)) {
+                    // Adapt Oblique value to Manual value
+                    comboValue = Routing.MANUAL_LITERAL.getLiteral();
+                }
+                getPreferenceStore().setValue(IPreferenceConstants.PREF_LINE_STYLE, Routing.get(comboValue).getValue());
             }
         });
     }