ref #9920 fixing plural form of type status labels

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java
index 426a1f6073c26d9b72a2c49bb90447a2511004d8..aa8a8f63e86d46e4d1778ee205a4c537e719111a 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/component/registration/RegistrationItemNameAndTypeButtons.java
@@ -9,6 +9,7 @@
 package eu.etaxonomy.cdm.vaadin.component.registration;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedHashMap;
@@ -149,9 +150,10 @@ public class RegistrationItemNameAndTypeButtons extends CompositeStyledComponent
 
                 String labelText = "<span class=\"field-unit-label\">" + baseEntityRef.getLabel() + "</span>"; // renders the FieldUnit label
                 for(TypeDesignationStatusBase<?> typeStatus : typeDesignationWorkingSet.keySet()){
-                    labelText += " <strong>" + typeStatus.getLabel() +  (typeDesignationWorkingSet.getTypeDesignations().size() > 1 ? "s":"" ) + "</strong>: ";
+                    Collection<TypeDesignationDTO> tdPerStatus = typeDesignationWorkingSet.get(typeStatus);
+                    labelText += " <strong>" + typeStatus.getLabel() +  (tdPerStatus.size() > 1 ? "s":"" ) + "</strong>: ";
                     boolean isFirst = true;
-                    for(TypeDesignationDTO<?> dtDTO : typeDesignationWorkingSet.get(typeStatus)) {
+                    for(TypeDesignationDTO<?> dtDTO : tdPerStatus) {
                         labelText += ( isFirst ? "" : ", ") + TaggedCacheHelper.createString(
                                 TaggedCacheHelper.cropAt(dtDTO.getTaggedText(), TagEnum.separator, "designated\\s+[bB]y"));
                         isFirst = false;