ref #7920: predicate for area specific status pref is the same as for the general...

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
index 4fbd1c8b4f126bd0c117eb083eee7af8db0287f4..67ff2fa82672d52ae5e97e76d17279141d18546c 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
@@ -49,10 +49,11 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
     @Override
     public List<?> getValues(int columnIndex, int rowIndex) {
         NamedArea area = editor.getAreaToColumnIndexMap().get(columnIndex);
     @Override
     public List<?> getValues(int columnIndex, int rowIndex) {
         NamedArea area = editor.getAreaToColumnIndexMap().get(columnIndex);

-        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewInstance("/"+PreferenceSubject.DISTR_EDITOR+"/area/"+area.getUuid().toString()), PreferencePredicate.AvailableDistributionPerAreaStatus);
+        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewInstance("/"+PreferenceSubject.DISTR_EDITOR+"/area/"+area.getUuid().toString()), PreferencePredicate.AvailableDistributionStatus);

         CdmPreference pref = CdmPreferenceCache.instance().findBestMatching(key);
         if (pref == null) {
         CdmPreference pref = CdmPreferenceCache.instance().findBestMatching(key);
         if (pref == null) {

-            pref = CdmPreferenceCache.instance().get(PreferencePredicate.AvailableDistributionStatus.getKey());
+            key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
+            pref = CdmPreferenceCache.instance().findBestMatching(key);

             if (pref == null){
                 pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
             }
             if (pref == null){
                 pref = CdmPreference.NewTaxEditorInstance(PreferencePredicate.AvailableDistributionStatus, PreferencesUtil.getStringValue(PreferencePredicate.AvailableDistributionStatus.getKey()));
             }