From: Andreas M��ller <a.mueller@bgbm.org>
Date: Thu, 28 May 2015 08:28:59 +0000 (+0000)
Subject: fix potential NPE
X-Git-Tag: 3.6.0~24^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/e8d2f9e31f102f3fdbd0310c6cb449bc0082c520

fix potential NPE
---

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index c022ca4e2..936ca55c0 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -36,7 +36,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  *
  * @author p.ciardelli
  * @created 04.06.2009
- * @version 1.0
  */
 public class TaxonNodeLabelProvider extends ColumnLabelProvider
 		implements ILabelProvider, IDescriptionProvider, IStyledLabelProvider {
@@ -76,22 +75,16 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
 		return new String();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)
-	 */
 	/** {@inheritDoc} */
 	@Override
     public String getDescription(Object anElement) {
 		if (anElement instanceof TaxonNode) {
 			Taxon data = ((TaxonNode) anElement).getTaxon();
-			return "Taxon: " + data != null ? data.getTitleCache() : ">NO TAXON<";
+			return "Taxon: " + (data != null ? data.getTitleCache() : ">NO TAXON<");
 		}
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
-	 */
 	/** {@inheritDoc} */
 	@Override
     public StyledString getStyledText(Object element) {