From: Andreas Müller <a.mueller@bgbm.org>
Date: Thu, 8 Sep 2016 11:50:45 +0000 (+0200)
Subject: Fix NPE in TermLabelProvider
X-Git-Tag: 4.3.0^2~48
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c023c9afa5f06499320a897dc034422beb02c572

Fix NPE in TermLabelProvider
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
index a34694860..da2a35523 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermLabelProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.TextStyle;
 import org.eclipse.swt.widgets.Display;
 
+import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;
@@ -78,12 +79,6 @@ public class TermLabelProvider extends StyledCellLabelProvider {
         return new StyledString(getText(element), StyledString.QUALIFIER_STYLER);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-     */
-
     public String getText(Object element) {
 
         if (element instanceof DefinedTermBase) {
@@ -93,11 +88,8 @@ public class TermLabelProvider extends StyledCellLabelProvider {
             if ( rep == null){
                 rep = dtb.getPreferredRepresentation(new ArrayList<Language>());
             }
-            if (StringUtils.isNotBlank(dtb.getIdInVocabulary())) {
-                return dtb.getIdInVocabulary() + " : " + rep.getLabel();
-            } else {
-                return rep.getLabel();
-            }
+            String label = rep != null? rep.getLabel() : dtb.getTitleCache();
+            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);
 
         } else if (element instanceof TermBase) {
             return ((TermBase) element).getTitleCache();