fix local preference evaluation for distr. editor status
authorKatja Luther <k.luther@bgbm.org>
Wed, 8 May 2019 10:44:35 +0000 (12:44 +0200)
committerKatja Luther <k.luther@bgbm.org>
Wed, 8 May 2019 10:45:19 +0000 (12:45 +0200)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java

index 321347e6af9253293aa5b9dbbb99dc5c9bf27c5a..77fc37aff5aed445e099cbb282f4924f48cf547e 100755 (executable)
@@ -55,14 +55,14 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
         if (pref == null){
             pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
         }
-        if (pref == null) {
-            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
-            //pref = PreferenceResolver.resolve(preferenceCache.get(predicate), CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));
-            pref = CdmPreferenceCache.instance().get(key);
-            if (pref == null){
-                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencePredicate.AvailableDistributionStatus.getDefaultValue() != null ? PreferencePredicate.AvailableDistributionStatus.getDefaultValue().toString(): null);
-            }
-        }
+//        if (pref == null) {
+//            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
+//            //pref = PreferenceResolver.resolve(preferenceCache.get(predicate), CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));
+//            pref = CdmPreferenceCache.instance().get(key);
+//            if (pref == null){
+//                pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencePredicate.AvailableDistributionStatus.getDefaultValue() != null ? PreferencePredicate.AvailableDistributionStatus.getDefaultValue().toString(): null);
+//            }
+//        }
         return getValues(pref);
 
     }