ref #7920: adaptions for changing PreferenceCache

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
index d6c309d1b2b781932a3f855b0f1d0c5911e29808..0a92c9bed3669b912f9390741342740754c9bba7 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
@@ -49,8 +49,14 @@ public class CdmPreferenceCache {
         return instance;
     }
 
-    public List<CdmPreference> get(String predicate){
-        return preferenceCache.get(predicate);
+    public CdmPreference get(String predicate){
+        if (preferenceCache.get(predicate) != null){
+            if (preferenceCache.get(predicate).size() > 1){
+                return findBestMatching(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate)));
+            }
+            return preferenceCache.get(predicate).get(0);
+        }
+        return null;
     }
 //    public Collection<CdmPreference> get(PrefKey key){
 //        if (preferenceCache.containsKey(key.getPredicate())){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 6e0e5f644bb28f4d3734b41f655de3e77cfce9a0..d67f4d931e0d7f44a01d7e548fb8e299293f1aed 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -222,31 +222,22 @@ public class PreferencesUtil implements IPreferenceKeys {
 
     private static CdmPreference getDBPreferenceValue(String name) {
         CdmPreferenceCache cache = CdmPreferenceCache.instance();
-        CdmPreference result = null;
-        List<CdmPreference> prefs = null;
+        CdmPreference pref = null;
 //
-        prefs = cache.get(name);
-        if (prefs == null ){
+        pref = cache.get(name);
+        if (pref == null ){
             //get default value for Predicate
             IPreferencePredicate pred = PreferencePredicate.getByKey(name);
             if (pred != null){
                 if (pred.getDefaultValue() != null){
-                    result = CdmPreference.NewTaxEditorInstance(pred, pred.getDefaultValue().toString());
+                    pref = CdmPreference.NewTaxEditorInstance(pred, pred.getDefaultValue().toString());
                 }else{
-                    result = CdmPreference.NewTaxEditorInstance(pred, null);
+                    pref = CdmPreference.NewTaxEditorInstance(pred, null);
                 }
-                result.setAllowOverride(true);
-            }
-        }else{
-            if (prefs.size() == 1){
-                result = prefs.get(0);
-            }else{
-                PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(name));
-                result = cache.findBestMatching(key);
-
+                pref.setAllowOverride(true);
             }
         }
-        return result;
+        return pref;
     }
 
     /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java
index a46cc30f49c0456a0493e4fa2e2eedf46ad075d4..89c20963393b3417d7f851717d3dfa519798861a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java
@@ -9,9 +9,7 @@
 package eu.etaxonomy.taxeditor.preference.wizard;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang.StringUtils;
@@ -29,7 +27,6 @@ import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
@@ -43,7 +40,6 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
-import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
@@ -267,20 +263,7 @@ public class AvailableDistributionPerAreaStatusPage extends AvailableDistributio
         }
     }
 
-    @Override
-    public ICdmEntitySession getCdmEntitySession() {
-        return null;
-    }
 
-    @Override
-    public <T extends CdmBase> Collection<T> getRootEntities() {
-        return null;
-    }
-
-    @Override
-    public Map<Object, List<String>> getPropertyPathsMap() {
-        return null;
-    }
 
     @Override
     protected  List<TermVocabularyDto> getVocabulariesFromPreference(){