ref #7849: if term selection is null the default value is used -> delete pref from db

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
index f49cfabc8174a36d302850f1ef54dc1442daa5e1..fb4e5f45008a8db07d71fb1e2a744e82334fbc9a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionStatusAdminWizard.java
@@ -99,6 +99,9 @@ public class AvailableDistributionStatusAdminWizard extends Wizard implements IC
             }
         }
         String saveCheckedElements = StringUtils.join(listUIIDChecked, ";"); //$NON-NLS-1$
+        if (StringUtils.isBlank(saveCheckedElements)){
+            saveCheckedElements = null;
+        }
         CdmPreference savePref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, saveCheckedElements);
         savePref.setAllowOverride(pref.isAllowOverride());
         PreferencesUtil.setPreferenceToDB(savePref);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
index 6aae721f46e2d1c8d242db16c5b5f129d0393069..e05080a912ae9b282d07449eea4471668a43a7a2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableVocabularyWizard.java
@@ -91,6 +91,7 @@ public class AvailableVocabularyWizard extends Wizard implements IConversationEn
             }
         }
         String saveCheckedElements = StringUtils.join(listUIIDChecked, ";"); //$NON-NLS-1$
+
         String predicate = null;
         pref = aPage.getPreferences();
         if (pref != null){
@@ -98,6 +99,9 @@ public class AvailableVocabularyWizard extends Wizard implements IConversationEn
         }
 
         if (!localPref){
+            if (StringUtils.isBlank(saveCheckedElements)){
+                saveCheckedElements = null;
+            }
             CdmPreference savePref = CdmPreference.NewInstance(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate), saveCheckedElements);
             savePref.setAllowOverride(pref.isAllowOverride());
             PreferencesUtil.setPreferenceToDB(savePref);