- 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 bada117220dbfd9975e381ca66da82d828ecf4d5..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
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.api.service.DefaultCategoricalDescriptionBuilder;
 import eu.etaxonomy.cdm.api.service.DefaultQuantitativeDescriptionBuilder;
 import eu.etaxonomy.cdm.api.service.DescriptionBuilder;
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.ISourceable;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
@@ -27,11 +26,13 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.LanguageStringBase;
 import eu.etaxonomy.cdm.model.common.Marker;
+import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
@@ -198,7 +199,8 @@ public class DescriptionHelper {
                }
                if (element instanceof Marker) {
                        Marker marker = (Marker) element;
-                       return marker.getMarkerType().getLabel() + " (" + marker.getFlag() + ")";
+                       MarkerType type = marker.getMarkerType();
+                       return (type == null ? "- no marker type -" : marker.getMarkerType().getLabel()) + " (" + marker.getFlag() + ")";
                }
                // TODO write return texts for NameRelationship, HomotypicalGroup, SpecimenTypeDesignation, etc.
                return element.toString();
@@ -221,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;
        }
 
        /**