From e8d2f9e31f102f3fdbd0310c6cb449bc0082c520 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=EF=BF=BD=EF=BF=BDller?= Date: Thu, 28 May 2015 08:28:59 +0000 Subject: [PATCH] fix potential NPE --- .../navigation/navigator/TaxonNodeLabelProvider.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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) { -- 2.34.1