Project

General

Profile

« Previous | Next » 

Revision 979be737

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
55 55 
        if (pref == null){
56 56 
            pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
57 57 
        }
58 
        if (pref == null) {
59 
            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
60 
            //pref = PreferenceResolver.resolve(preferenceCache.get(predicate), CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));
61 
            pref = CdmPreferenceCache.instance().get(key);
62 
            if (pref == null){
63 
                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencePredicate.AvailableDistributionStatus.getDefaultValue() != null ? PreferencePredicate.AvailableDistributionStatus.getDefaultValue().toString(): null);
64 
            }
65 
        }
58 
//        if (pref == null) {
59 
//            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
60 
//            //pref = PreferenceResolver.resolve(preferenceCache.get(predicate), CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));
61 
//            pref = CdmPreferenceCache.instance().get(key);
62 
//            if (pref == null){
63 
//                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencePredicate.AvailableDistributionStatus.getDefaultValue() != null ? PreferencePredicate.AvailableDistributionStatus.getDefaultValue().toString(): null);
64 
//            }
65 
//        }
66 66 
        return getValues(pref);
67 67 

  		




  68
  68
  
    
    }


  		












Also available in:  Unified diff