Project

General

Profile

« Previous | Next » 

Revision 84bd3966

Added by Patrick Plitzner over 7 years ago

Fix label for term vocabularies in term editor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
72 72
    }
73 73

  
74 74
    public String getText(Object element) {
75

  
76
        if (element instanceof DefinedTermBase) {
77
            DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
78

  
79
            Representation rep = dtb.getRepresentation(PreferencesUtil.getGlobalLanguage());
80
            if ( rep == null){
81
                rep = dtb.getPreferredRepresentation(new ArrayList<Language>());
82
            }
83
            String label = rep != null? rep.getLabel() : dtb.getTitleCache();
84
            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
85

  
86
        } else if (element instanceof TermBase) {
87
            return ((TermBase) element).getTitleCache();
88
        }
75
    	if(element instanceof TermBase){
76
    		TermBase termBase = (TermBase)element;
77
    		Representation rep = termBase.getRepresentation(PreferencesUtil.getGlobalLanguage());
78
    		if (rep == null){
79
    			rep = termBase.getPreferredRepresentation(new ArrayList<Language>());
80
    		}
81
    		String label = rep != null? rep.getLabel() : termBase.getTitleCache();
82
    		if (element instanceof DefinedTermBase) {
83
    			DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
84
    			return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
85

  
86
    		} else {
87
    			return label;
88
    		}
89
    	}
89 90

  
90 91
        // FIXME : must throw an exception here
91 92
        return element.toString();

Also available in: Unified diff