Project

General

Profile

« Previous | Next » 

Revision fa9caef2

Added by Katja Luther over 5 years ago

use NewTaxEditorInstance for CdmPreferences in TaxEditor and fix representation handling in namerelationType combobox

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java
8 8
*/
9 9
package eu.etaxonomy.taxeditor.ui.combo;
10 10

  
11
import java.util.ArrayList;
12
import java.util.List;
13

  
14
import eu.etaxonomy.cdm.model.common.Language;
15
import eu.etaxonomy.cdm.model.common.Representation;
11 16
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
12 17
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
13 18
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
75 80
            return "";
76 81
        }else{
77 82
            String termLabel = null;
83
            List<Language> languages = new ArrayList();
84

  
85
            languages.add(CdmStore.getDefaultLanguage());
86
            Representation rep = term.getPreferredInverseRepresentation(languages);
78 87
            if (useAbbrevLabel){
79
                termLabel = term.getInverseSymbol();
88
                termLabel = rep.getAbbreviatedLabel();
89
                if (termLabel == null){
90
                    termLabel = rep.getLabel();
91
                }
92

  
80 93
            }else{
81
                termLabel = term.getInverseLabel(CdmStore.getDefaultLanguage());
94
                termLabel = rep.getLabel();
82 95
            }
83 96
            if (termLabel == null){
84 97
                termLabel = term.getInverseLabel();
......
102 115
            return "";
103 116
        }else{
104 117
            String termLabel = null;
118
            Representation rep = term.getPreferredRepresentation(CdmStore.getDefaultLanguage());
105 119
            if (useAbbrevLabel){
106
                termLabel = term.getIdInVocabulary();
120
                termLabel = rep.getAbbreviatedLabel();
121
                if (termLabel == null){
122
                    termLabel = rep.getLabel();
123
                }
107 124
            }else{
108
                termLabel = term.getLabel(CdmStore.getDefaultLanguage());
125
                termLabel = rep.getLabel();
109 126
            }
110 127
            if (termLabel == null){
111 128
                termLabel = term.getLabel();

Also available in: Unified diff