Fix label for term vocabularies in term editor
authorPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 26 Sep 2016 06:36:20 +0000 (08:36 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Mon, 26 Sep 2016 06:36:20 +0000 (08:36 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java

index 71e33bed7c19c9a133e281413a08e10b76955717..8ea27ce46b5811736c2f2a0d5ea8ff0fe17b90e0 100644 (file)
@@ -72,20 +72,21 @@ public class TermLabelProvider extends StyledCellLabelProvider {
     }
 
     public String getText(Object element) {
-
-        if (element instanceof DefinedTermBase) {
-            DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
-
-            Representation rep = dtb.getRepresentation(PreferencesUtil.getGlobalLanguage());
-            if ( rep == null){
-                rep = dtb.getPreferredRepresentation(new ArrayList<Language>());
-            }
-            String label = rep != null? rep.getLabel() : dtb.getTitleCache();
-            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
-
-        } else if (element instanceof TermBase) {
-            return ((TermBase) element).getTitleCache();
-        }
+       if(element instanceof TermBase){
+               TermBase termBase = (TermBase)element;
+               Representation rep = termBase.getRepresentation(PreferencesUtil.getGlobalLanguage());
+               if (rep == null){
+                       rep = termBase.getPreferredRepresentation(new ArrayList<Language>());
+               }
+               String label = rep != null? rep.getLabel() : termBase.getTitleCache();
+               if (element instanceof DefinedTermBase) {
+                       DefinedTermBase<?> dtb = (DefinedTermBase<?>) element;
+                       return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
+
+               } else {
+                       return label;
+               }
+       }
 
         // FIXME : must throw an exception here
         return element.toString();