Project

General

Profile

« Previous | Next » 

Revision 897b966d

Added by Katja Luther almost 6 years ago

minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
86 86
	protected void createControls(ICdmFormElement formElement, INonViralName nonViralName, int style) {
87 87
		Comparator<Rank> comparator = null;
88 88
		config = PreferencesUtil.setPreferredNameDetailsConfiguration(false);
89
        if ( PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.ALLOW_OVERRIDE_NAME_DETAILS)){
89
        if ( PreferencesUtil.getPreferenceStore().getBoolean(PreferencesUtil.ALLOW_OVERRIDE_NAME_DETAILS) || config == null){
90 90
            config = PreferencesUtil.setPreferredNameDetailsConfiguration(true);
91 91
        }
92 92
		if(PreferencesUtil.getSortRanksHierarchichally()){
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
20 20
import org.eclipse.ui.forms.widgets.TableWrapData;
21 21
import org.eclipse.ui.forms.widgets.TableWrapLayout;
22 22

  
23
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
23 24
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
24 25
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
25 26

  
......
66 67
        toolkit.adapt(btnBioCaseProvider, true, true);
67 68
        btnBioCaseProvider.setText("BioCASE Provider");
68 69
        txtAccessPoint = new Combo(this, SWT.BORDER);
69
        String items[] = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider).getValue().split(";");
70
        txtAccessPoint.setItems(items);
70
        CdmPreference biocaseProvider = PreferencesUtil.getPreferenceFromDB(PreferencePredicate.BioCaseProvider);
71
        if (biocaseProvider != null){
72
            String items[] = biocaseProvider.getValue().split(";");
73
            txtAccessPoint.setItems(items);
74
        }
75

  
76

  
71 77
        txtAccessPoint.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
72 78
        toolkit.adapt(txtAccessPoint, true, true);
73 79

  

Also available in: Unified diff