Merge branch 'release/5.11.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / preference / AbcdImportPreference.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
index 8e4b8437be97ff24b45aabf5d7ba49aa19b1a439..9b69bdc9e1051d92321377fe12cda2e2d62193a0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
@@ -238,9 +238,17 @@ public class AbcdImportPreference extends CdmPreferencePage implements IE4Prefer
         Label labelRef = new Label(composite, SWT.NONE);
         labelRef.setText("Biocase provider for associated DNA");
         textDNAProviderString = new Combo(composite, SWT.BORDER);
-        CdmPreference biocaseProvider = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider);
+        String biocaseProvider = null;
+        CdmPreference pref = null;
+
+        pref = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider);
+        biocaseProvider =  pref!= null? pref.getValue():null;
+
+        if (!isAdminPreference && ((pref != null && pref.isAllowOverride()) || pref == null) ){
+            biocaseProvider = PreferencesUtil.getStringValue(PreferencePredicate.BioCaseProvider.getKey(), true);
+        }
         if (biocaseProvider != null){
-            String items[] = biocaseProvider.getValue().split(";");
+            String items[] = biocaseProvider.split(";");
             textDNAProviderString.setItems(items);
         }