minor

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 94a09c0aadff1c0c125ef91ebf2c325bf8cc4340..26d1fb30ef27cf59bc2f1dcc0b0f97557b997ac3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -86,7 +86,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
        protected void createControls(ICdmFormElement formElement, INonViralName nonViralName, int style) {
                Comparator<Rank> comparator = null;
                config = PreferencesUtil.setPreferredNameDetailsConfiguration(false);
-        if ( PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.ALLOW_OVERRIDE_NAME_DETAILS)){
+        if ( PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.ALLOW_OVERRIDE_NAME_DETAILS) || config == null){
             config = PreferencesUtil.setPreferredNameDetailsConfiguration(true);
         }
                if(PreferencesUtil.getSortRanksHierarchichally()){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
index 9f1f0b3db7733d9e4a03b66fa0f6c74e8a55863f..072e903a730820543f2d9a55add64f9b8d437d31 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
@@ -20,6 +20,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
+import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
@@ -66,8 +67,13 @@ public class SpecimenProviderSelectionComposite extends Composite {
         toolkit.adapt(btnBioCaseProvider, true, true);
         btnBioCaseProvider.setText("BioCASE Provider");
         txtAccessPoint = new Combo(this, SWT.BORDER);
-        String items[] = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider).getValue().split(";");
-        txtAccessPoint.setItems(items);
+        CdmPreference biocaseProvider = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider);
+        if (biocaseProvider != null){
+            String items[] = biocaseProvider.getValue().split(";");
+            txtAccessPoint.setItems(items);
+        }
+
+
         txtAccessPoint.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
         toolkit.adapt(txtAccessPoint, true, true);