#5946 improve determination event label provider for unlabeled units or taxa

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 441e6af712d88cc36035279a8d060e0fda98ecf4..a4c2af72825e16d4eb4ef927f43c4eade91bb22a 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
@@ -268,19 +268,30 @@ public class DescriptionHelper {
 
        private static String getCache(DeterminationEvent detEvent) {
                //taxon
-               String taxonStr = "no taxon";
+               String taxonStr = null;
                TaxonNameBase<?,?> taxonName = detEvent.getTaxonName();
                TaxonBase<?> taxon = detEvent.getTaxon();
                if (taxonName != null){
                        taxonStr = taxonName.getTitleCache();
-               }else if (taxon != null){
+               }
+               if (StringUtils.isBlank(taxonStr) && taxon != null){
                        taxonStr = taxon.getTitleCache();
                }
+               if (StringUtils.isBlank(taxonStr)){
+                       taxonStr = "no or unlabled taxon";
+               }
+                       
+                       
                //unit
-               String unitStr = "no unit";
                SpecimenOrObservationBase<?> unit = detEvent.getIdentifiedUnit();
+               String unitStr;
                if (unit != null){
                        unitStr = unit.getTitleCache();
+                       if (StringUtils.isNotBlank(unitStr)){
+                               unitStr = "Unlabled unit";
+                       }
+               }else{
+                       unitStr = "no unit";
                }
                
                String result = CdmUtils.concat(" determined as ", unitStr, taxonStr);