[475817] Fix some Sirius preferences value over Eclipse restart

Preferences were not saved in the DiagramPlugin.

Bug: 475817
Change-Id: I0bf0beb41058b52accac714d0c5ed0a48d646ef2
Cherry-picked-from: 461600
Signed-off-by: Belqassim Djafer <belqassim.djafer@obeo.fr>
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

4 files changed, 24 insertions, 10 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramAppearancePreferencePage.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramAppearancePreferencePage.java
index d4ca3efe6c..1c982f5d3f 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramAppearancePreferencePage.java
@@ -59,7 +59,7 @@ public class DiagramAppearancePreferencePage extends AppearancePreferencePage {
     /**
      * Title of the group containing display header option.
      */
-    public static final String LABEL_DISPLAY_HEADER_TITLE = "Display header"; //$NON-NLS-1$/**
+    public static final String LABEL_DISPLAY_HEADER_TITLE = "Display header"; //$NON-NLS-1$ /**
 
     /**
      * Message explaining user the action of display header.
@@ -79,6 +79,7 @@ public class DiagramAppearancePreferencePage extends AppearancePreferencePage {
         setPreferenceStore(DiagramUIPlugin.getPlugin().getPreferenceStore());
     }
 
+    @Override
     protected void addFields(Composite parent) {
         Composite main = createPageLayout(parent);
         createLabelIconsGroup(main);
@@ -179,7 +180,7 @@ public class DiagramAppearancePreferencePage extends AppearancePreferencePage {
         super.initialize();
 
         // Set preference store to Diagram core plugin
-        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(new InstanceScope(), DiagramPlugin.ID);
+        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, DiagramPlugin.ID);
         displayHeader.setPreferenceStore(diagramCorePreferenceStore);
         displayHeader.load();
     }
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 20a6178ea8..bff0ff70a3 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
@@ -30,7 +30,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 
 /**
- * This preference page change the behavior of the default GMF preference page.<BR>
+ * This preference page change the behavior of the default GMF preference page.
+ * <BR>
  * The default GMF preference page has only one combo field corresponding to
  * IPreferenceConstants.PREF_LINE_STYLE. The preference is used to draw the
  * feedback during the creation of an edge and also to determine the routing of
@@ -107,6 +108,7 @@ public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
         // Listen changes of combo to change GMF preference value used for
         // creation feedback.
         lineStyleCombo.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent evt) {
                 String comboValue = ((Combo) evt.getSource()).getText();
                 if (DiagramUIMessages.ConnectionsPreferencePage_ConnectionView_Manual_text.equals(comboValue)) {
@@ -126,7 +128,7 @@ public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
         super.initialize();
 
         // Set preference store to Diagram core plugin
-        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(new InstanceScope(), DiagramPlugin.ID);
+        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, DiagramPlugin.ID);
         enableOverrideFieldEditor.setPreferenceStore(diagramCorePreferenceStore);
         enableOverrideFieldEditor.load();
         lineStyleFieldEditor.setPreferenceStore(diagramCorePreferenceStore);
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramGeneralPreferencePage.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramGeneralPreferencePage.java
index 189cad9924..56ad2c1979 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/preferences/DiagramGeneralPreferencePage.java
@@ -52,17 +52,18 @@ public class DiagramGeneralPreferencePage extends DiagramsPreferencePage {
     protected void createFieldEditors() {
         super.createFieldEditors();
 
-        autosizeOnArrangeAll = new BooleanFieldEditor(SiriusDiagramUiInternalPreferencesKeys.PREF_AUTOSIZE_ON_ARRANGE.name(), "Auto-size containers during arrange-all action.", getFieldEditorParent());
+        autosizeOnArrangeAll = new BooleanFieldEditor(SiriusDiagramUiInternalPreferencesKeys.PREF_AUTOSIZE_ON_ARRANGE.name(), "Auto-size containers during arrange-all action.",
+                getFieldEditorParent());
         addField(autosizeOnArrangeAll);
 
-        moveUnlinkedNotesDuringLayout = new BooleanFieldEditor(SiriusDiagramPreferencesKeys.PREF_MOVE_NOTES_DURING_LATOUT.name(),
-                "Move unlinked notes during layout", getFieldEditorParent());
+        moveUnlinkedNotesDuringLayout = new BooleanFieldEditor(SiriusDiagramPreferencesKeys.PREF_MOVE_NOTES_DURING_LATOUT.name(), "Move unlinked notes during layout", getFieldEditorParent());
         addField(moveUnlinkedNotesDuringLayout);
 
         autoPinOnMove = new BooleanFieldEditor(SiriusDiagramUiInternalPreferencesKeys.PREF_AUTO_PIN_ON_MOVE.name(), "Automatically mark moved elements as pinned", getFieldEditorParent());
         addField(autoPinOnMove);
 
-        synchronizeOnDiagramCreation = new BooleanFieldEditor(SiriusDiagramInternalPreferencesKeys.PREF_SYNCHRONIZE_DIAGRAM_ON_CREATION.name(), "Synchronized mode for new diagrams", getFieldEditorParent());
+        synchronizeOnDiagramCreation = new BooleanFieldEditor(SiriusDiagramInternalPreferencesKeys.PREF_SYNCHRONIZE_DIAGRAM_ON_CREATION.name(), "Synchronized mode for new diagrams",
+                getFieldEditorParent());
         addField(synchronizeOnDiagramCreation);
 
         removeHideNoteWhenAnnotatedElementRemovedHidden = new BooleanFieldEditor(SiriusDiagramUiInternalPreferencesKeys.PREF_REMOVE_HIDE_NOTE_WHEN_ANNOTED_ELEMENT_HIDDEN_OR_REMOVE.name(),
@@ -78,7 +79,7 @@ public class DiagramGeneralPreferencePage extends DiagramsPreferencePage {
         super.initialize();
 
         // Set preference store to Diagram core plugin
-        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(new InstanceScope(), DiagramPlugin.ID);
+        IPreferenceStore diagramCorePreferenceStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, DiagramPlugin.ID);
         moveUnlinkedNotesDuringLayout.setPreferenceStore(diagramCorePreferenceStore);
         moveUnlinkedNotesDuringLayout.load();
 
@@ -94,4 +95,4 @@ public class DiagramGeneralPreferencePage extends DiagramsPreferencePage {
         preferenceStore.setDefault(SiriusDiagramUiInternalPreferencesKeys.PREF_REMOVE_HIDE_NOTE_WHEN_ANNOTED_ELEMENT_HIDDEN_OR_REMOVE.name(), true);
         preferenceStore.setDefault(SiriusDiagramUiInternalPreferencesKeys.PREF_REMOVE_HIDE_NOTE_WHEN_ANNOTED_ELEMENT_HIDDEN_OR_REMOVE.name(), true);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/DiagramPlugin.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/DiagramPlugin.java
index ead4a493ba..3374fc5651 100644
--- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/DiagramPlugin.java
+++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/DiagramPlugin.java
@@ -14,6 +14,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.osgi.framework.BundleContext;
 
 /**
  * Sirius Diagram plug-in.
@@ -151,4 +153,12 @@ public class DiagramPlugin extends Plugin {
         // CHECKSTYLE:ON
     }
 
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        try {
+            InstanceScope.INSTANCE.getNode(ID).flush();
+        } finally {
+            super.stop(context);
+        }
+    }
 }