From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 1 Dec 2016 15:02:15 +0000 (+0100)
Subject: fix #5971 fix NPE for not existing preference
X-Git-Tag: 4.4.0^2~2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/5de2311671439dc17c91ec50e6f15a20f33aaaca

fix #5971 fix NPE for not existing preference
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
index 212cb992d..451645ae8 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java
@@ -34,18 +34,10 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  *
  * @author p.ciardelli
  * @created 16.09.2008
- * @version 1.0
  */
 public class NomenclaturalCodePreferences extends FieldEditorPreferencePage
 		implements IWorkbenchPreferencePage {
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors
-	 * ()
-	 */
 	@Override
 	protected void createFieldEditors() {
 	    PreferencesUtil.setPreferredNomenclaturalCode(null, false);
@@ -97,7 +89,7 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage
               IPreferenceService service = controller.getPreferenceService();
               PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewDatabaseInstance(), PreferencePredicate.NomenclaturalCode);
               CdmPreference pref = service.find(key);
-              getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, pref.isAllowOverride());
+              getPreferenceStore().setValue(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, pref == null? true : pref.isAllowOverride());
           }
 
 	    if (getPreferenceStore().getBoolean(IPreferenceKeys.ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
@@ -125,6 +117,4 @@ public class NomenclaturalCodePreferences extends FieldEditorPreferencePage
         return result;
     }
 
-
-
 }