Project

General

Profile

« Previous | Next » 

Revision c8edc5c9

Added by Katja Luther over 6 years ago

ref #6927: add symbol to preferences of distribution editor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/DistributionEditingSupport.java
5 5
import java.util.Set;
6 6
import java.util.SortedSet;
7 7

  
8
import org.apache.commons.lang.StringUtils;
8 9
import org.apache.log4j.Logger;
9 10
import org.eclipse.jface.viewers.ArrayContentProvider;
10 11
import org.eclipse.jface.viewers.CellEditor;
......
46 47
        descriptionService = CdmStore.getService(IDescriptionService.class);
47 48
        editor = checklistEditor;
48 49
        cellEditor = new ComboBoxViewerCellEditor((Composite) viewer.getControl(), SWT.READ_ONLY);
49
        cellEditor.setLabelProvider(new LabelProvider());
50
        cellEditor.setLabelProvider(new LabelProvider(){
51
        	 @Override
52
        	   public String getText(Object element) {
53
        	     if (element instanceof PresenceAbsenceTerm) {
54
        	    	 PresenceAbsenceTerm  status = (PresenceAbsenceTerm)element;
55
        	    	 String result = null;
56
        	    	 if (PreferencesUtil.isShowSymbolInChecklistEditor() && !StringUtils.isBlank(status.getSymbol())){
57
        	    		 result = status.getTitleCache() + "("+ status.getSymbol()+")";
58
        	    	 }else{
59
        	    		 result = status.getTitleCache();
60
        	    	 }
61
        	    	 return result;
62
        	     }
63
        	     return null;
64
        	   }
65
        });
50 66
        cellEditor.setContentProvider(new ArrayContentProvider());
51 67
        // TODO set input
52 68
//        List<PresenceAbsenceTermBase> input = CdmStore.getTermManager()
......
69 85
    protected Object getValue(Object element) {
70 86
        if (element instanceof Taxon) {
71 87
            Taxon taxon = (Taxon) element;
88
            String result = null;
72 89
            Distribution distributionForColumn = getDistributionForColumn(taxon);
90
           
73 91
            if (distributionForColumn != null) {
92
                PresenceAbsenceTerm status = distributionForColumn.getStatus();
74 93
                if (PreferencesUtil.isShowIdInVocabularyInChecklistEditor()){
75
                    if (distributionForColumn.getStatus().getIdInVocabulary() != null){
76
                        return distributionForColumn.getStatus().getIdInVocabulary();
94
                    if (status.getIdInVocabulary() != null){
95
                        result =  status.getIdInVocabulary();
77 96
                    } else{
78
                        distributionForColumn.getStatus().getTitleCache();
97
                        result = status.getTitleCache();
79 98
                    }
80 99
                } else{
81
                    return distributionForColumn.getStatus().getTitleCache();
100
                    result = status.getTitleCache();
101
                }
102
                if (PreferencesUtil.isShowSymbolInChecklistEditor() && status.getSymbol() != null){
103
                	result.concat(" ("+ status.getSymbol() + ")");
82 104
                }
83 105
            }
84
            // return PresenceAbsenceTerms
106
           
107
            return result;
85 108
        }
86 109
        return null;
87 110
    }

Also available in: Unified diff