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())){
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;
}
/**
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;
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;
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;
}
}
- @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(){