Project

General

Profile

« Previous | Next » 

Revision 543d3926

Added by Andreas Müller about 3 years ago

ref #9427 further remove redundant code by parameterized method call

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
120 120
            put(pref);
121 121
        }
122 122

  
123
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableDistributionStatus);
123
        loadAndSet(PreferencePredicate.AvailableDistributionStatus, TermType.PresenceAbsenceTerm);
124
        loadAndSet(PreferencePredicate.AvailableRanks, TermType.Rank);
125
        loadAndSet(PreferencePredicate.AvailableNomenclaturalStatus, TermType.NomenclaturalStatusType);
124 126

  
125
        if (get(key) != null){
126
            if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableDistributionStatus.getKey()) || !get(key).isAllowOverride()){
127
                //get terms for the uuids... and add them to the termManager as preferred terms
128
                Collection<TermDto> dtos = createDtoList(key);
129
                CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.PresenceAbsenceTerm);
130
            }
131
        }
132
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableRanks);
133

  
134
        if (get(key) != null){
135
            if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableRanks.getKey()) || !get(key).isAllowOverride()){
136
                //get terms for the uuids... and add them to the termManager as preferred terms
137
                Collection<TermDto> dtos = createDtoList(key);
138
                CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.Rank);
139
            }
140
        }
141

  
142
        key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), PreferencePredicate.AvailableNomenclaturalStatus);
127
    }
143 128

  
129
    private void loadAndSet(PreferencePredicate preferencePredicate, TermType termType) {
130
        PrefKey key = CdmPreference.NewKey(PreferenceSubject.NewTaxEditorInstance(), preferencePredicate);
144 131
        if (get(key) != null){
145
            if (!PreferencesUtil.getOverrideForPreference(PreferencePredicate.AvailableNomenclaturalStatus.getKey()) || !get(key).isAllowOverride()){
132
            if (!PreferencesUtil.getOverrideForPreference(preferencePredicate.getKey()) || !get(key).isAllowOverride()){
146 133
                //get terms for the uuids... and add them to the termManager as preferred terms
147 134
                Collection<TermDto> dtos = createDtoList(key);
148
                CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.NomenclaturalStatusType);
135
                CdmStore.getTermManager().setPreferredTermsByType(dtos, termType);
149 136
            }
150 137
        }
151 138
    }

Also available in: Unified diff