Project

General

Profile

« Previous | Next » 

Revision d3341b37

Added by Katja Luther almost 5 years ago

fix local preference evaluation for distr. editor status

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
27 27
import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
28 28
import eu.etaxonomy.cdm.model.term.Representation;
29 29
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
30
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
30 31
import eu.etaxonomy.taxeditor.store.CdmStore;
31 32

  
32 33
/**
......
49 50
    public List<?> getValues(int columnIndex, int rowIndex) {
50 51
        NamedArea area = editor.getAreaToColumnIndexMap().get(columnIndex);
51 52
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewInstance(PreferenceSubject.ROOT+"NamedArea["+area.getUuid().toString() + "]"+PreferenceSubject.ROOT), PreferencePredicate.AvailableDistributionStatus);
52
        CdmPreference pref = CdmPreferenceCache.instance().findBestMatching(key);
53
        CdmPreference pref = CdmPreferenceCache.instance().get(key);
54
        // if there is no preference for the area, look for the general
55
        if (pref == null){
56
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
57
        }
53 58
        if (pref == null) {
54 59
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
55 60
            //pref = PreferenceResolver.resolve(preferenceCache.get(predicate), CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));

Also available in: Unified diff