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/ChecklistEditorGeneralPreference.java
394 394 
        if (isAllowOverride){
395 395 

  		




  396
  396
  
    
            PreferencesUtil.setBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey(), isEditorActivated);


  		




  397
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE, overrideActivated);


  		




  
  397
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DistributionEditorActivated.getKey()), overrideActivated);


  		




  398
  398
  
    
            PreferencesUtil.setSortNamedAreasByOrderInVocabulary(isSortByVocabularyOrder);


  		




  399
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_AREAS_SORTED_BY_IDINVOC_OVERRIDE, overrideOrderAreas);


  		




  
  399
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.AreasSortedByIdInVocabulary.getKey()), overrideOrderAreas);


  		




  400
  400
  
    
            PreferencesUtil.setShowRankInChecklistEditor(isShowRank);


  		




  401
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_SHOW_RANK_OVERRIDE, overrideRank);


  		




  
  401
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.ShowRankInDistributionEditor.getKey()), overrideRank);


  		




  402
  402
  
    
            PreferencesUtil.setDisplayStatusInChecklistEditor(displayStatus);


  		




  403
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_DISPLAY_STATUS_OVERRIDE, overrideStatusDisplay);


  		




  
  403
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfStatus.getKey()), overrideStatusDisplay);


  		




  404
  404
  
    
            PreferencesUtil.setAreaDisplayInChecklistEditor(displayArea);


  		




  405
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.DISTRIBUTION_DISPLAY_AREA_OVERRIDE, overrideAreaDisplay);


  		




  
  405
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.DisplayOfAreasInDistributionEditor.getKey()), overrideAreaDisplay);


  		




  406
  406
  
    
            PreferencesUtil.setOwnDescriptionForChecklistEditor(ownDescriptionForDistributionEditor);


  		




  407
  
  
    
            PreferencesUtil.setBooleanValue(IPreferenceKeys.OWN_DESCRIPTION_OVERRIDE, overrideOwnDescriptionForDistributionEditor);


  		




  
  407
  
    
            PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(EditorPreferencePredicate.OwnDescriptionForDistributionEditor.getKey()), overrideOwnDescriptionForDistributionEditor);


  		




  408
  408
  
    

  		




  409
  409
  
    

  		




  410
  410
  
    

  		




  ......




  462
  462
  
    

  		




  463
  463
  
    
        if (distributionEditorPref != null){


  		




  464
  464
  
    
            isAllowOverride = distributionEditorPref.isAllowOverride();


  		




  465
  
  
    
            boolean test = PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE);


  		




  466
  
  
    
            if (isAllowOverride && PreferencesUtil.getBooleanValue(IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE_OVERRIDE)){


  		




  
  465
  
    
            boolean test = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  
  466
  
    
            if (isAllowOverride && PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey())){


  		




  467
  467
  
    
                isEditorActivated = PreferencesUtil.getBooleanValue(EditorPreferencePredicate.DistributionEditorActivated.getKey());


  		




  468
  468
  
    
            }else{


  		




  469
  469
  
    
                isEditorActivated = Boolean.valueOf(distributionEditorPref.getValue());


  		












Also available in:  Unified diff