Project

General

Profile

« Previous | Next » 

Revision cec27740

Added by Katja Luther about 5 years ago

ref #7849: fix problems with preferences

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java
15 15 
import eu.etaxonomy.cdm.api.service.IPreferenceService;
16 16 
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
17 17 
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
18 
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
19 
import eu.etaxonomy.cdm.model.metadata.TermOrder;
18 20 
import eu.etaxonomy.taxeditor.preference.ChecklistEditorGeneralPreference;
19 21 
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 22 
import eu.etaxonomy.taxeditor.store.CdmStore;
......
89 91 
            this.displayArea = pref.getValue();
90 92 
            this.allowOverrideAreaDisplay = pref.isAllowOverride();
91 93 
        }else{
92 
            this.displayArea = PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue().toString();
94 
            this.displayArea = ((TermDisplayEnum)PreferencePredicate.DisplayOfAreasInDistributionEditor.getDefaultValue()).getKey();
93 95 
            this.allowOverrideAreaDisplay = true;
94 96 
        }
95 97 

  		




  ......




  98
  100
  
    
            this.displayStatus = pref.getValue();


  		




  99
  101
  
    
            this.allowOverrideStatusDisplay = pref.isAllowOverride();


  		




  100
  102
  
    
        }else{


  		




  101
  
  
    
            this.displayStatus = PreferencePredicate.DisplayOfStatus.getDefaultValue().toString();


  		




  
  103
  
    
            this.displayStatus = ((TermDisplayEnum)PreferencePredicate.DisplayOfStatus.getDefaultValue()).getKey();


  		




  102
  104
  
    
            this.allowOverrideStatusDisplay = true;


  		




  103
  105
  
    
        }


  		




  104
  106
  
    

  		




  ......




  107
  109
  
    
            if (pref.getValue() != null){


  		




  108
  110
  
    
                this.orderAreas = pref.getValue().toString();


  		




  109
  111
  
    
            }else{


  		




  110
  
  
    
                this.orderAreas = PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();


  		




  
  112
  
    
                this.orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();


  		




  111
  113
  
    
            }


  		




  112
  114
  
    
            this.allowOverrideOrderAreas = pref.isAllowOverride();


  		




  113
  115
  
    
        }else{


  		




  114
  
  
    
            this.orderAreas = PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue().toString();


  		




  
  116
  
    
            this.orderAreas = ((TermOrder)PreferencePredicate.AreasSortedInDistributionEditor.getDefaultValue()).getKey();


  		




  115
  117
  
    
            this.allowOverrideOrderAreas = true;


  		




  116
  118
  
    
        }


  		




  117
  119
  
    

  		












Also available in:  Unified diff