Project

General

Profile

« Previous | Next » 

Revision 0eccefea

Added by Katja Luther about 4 years ago

ref #8047: status order in drop down

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
23 23
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
24 24
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
25 25
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
26
import eu.etaxonomy.cdm.model.metadata.TermOrder;
26 27
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
27 28
import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
28 29
import eu.etaxonomy.cdm.model.term.Representation;
30
import eu.etaxonomy.cdm.model.term.TermIdInVocabularyComparator;
31
import eu.etaxonomy.cdm.model.term.TermLanguageComparator;
29 32
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
30 33
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
31 34
import eu.etaxonomy.taxeditor.store.CdmStore;
......
90 93

  
91 94
            inputList = CdmStore.getTermManager().getPreferredTerms(PresenceAbsenceTerm.class);
92 95
        }
96

  
97

  
93 98
        Comparator<DefinedTermBase> comp = new OrderedTermComparator<>();
99
        //check the status order preference
100
        TermOrder order = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
101

  
102
        if (order.equals(TermOrder.IdInVoc)){
103
            comp = new TermIdInVocabularyComparator();
104
        }else if(order.equals(TermOrder.Label)){
105
            comp = new TermLanguageComparator();
106
        }
94 107
        Collections.sort(inputList, comp);
95
        Collections.sort(inputList, Collections.reverseOrder());
108
//        Collections.sort(inputList, Collections.reverseOrder());
96 109
        int index = 1;
97 110
        for (PresenceAbsenceTerm term: inputList){
98 111
            inputAll.add(index, new StatusHelper(term));
112
            index++;
99 113
        }
100 114
       // inputAll.addAll(1, inputList);
101 115
        return inputAll;

Also available in: Unified diff