Fix NPE in TermLabelProvider

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / editor / definedterm / TermLabelProvider.java

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 a34694860036ee3eeec77263738880f9e2f8ce45..da2a355239fc8f1ce645c64d134f996d65e8db6c 100644 (file)
--- 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;\r
 import org.eclipse.swt.widgets.Display;\r
 \r
+import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.Representation;\r
@@ -78,12 +79,6 @@ public class TermLabelProvider extends StyledCellLabelProvider {
         return new StyledString(getText(element), StyledString.QUALIFIER_STYLER);\r
     }\r
 \r
-    /*\r
-     * (non-Javadoc)\r
-     *\r
-     * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)\r
-     */\r
-\r
     public String getText(Object element) {\r
 \r
         if (element instanceof DefinedTermBase) {\r
@@ -93,11 +88,8 @@ public class TermLabelProvider extends StyledCellLabelProvider {
             if ( rep == null){\r
                 rep = dtb.getPreferredRepresentation(new ArrayList<Language>());\r
             }\r
-            if (StringUtils.isNotBlank(dtb.getIdInVocabulary())) {\r
-                return dtb.getIdInVocabulary() + " : " + rep.getLabel();\r
-            } else {\r
-                return rep.getLabel();\r
-            }\r
+            String label = rep != null? rep.getLabel() : dtb.getTitleCache();\r
+            return CdmUtils.concat(" : ", dtb.getIdInVocabulary(), label);\r
 \r
         } else if (element instanceof TermBase) {\r
             return ((TermBase) element).getTitleCache();\r