merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / combo / TermComboElement.java

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 663792a260fc2669dcdd70d40c91f6186e46d1f5..f05cbe1c497ca468f04b11402df608d77165402e 100644 (file)
--- 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<T extends DefinedTermBase>
                                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<T extends DefinedTermBase>
 
        /*
         * (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<T extends DefinedTermBase>
         * @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());
+               }
        }
 
        /**