fixes NPE that could occur when saving default feature trees

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
index c596580eddd1b837c9a65d8d7f47f9da43107242..5f05299e3d016dc70a7cf5b2fbeca7dea70c60ef 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
@@ -131,9 +131,18 @@ public class DefaultFeatureTreePreferenecs extends PreferencePage implements IWo
        /** {@inheritDoc} */
        @Override
        public boolean performOk() {
+               String defaultFeatureTreeForTextualDescriptionUuid = "";
+               String defaultFeatureTreeForStructuredDescriptionUuid = "";
                
-               getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_TEXT, defaultFeatureTreeForTextualDescription.getUuid().toString());
-               getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_STRUCTURE, defaultFeatureTreeForStructuredDescription.getUuid().toString());
+               if(defaultFeatureTreeForTextualDescription != null){
+                       defaultFeatureTreeForTextualDescriptionUuid = defaultFeatureTreeForTextualDescription.getUuid().toString();
+               }
+               if(defaultFeatureTreeForStructuredDescription != null){
+                       defaultFeatureTreeForStructuredDescriptionUuid = defaultFeatureTreeForStructuredDescription.getUuid().toString();
+               }
+               
+               getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_TEXT, defaultFeatureTreeForTextualDescriptionUuid);
+               getPreferenceStore().setValue(IPreferenceKeys.FEATURE_TREE_DEFAULT_STRUCTURE, defaultFeatureTreeForStructuredDescriptionUuid);
                
                return super.performOk();
        }