Project

General

Profile

« Previous | Next » 

Revision 7dc115d1

Added by Katja Luther over 4 years ago

adapt display of multiple status in distr editor to preference value

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/FilterStatusDisplayConverter.java
11 11
import org.apache.commons.lang.StringUtils;
12 12
import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
13 13

  
14
import eu.etaxonomy.cdm.model.term.Representation;
15 14
import eu.etaxonomy.cdm.model.description.Distribution;
16 15
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
17 16
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
18 17
import eu.etaxonomy.cdm.model.metadata.TermDisplayEnum;
18
import eu.etaxonomy.cdm.model.term.Representation;
19 19
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
20 20
import eu.etaxonomy.taxeditor.store.CdmStore;
21 21

  
......
38 38
                Representation rep = distribution.getStatus().getPreferredRepresentation(CdmStore.getDefaultLanguage());
39 39
                String displayStatus = PreferencesUtil.getStringValue(PreferencePredicate.DisplayOfStatus.getKey());
40 40
                String label = rep.getLabel();
41
                if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.IdInVocabulary.getKey())){
41
                if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.IdInVocabulary)){
42 42
                    return (StringUtils.isNotBlank(distribution.getStatus().getIdInVocabulary()))?distribution.getStatus().getIdInVocabulary():label;
43
                }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol1.getKey())){
43
                }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol1)){
44 44

  
45 45
                    return (StringUtils.isNotBlank(distribution.getStatus().getSymbol() ))?distribution.getStatus().getSymbol():label;
46
                }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol2.getKey())){
46
                }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol2)){
47 47
                    return (StringUtils.isNotBlank(distribution.getStatus().getSymbol2() ))?distribution.getStatus().getSymbol2():label;
48 48
                }else{
49 49
                    return (label != null)?label:DEFAULT_ENTRY;
......
62 62
            if (status.getId() == 0){
63 63
                return DEFAULT_ENTRY;
64 64
            }
65
            if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.IdInVocabulary.getKey())){
65
            if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.IdInVocabulary)){
66 66
                return (StringUtils.isNotBlank(status.getIdInVocabulary()))?status.getIdInVocabulary():label;
67
            }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol1.getKey())){
67
            }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol1)){
68 68

  
69 69
                return (StringUtils.isNotBlank(status.getSymbol() ))?status.getSymbol():label;
70
            }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol2.getKey())){
70
            }else if(PreferencesUtil.displayStatusInChecklistEditor().equals(TermDisplayEnum.Symbol2)){
71 71
                return (StringUtils.isNotBlank(status.getSymbol2() ))?status.getSymbol2():label;
72 72
            }else{
73 73
                return (label != null)?label:DEFAULT_ENTRY;

Also available in: Unified diff