Revision b1b7be74
Added by Katja Luther almost 5 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java | ||
|---|---|---|
| 49 | 49 |
return instance; |
| 50 | 50 |
} |
| 51 | 51 |
|
| 52 |
public List<CdmPreference> get(String predicate){
|
|
| 53 |
return preferenceCache.get(predicate); |
|
| 52 |
public CdmPreference get(String predicate){
|
|
| 53 |
if (preferenceCache.get(predicate) != null){
|
|
| 54 |
if (preferenceCache.get(predicate).size() > 1){
|
|
| 55 |
return findBestMatching(CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(predicate))); |
|
| 56 |
} |
|
| 57 |
return preferenceCache.get(predicate).get(0); |
|
| 58 |
} |
|
| 59 |
return null; |
|
| 54 | 60 |
} |
| 55 | 61 |
// public Collection<CdmPreference> get(PrefKey key){
|
| 56 | 62 |
// if (preferenceCache.containsKey(key.getPredicate())){
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java | ||
|---|---|---|
| 222 | 222 |
|
| 223 | 223 |
private static CdmPreference getDBPreferenceValue(String name) {
|
| 224 | 224 |
CdmPreferenceCache cache = CdmPreferenceCache.instance(); |
| 225 |
CdmPreference result = null; |
|
| 226 |
List<CdmPreference> prefs = null; |
|
| 225 |
CdmPreference pref = null; |
|
| 227 | 226 |
// |
| 228 |
prefs = cache.get(name);
|
|
| 229 |
if (prefs == null ){
|
|
| 227 |
pref = cache.get(name); |
|
| 228 |
if (pref == null ){
|
|
| 230 | 229 |
//get default value for Predicate |
| 231 | 230 |
IPreferencePredicate pred = PreferencePredicate.getByKey(name); |
| 232 | 231 |
if (pred != null){
|
| 233 | 232 |
if (pred.getDefaultValue() != null){
|
| 234 |
result = CdmPreference.NewTaxEditorInstance(pred, pred.getDefaultValue().toString());
|
|
| 233 |
pref = CdmPreference.NewTaxEditorInstance(pred, pred.getDefaultValue().toString());
|
|
| 235 | 234 |
}else{
|
| 236 |
result = CdmPreference.NewTaxEditorInstance(pred, null);
|
|
| 235 |
pref = CdmPreference.NewTaxEditorInstance(pred, null);
|
|
| 237 | 236 |
} |
| 238 |
result.setAllowOverride(true); |
|
| 239 |
} |
|
| 240 |
}else{
|
|
| 241 |
if (prefs.size() == 1){
|
|
| 242 |
result = prefs.get(0); |
|
| 243 |
}else{
|
|
| 244 |
PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.getByKey(name)); |
|
| 245 |
result = cache.findBestMatching(key); |
|
| 246 |
|
|
| 237 |
pref.setAllowOverride(true); |
|
| 247 | 238 |
} |
| 248 | 239 |
} |
| 249 |
return result;
|
|
| 240 |
return pref;
|
|
| 250 | 241 |
} |
| 251 | 242 |
|
| 252 | 243 |
/** |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionPerAreaStatusPage.java | ||
|---|---|---|
| 9 | 9 |
package eu.etaxonomy.taxeditor.preference.wizard; |
| 10 | 10 |
|
| 11 | 11 |
import java.util.ArrayList; |
| 12 |
import java.util.Collection; |
|
| 13 | 12 |
import java.util.List; |
| 14 |
import java.util.Map; |
|
| 15 | 13 |
import java.util.UUID; |
| 16 | 14 |
|
| 17 | 15 |
import org.apache.commons.lang.StringUtils; |
| ... | ... | |
| 29 | 27 |
|
| 30 | 28 |
import eu.etaxonomy.cdm.api.service.ITermService; |
| 31 | 29 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 32 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
|
| 33 | 30 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
| 34 | 31 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference; |
| 35 | 32 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey; |
| ... | ... | |
| 43 | 40 |
import eu.etaxonomy.taxeditor.model.ImageResources; |
| 44 | 41 |
import eu.etaxonomy.taxeditor.preference.PreferencesUtil; |
| 45 | 42 |
import eu.etaxonomy.taxeditor.preference.Resources; |
| 46 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySession; |
|
| 47 | 43 |
import eu.etaxonomy.taxeditor.store.CdmStore; |
| 48 | 44 |
import eu.etaxonomy.taxeditor.store.StoreUtil; |
| 49 | 45 |
import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory; |
| ... | ... | |
| 267 | 263 |
} |
| 268 | 264 |
} |
| 269 | 265 |
|
| 270 |
@Override |
|
| 271 |
public ICdmEntitySession getCdmEntitySession() {
|
|
| 272 |
return null; |
|
| 273 |
} |
|
| 274 | 266 |
|
| 275 |
@Override |
|
| 276 |
public <T extends CdmBase> Collection<T> getRootEntities() {
|
|
| 277 |
return null; |
|
| 278 |
} |
|
| 279 |
|
|
| 280 |
@Override |
|
| 281 |
public Map<Object, List<String>> getPropertyPathsMap() {
|
|
| 282 |
return null; |
|
| 283 |
} |
|
| 284 | 267 |
|
| 285 | 268 |
@Override |
| 286 | 269 |
protected List<TermVocabularyDto> getVocabulariesFromPreference(){
|
Also available in: Unified diff
ref #7920: adaptions for changing PreferenceCache