Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2017-01-25 05:35:10 -0500
committerBenoit Maggi2017-01-25 05:35:10 -0500
commitacb4504aa345035a674fbd60f35f75589574aadd (patch)
treec92a5d493ef1409c09d04f0dc2c9146928b252fc
parent98273f637af98256817506a61136afd330784b83 (diff)
downloadorg.eclipse.papyrus-acb4504aa345035a674fbd60f35f75589574aadd.tar.gz
org.eclipse.papyrus-acb4504aa345035a674fbd60f35f75589574aadd.tar.xz
org.eclipse.papyrus-acb4504aa345035a674fbd60f35f75589574aadd.zip
Bug 510761 - [Facet] Allow preferences for default loaded facet
- use the preference only if set Change-Id: I7fd1d833717eb9649181c3985ffb8d92fedae3cc Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf/src/org/eclipse/papyrus/infra/ui/internal/emf/Activator.java7
1 files 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;
}

Back to the top