Project

General

Profile

« Previous | Next » 

Revision 12d75812

Added by Katja Luther over 5 years ago

ref #7849: remove OVERRIDE constants from IPreferenceKeys and handle it by method

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
110 110
	    return name + "_"+  ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
111 111
	}
112 112

  
113
	private static String prefOverrideKey(String name) {
113
	static String prefOverrideKey(String name) {
114 114
        return name + "_OVERRIDE_"+ ((CdmRemoteSource)CdmStore.getActiveCdmSource()).toString();
115 115
    }
116 116

  
......
390 390
    			} else{
391 391
    			    setStringValue(PREFERRED_NOMENCLATURAL_CODE_KEY,
392 392
    				        preference.getValue());
393
    			    setBooleanValue(ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY,preference.isAllowOverride());
393

  
394 394
    				return preference;
395 395
    			}
396 396
    		} else{
......
435 435

  
436 436

  
437 437
	public static NomenclaturalCode getPreferredNomenclaturalCode(){
438
	    if (getBooleanValue(OVERRIDE_NOMENCLATURAL_CODE_KEY)) {
438
	    if (getBooleanValue(prefOverrideKey(PreferencePredicate.NomenclaturalCode.getKey()))) {
439 439
            return getPreferredNomenclaturalCode(true);
440 440
        } else{
441 441
            return getPreferredNomenclaturalCode(false);
......
487 487
    }
488 488

  
489 489
	public static boolean isShowTaxonAssociations(){
490
        if (getBooleanValue(SHOW_TAXON_ASSOCIATIONS_OVERRIDE) && getBooleanValue(SHOW_TAXON_ASSOCIATIONS_ALLOW_OVERRIDE)) {
491
            return getBooleanValue(SHOW_TAXON_ASSOCIATIONS);
492
        } else{
493
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowTaxonAssociations);
494

  
495
            return pref!=null?Boolean.valueOf(pref.getValue()):false;
496
        }
490
        boolean result = getBooleanValue(EditorPreferencePredicate.ShowTaxonAssociations.getKey());
491
        return result;
497 492
    }
498 493

  
499 494
	public static boolean isShowLifeForm(){
500
        if (getBooleanValue(SHOW_LIFE_FORM_OVERRIDE) && getBooleanValue(SHOW_LIFE_FORM_ALLOW_OVERRIDE)) {
501
            return getBooleanValue(SHOW_LIFE_FORM);
502
        } else{
503
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowLifeForm);
504

  
505
            return pref!=null?Boolean.valueOf(pref.getValue()):false;
506
        }
495
	    boolean result =  getBooleanValue(EditorPreferencePredicate.ShowLifeForm.getKey());
496
	    return result;
507 497
    }
508 498

  
509 499
	public static boolean isDeterminationOnlyForFieldUnits(){
510
        if (getBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS_OVERRIDE) && getBooleanValue(DETERMINATIONS_ONLY_FOR_FIELDUNITS_ALLOW_OVERRIDE)) {
511
            return getBooleanValue(DETERMINATION_ONLY_FOR_FIELD_UNITS);
512
        } else{
513
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.DeterminationOnlyForFieldUnits);
514

  
515
            return pref!=null?Boolean.valueOf(pref.getValue()):false;
516
        }
500
	    boolean result =  getBooleanValue(EditorPreferencePredicate.DeterminationOnlyForFieldUnits.getKey());
501
        return result;
517 502
    }
518 503

  
519 504
	public static boolean isCollectingAreaInGeneralSection(){
520
        if (getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_OVERRIDE) && getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION_ALLOW_OVERRIDE)) {
521
            return getBooleanValue(SHOW_COLLECTING_AREAS_IN_GENERAL_SECTION);
522
        } else{
523
            CdmPreference pref = getPreferenceFromDB(PreferencePredicate.ShowCollectingAreasInGeneralSection);
524

  
525
            return pref!=null?Boolean.valueOf(pref.getValue()):false;
526
        }
527
    }
528

  
529
	public static boolean isShowSimpleDetailsView(){
530
        if (getBooleanValue(OVERRIDE_NAME_DETAILS) && getBooleanValue(ALLOW_OVERRIDE_NAME_DETAILS)) {
531
            return getBooleanValue(SHOW_SIMPLE_NAME_DETAILS_SECTION);
532
        } else{
533
            CdmPreference pref = getPreferenceFromDB(EditorPreferencePredicate.NameDetailsView);
534

  
535
            return pref!=null?Boolean.valueOf(pref.getValue()):false;
536
        }
537
    }
538

  
539

  
505
	    boolean result =  getBooleanValue(EditorPreferencePredicate.ShowCollectingAreasInGeneralSection.getKey());
506
        return result;
507
	}
540 508

  
541
    public static CdmPreference getPreferenceFromDB(IPreferencePredicate predicate){
509
	public static CdmPreference getPreferenceFromDB(IPreferencePredicate predicate){
542 510
        ICdmRepository controller;
543 511
        CdmPreference pref = null;
544 512

  
......
839 807
	   return prefKey(property);
840 808

  
841 809
	}
810
	public static String createOverridePreferenceString(String property){
811
	       return prefOverrideKey(property);
812

  
813
	    }
842 814

  
843 815
	/**
844 816
	 * Set default values for preferences
......
880 852

  
881 853
		getPreferenceStore().setDefault(createPreferenceString(SORT_TAXA_BY_RANK_AND_NAME), true);
882 854
		//override db preferences
883
		getPreferenceStore().setDefault(createPreferenceString(ABCD_IMPORT_OVERRIDE), false);
884
		getPreferenceStore().setDefault(createPreferenceString(SHOW_SPECIMEN_OVERRIDE), false);
885
		getPreferenceStore().setDefault(createPreferenceString(OVERRIDE_NAME_DETAILS), false);
886
		getPreferenceStore().setDefault(createPreferenceString(DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE), false);
855
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey())), false);
856
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.ShowSpecimen.getKey())), false);
857
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.NameDetailsView.getKey())), false);
858
		getPreferenceStore().setDefault(createPreferenceString(prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey())), false);
887 859

  
888 860
		getPreferenceStore().setDefault(createPreferenceString(FILTER_COMMON_NAME_REFERENCES), false);
889 861
		getPreferenceStore().setDefault(createPreferenceString(SHOW_SPECIMEN), true);
......
921 893
        if (preference == null){
922 894
            return;
923 895
        }
924
        setBooleanValue(ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, preference.isAllowOverride());
896
//        setBooleanValue(ALLOW_OVERRIDE_NOMENCLATURAL_CODE_KEY, preference.isAllowOverride());
925 897

  
926 898
        int index = StringUtils.lastIndexOf(preference.getValue(), ".");
927 899
        UUID uuid = UUID.fromString(preference.getValue().substring(index +1, preference.getValue().length()));
......
1651 1623
        CdmPreferenceCache cache = CdmPreferenceCache.instance();
1652 1624
        CdmPreference pref = cache.get(EditorPreferencePredicate.AbcdImportConfig.getKey());
1653 1625

  
1654
        if (!getBooleanValue(IPreferenceKeys.ABCD_IMPORT_OVERRIDE) || !pref.isAllowOverride()){
1626
        if (!getBooleanValue(prefOverrideKey(EditorPreferencePredicate.AbcdImportConfig.getKey())) || !pref.isAllowOverride()){
1655 1627
            resetToDBPreferenceAbcdCOnfigurator();
1656 1628

  
1657 1629
        }

Also available in: Unified diff