Revision 641175e9
Added by Katja Luther almost 3 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java | ||
|---|---|---|
| 29 | 29 |
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey; |
| 30 | 30 |
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate; |
| 31 | 31 |
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject; |
| 32 |
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
|
|
| 32 |
import eu.etaxonomy.cdm.model.metadata.TermOrder;
|
|
| 33 | 33 |
import eu.etaxonomy.cdm.model.term.DefinedTermBase; |
| 34 | 34 |
import eu.etaxonomy.cdm.model.term.Representation; |
| 35 | 35 |
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache; |
| ... | ... | |
| 100 | 100 |
|
| 101 | 101 |
Comparator<DefinedTermBase> comp = new OrderedTermComparator<>(); |
| 102 | 102 |
//check the status order preference |
| 103 |
TermDisplayEnum order = null;
|
|
| 103 |
TermOrder order = null;
|
|
| 104 | 104 |
try{
|
| 105 |
order = TermDisplayEnum.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 105 |
order = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 106 | 106 |
}catch (IllegalArgumentException e){
|
| 107 |
order = TermDisplayEnum.Title;
|
|
| 107 |
order = TermOrder.Label;
|
|
| 108 | 108 |
} |
| 109 | 109 |
|
| 110 |
if (order.equals(TermDisplayEnum.IdInVocabulary)){
|
|
| 110 |
if (order.equals(TermOrder.IdInVoc)){
|
|
| 111 | 111 |
comp = new TermIdInVocabularyComparator<DefinedTermBase>(); |
| 112 |
}else if(order.equals(TermDisplayEnum.Title)){
|
|
| 112 |
}else if(order.equals(TermOrder.Label)){
|
|
| 113 | 113 |
comp = new TermLanguageComparator<DefinedTermBase>(Language.DEFAULT(), Language.DEFAULT()); |
| 114 |
}else if(order.equals(TermDisplayEnum.Symbol1)){
|
|
| 114 |
}else if(order.equals(TermOrder.Symbol1)){
|
|
| 115 | 115 |
comp = new TermSymbol1Comparator<DefinedTermBase>(); |
| 116 |
}else if(order.equals(TermDisplayEnum.Symbol2)){
|
|
| 116 |
}else if(order.equals(TermOrder.Symbol2)){
|
|
| 117 | 117 |
comp = new TermSymbol2Comparator<DefinedTermBase>(); |
| 118 | 118 |
} |
| 119 | 119 |
Collections.sort(inputList, comp); |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/preferencePage/ChecklistEditorGeneralAdminPreference.java | ||
|---|---|---|
| 172 | 172 |
|
| 173 | 173 |
if (prefStatusSort != null){
|
| 174 | 174 |
if (prefStatusSort.getValue() != null){
|
| 175 |
this.orderStatus = prefStatusSort.getValue() != null? TermDisplayEnum.valueOf(prefStatusSort.getValue().toString()): null;
|
|
| 175 |
this.orderStatus = prefStatusSort.getValue() != null? TermOrder.valueOf(prefStatusSort.getValue().toString()): null;
|
|
| 176 | 176 |
}else{
|
| 177 | 177 |
this.orderStatus = null; |
| 178 | 178 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java | ||
|---|---|---|
| 48 | 48 |
boolean isUseLocal; |
| 49 | 49 |
protected Boolean isShowRank; |
| 50 | 50 |
protected TermOrder orderAreas; |
| 51 |
protected TermDisplayEnum orderStatus;
|
|
| 51 |
protected TermOrder orderStatus;
|
|
| 52 | 52 |
protected TermDisplayEnum displayStatus; |
| 53 | 53 |
protected TermComboEnum displayStatusCombo; |
| 54 | 54 |
protected TermDisplayEnum displayArea; |
| ... | ... | |
| 353 | 353 |
}); |
| 354 | 354 |
} |
| 355 | 355 |
|
| 356 |
statusSortSelectionCombo = createCombo(child, TermDisplayEnum.values(), PreferencePredicate.StatusSortedInDistributionEditor, Messages.ChecklistEditorGeneralPreference_Configure_status_order, isAdminPreference);
|
|
| 356 |
statusSortSelectionCombo = createCombo(child, TermOrder.values(), PreferencePredicate.StatusSortedInDistributionEditor, Messages.ChecklistEditorGeneralPreference_Configure_status_order, isAdminPreference);
|
|
| 357 | 357 |
|
| 358 | 358 |
index = 0; |
| 359 | 359 |
|
| ... | ... | |
| 648 | 648 |
return; |
| 649 | 649 |
} |
| 650 | 650 |
|
| 651 |
for (TermDisplayEnum display : TermDisplayEnum.values()) {
|
|
| 651 |
for (TermOrder display : TermOrder.values()) {
|
|
| 652 | 652 |
if (text.startsWith(display.getLabel())) {
|
| 653 | 653 |
orderStatus = display; |
| 654 | 654 |
break; |
| ... | ... | |
| 850 | 850 |
if (prefStatusSort != null) {
|
| 851 | 851 |
if (prefStatusSort.isAllowOverride()){
|
| 852 | 852 |
if(overrideOrderStatus) {
|
| 853 |
orderStatus = TermDisplayEnum.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 853 |
orderStatus = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 854 | 854 |
}else{
|
| 855 | 855 |
orderStatus = null; |
| 856 | 856 |
} |
| 857 | 857 |
} else {
|
| 858 | 858 |
if (prefStatusSort.getValue() != null) {
|
| 859 |
orderStatus = prefStatusSort.getValue() != null? TermDisplayEnum.valueOf(prefStatusSort.getValue().toString()): null;
|
|
| 859 |
orderStatus = prefStatusSort.getValue() != null? TermOrder.valueOf(prefStatusSort.getValue().toString()): null;
|
|
| 860 | 860 |
} else {
|
| 861 |
orderStatus = ((TermDisplayEnum) PreferencePredicate.StatusSortedInDistributionEditor.getDefaultValue());
|
|
| 861 |
orderStatus = ((TermOrder) PreferencePredicate.StatusSortedInDistributionEditor.getDefaultValue());
|
|
| 862 | 862 |
} |
| 863 | 863 |
|
| 864 | 864 |
} |
| 865 | 865 |
} else {
|
| 866 | 866 |
if (overrideOrderStatus){
|
| 867 | 867 |
try{
|
| 868 |
orderStatus = TermDisplayEnum.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 868 |
orderStatus = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
|
|
| 869 | 869 |
}catch (IllegalArgumentException e){
|
| 870 |
orderStatus = TermDisplayEnum.Title;
|
|
| 870 |
orderStatus = TermOrder.Label;
|
|
| 871 | 871 |
} |
| 872 | 872 |
}else{
|
| 873 | 873 |
orderStatus = null; |
Also available in: Unified diff
ref #9603: adapt to new termOrder values