Project

General

Profile

« Previous | Next » 

Revision 6e9bf931

Added by Katja Luther over 4 years ago

ref #8226: fix show modifier

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
240 240
                prefValue = getPreferenceStore().
241 241
                        getString(name);
242 242
            }
243
            if (StringUtils.isBlank(prefValue)){
244
                IPreferencePredicate pred = PreferencePredicate.getByKey(name);
245
                if (pred != null){
246
                    if (pred.getDefaultValue() instanceof String){
247
                        return (String)pred.getDefaultValue();
248
                    }else if (pred.getDefaultValue() != null){
249
                        return pred.getDefaultValue().toString();
250
                    }
251
                }
252
                return null;
253
            }
254

  
243 255
       }else if (pref != null){
244 256
           if (pref.getValue() == null){
245 257
               Object result = PreferencePredicate.getByKey(pref.getPredicate()).getDefaultValue();
......
308 320
            if (getPreferenceStore().contains(dbSpecific)){
309 321
                result = getPreferenceStore().getInt(dbSpecific);
310 322
            }else{
311
                result =  getPreferenceStore().
312
                        getInt(name);
323
                if (result == null){
324
                    IPreferencePredicate pred = PreferencePredicate.getByKey(name);
325
                    if (pred != null){
326
                        if (pred.getDefaultValue() instanceof Integer){
327
                            return (Integer)pred.getDefaultValue();
328
                        }else if (pred.getDefaultValue() != null){
329
                            return Integer.valueOf(pred.getDefaultValue().toString());
330
                        }
331
                    }
332
                    return 0;
333
                }
313 334
            }
314 335
        }
315 336
        return result;
......
338 359
                if (getPreferenceStore().contains(dbSpecific)){
339 360
                    return getPreferenceStore().getBoolean(dbSpecific);
340 361
                }else{
362
                    IPreferencePredicate pred = PreferencePredicate.getByKey(name);
363
                    if (pred != null){
364
                        if (pred.getDefaultValue() instanceof Boolean){
365
                            return (Boolean)pred.getDefaultValue();
366
                        }else if (pred.getDefaultValue() != null){
367
                            return Boolean.valueOf(pred.getDefaultValue().toString());
368
                        }
369
                    }
341 370
                    return null;
342 371
                }
343 372
             }else{
......
414 443
            if (getPreferenceStore().contains(dbSpecific)){
415 444
                result = getPreferenceStore().getFloat(dbSpecific);
416 445
            }else{
417
                result =  getPreferenceStore().
418
                        getFloat(name);
446
                IPreferencePredicate pred = PreferencePredicate.getByKey(name);
447
                if (pred != null){
448
                    if (pred.getDefaultValue() instanceof Float){
449
                        return (float)pred.getDefaultValue();
450
                    }else if (pred.getDefaultValue() != null){
451
                        return Float.valueOf(pred.getDefaultValue().toString());
452
                    }
453
                }
454
                return 0;
419 455
            }
420 456
        }
421 457
        return result;
......
947 983
        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.SearchForIdentifierAndTitleCache.getKey())), false);
948 984
        getPreferenceStore().setDefault(createPreferenceString(PreferencePredicate.SearchForIdentifierAsDefault.getKey()), Boolean.valueOf(PreferencePredicate.SearchForIdentifierAsDefault.getDefaultValue().toString()));
949 985
        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.SearchForIdentifierAsDefault.getKey())), false);
986
        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.ShowModifierFreeText.getKey())), false);
987
        getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.ShowModifier.getKey())), false);
950 988

  
951 989
    }
952 990

  

Also available in: Unified diff