- removed unnecessary icon registry

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / DescriptionHelper.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index 1fc1cfd18f7aabb93f571d1deb53c7c7e0f859f0..50c0047ce9d0fb59555ce42a2574e928a15d8b3e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -223,10 +223,16 @@ public class DescriptionHelper {
         * @return a {@link java.lang.String} object.
         */
        public static String getFeatureNodeContainerText(FeatureNodeContainer element) {
+               String result = null;
                if(element.getFeatureNode() != null && element.getFeatureNode().getFeature() != null){
-                       return element.getFeatureNode().getFeature().getLabel(CdmStore.getDefaultLanguage());
+                       result = element.getFeatureNode().getFeature().getLabel(CdmStore.getDefaultLanguage());
+               } else{
+                       return "No label set";
                }
-               return "No label set";
+               if (result == null){
+                       result = element.getFeatureNode().getFeature().getLabel();
+               }
+               return result;
        }
 
        /**