From acb4504aa345035a674fbd60f35f75589574aadd Mon Sep 17 00:00:00 2001 From: Benoit Maggi Date: Wed, 25 Jan 2017 11:35:10 +0100 Subject: Bug 510761 - [Facet] Allow preferences for default loaded facet - use the preference only if set Change-Id: I7fd1d833717eb9649181c3985ffb8d92fedae3cc Signed-off-by: Benoit Maggi --- .../src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java index 61f41071666..bf840cc41aa 100644 --- a/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java +++ b/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java @@ -160,9 +160,10 @@ public class Activator extends AbstractUIPlugin { IDialogSettings settings = Activator.getDefault().getDialogSettings().getSection(CUSTOMIZATION_MANAGER_SECTION); if (settings == null) { settings = Activator.getDefault().getDialogSettings().addNewSection(CUSTOMIZATION_MANAGER_SECTION); - IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore(); - String string = preferenceStore.getString(DEFAULT_LOADED_FACET); - settings.put(LOADED_FACET_ORDER, string.split(SEPARATOR_DEFAULT_LOADED_FACET)); + String loadedFacetPreferences = Activator.getDefault().getPreferenceStore().getString(DEFAULT_LOADED_FACET); + if (loadedFacetPreferences != null && !"".equals(loadedFacetPreferences)) { + settings.put(LOADED_FACET_ORDER, loadedFacetPreferences.split(SEPARATOR_DEFAULT_LOADED_FACET)); + } } return settings; } -- cgit v1.2.3