From 0fd2319e22bda841d6366c9062f9ca748aa24f5c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 27 Nov 2013 19:20:02 +0000 Subject: [PATCH] update some logging --- .../taxeditor/ui/combo/TermComboElement.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java index 4fe5b8359..77400dbe3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java @@ -244,7 +244,7 @@ public class TermComboElement if (term.getTitleCache() != null) { label = term.getTitleCache(); StoreUtil.warn(getClass(), - "Term does not have a representation: " + term + "Term does not have a default language representation: " + label + ", " + term.getUuid()); } else { label = "Unknown"; @@ -275,9 +275,7 @@ public class TermComboElement /* * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean) + * @see eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean) */ /** {@inheritDoc} */ public void setEnabled(boolean enabled) { @@ -307,7 +305,11 @@ public class TermComboElement * @return a {@link java.lang.String} object. */ protected String getLabel(T term) { - return term.getLabel(CdmStore.getDefaultLanguage()); + if (term == null){ + return ""; + }else{ + return term.getLabel(CdmStore.getDefaultLanguage()); + } } /** -- 2.34.1