ref #9596 rename TypeDesignationSet -> TypeDesignationGroup in vaadin

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 184810e985b5ca791ef885ca17f2b0ce26c94ba4..6d8a7d56e01650d364a59830f28c15ad08316574 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
@@ -29,8 +29,8 @@ import com.vaadin.ui.themes.ValoTheme;
 
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWrapperDTO;
 import eu.etaxonomy.cdm.api.service.name.TypeDesignationDTO;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup.TypeDesignationSetType;
 import eu.etaxonomy.cdm.api.util.UserHelper;
 import eu.etaxonomy.cdm.model.ICdmEntityUuidCacher;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
@@ -119,21 +119,21 @@ public class RegistrationItemNameAndTypeButtons extends CompositeStyledComponent
         }
 
         userHasAddPermission = !regDto.isPersisted() || userHelper.userHasPermission(regDto.registration(), CRUD.UPDATE);
-        Map<TypedEntityReference<? extends VersionableEntity>,TypeDesignationSet> typeDesignationSets = regDto.getOrderedTypeDesignationSets();
+        Map<TypedEntityReference<? extends VersionableEntity>,TypeDesignationGroup> typeDesignationGroups = regDto.getOrderedTypeDesignationSets();
 
-        if(typeDesignationSets != null){
+        if(typeDesignationGroups != null){
             // order the typeDesignationSet keys so that holotypes come first, etc
             List<TypedEntityRefWithStatus> baseRefsByHighestStatus = new ArrayList<>();
-            for(TypedEntityReference<? extends VersionableEntity> baseEntityRef : typeDesignationSets.keySet()) {
-                baseRefsByHighestStatus.add(new TypedEntityRefWithStatus(baseEntityRef, typeDesignationSets.get(baseEntityRef).highestTypeStatus(new RegistrationTypeDesignationStatusComparator())));
+            for(TypedEntityReference<? extends VersionableEntity> baseEntityRef : typeDesignationGroups.keySet()) {
+                baseRefsByHighestStatus.add(new TypedEntityRefWithStatus(baseEntityRef, typeDesignationGroups.get(baseEntityRef).highestTypeStatus(new RegistrationTypeDesignationStatusComparator())));
             }
 
             Collections.sort(baseRefsByHighestStatus);
 
             for(TypedEntityRefWithStatus typedEntityRefWithStatus : baseRefsByHighestStatus) {
                 TypedEntityReference<? extends VersionableEntity> baseEntity = typedEntityRefWithStatus.typedEntity;
-                TypeDesignationSet typeDesignationSet = typeDesignationSets.get(baseEntity);
-                if (logger.isDebugEnabled()) {logger.debug("WorkingSet:" + typeDesignationSet.getWorkingsetType() + ">" + typeDesignationSet.getBaseEntity().toString());}
+                TypeDesignationGroup typeDesignationGroup = typeDesignationGroups.get(baseEntity);
+                if (logger.isDebugEnabled()) {logger.debug("WorkingSet:" + typeDesignationGroup.getWorkingsetType() + ">" + typeDesignationGroup.getBaseEntity().toString());}
                 String buttonLabel = SpecimenOrObservationBase.class.isAssignableFrom(baseEntity.getType()) ? "Type": "NameType";
                 Button tdButton = new Button(buttonLabel + ":");
                 tdButton.setDescription("Edit the type designation working set");
@@ -145,14 +145,14 @@ public class RegistrationItemNameAndTypeButtons extends CompositeStyledComponent
                         baseEntity.getUuid(), EnumSet.of(CRUD.UPDATE, CRUD.DELETE), RegistrationStatus.PREPARATION.name());
 
                 typeDesignationButtons.add(new TypeDesignationSetButton(
-                        typeDesignationSet.getWorkingsetType(),
-                        typeDesignationSet.getBaseEntity(),
+                        typeDesignationGroup.getWorkingsetType(),
+                        typeDesignationGroup.getBaseEntity(),
                         tdButton)
                         );
 
                 String labelText = "<span class=\"field-unit-label\">" + baseEntity.getLabel() + "</span>"; // renders the FieldUnit label
-                for(TypeDesignationStatusBase<?> typeStatus : typeDesignationSet.keySet()){
-                    Collection<TypeDesignationDTO> tdPerStatus = typeDesignationSet.get(typeStatus);
+                for(TypeDesignationStatusBase<?> typeStatus : typeDesignationGroup.keySet()){
+                    Collection<TypeDesignationDTO> tdPerStatus = typeDesignationGroup.get(typeStatus);
                     labelText += " <strong>" + typeStatus.getLabel() +  (tdPerStatus.size() > 1 ? "s":"" ) + "</strong>: ";
                     boolean isFirst = true;
                     for(TypeDesignationDTO<?> dtDTO : tdPerStatus) {

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/event/TypeDesignationSetEditorAction.java b/src/main/java/eu/etaxonomy/cdm/vaadin/event/TypeDesignationSetEditorAction.java
index b58deb11dd7662f91532d8c32a4aa30c27707cdb..380d21d1f688449cbb3e5631a9097e63a71e0e3a 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/event/TypeDesignationSetEditorAction.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/event/TypeDesignationSetEditorAction.java
@@ -14,8 +14,8 @@ import java.util.UUID;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Field;
 
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup.TypeDesignationSetType;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.name.Registration;
 import eu.etaxonomy.cdm.ref.TypedEntityReferenceFactory;
@@ -26,7 +26,7 @@ import eu.etaxonomy.vaadin.mvp.AbstractView;
  * @author a.kohlbecker
  * @since Mar 22, 2017
  */
-public class TypeDesignationSetEditorAction extends AbstractEditorAction<TypeDesignationSet> {
+public class TypeDesignationSetEditorAction extends AbstractEditorAction<TypeDesignationGroup> {
 
     private TypeDesignationSetType workingSetType;
 
@@ -42,7 +42,7 @@ public class TypeDesignationSetEditorAction extends AbstractEditorAction<TypeDes
     public TypeDesignationSetEditorAction(VersionableEntity baseEntity,
             TypeDesignationSetType workingSetType,
             UUID registrationUuid, UUID typifiedNameUuid,
-            Button source, Field<TypeDesignationSet> target, AbstractView sourceView, Stack<EditorActionContext> context) {
+            Button source, Field<TypeDesignationGroup> target, AbstractView sourceView, Stack<EditorActionContext> context) {
 
         super(EditorActionType.EDIT, null, source, target, sourceView);
         this.baseEntity = baseEntity;
@@ -62,7 +62,7 @@ public class TypeDesignationSetEditorAction extends AbstractEditorAction<TypeDes
      */
     public TypeDesignationSetEditorAction(TypeDesignationSetType workingSetType,
             UUID registrationUuid, UUID typifiedNameUuid,
-            Button source, Field<TypeDesignationSet> target, AbstractView sourceView) {
+            Button source, Field<TypeDesignationGroup> target, AbstractView sourceView) {
 
         super(EditorActionType.ADD, null, source, target, sourceView);
         this.workingSetType = workingSetType;

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditor.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditor.java
index 19a102d2ccfb7332f2c1bf44ea3a4b1a2284b410..bb087e27457a014e265847e1d63505d7bbf4e159 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditor.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditor.java
@@ -318,7 +318,7 @@ public class SpecimenTypeDesignationSetPopupEditor
     public void updateAllowDeleteTypeDesignation(){
         // disable the delete button if there is only one typeDesignation
         // if this typeDesignation is deleted the fieldUnit would become orphan in the
-        // TypeDesignationSet
+        // TypeDesignationGroup
         GridLayout gridLayout = this.typeDesignationsCollectionField.getLayout();
         if(gridLayout.getRows() == 3){ // first row is header, last row is next new item
             gridLayout.getComponent(gridLayout.getColumns() - 1, 1).setEnabled(false);

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditorView.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditorView.java
index 5816019ffdb1d7bec2db44c57f23e67ecb9a132d..ceef7e100fb559866246ed71d25a7e260c6e13d9 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditorView.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationSetPopupEditorView.java
@@ -36,7 +36,7 @@ public interface SpecimenTypeDesignationSetPopupEditorView
     /**
      *  Disable the delete button if there is only one typeDesignation
      *  if this typeDesignation is deleted the fieldUnit would become orphan in the
-     *  TypeDesignationSet
+     *  TypeDesignationGroup
      */
     public void updateAllowDeleteTypeDesignation();
 

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
index 0f5da357424101209192565ea343ec9203eb01fb..e53874e94b51be5c114d41e0f46b69abbeee17c2 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetPresenter.java
@@ -43,7 +43,7 @@ import eu.etaxonomy.cdm.api.service.config.RegistrationStatusTransitions;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWrapperDTO;
 import eu.etaxonomy.cdm.api.service.exception.TypeDesignationSetException;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup.TypeDesignationSetType;
 import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService;
 import eu.etaxonomy.cdm.api.util.UserHelper;
 import eu.etaxonomy.cdm.cache.CdmTransientEntityWithUuidCacher;

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetViewBean.java b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetViewBean.java
index 550abaa29ef12d97eaa7dd6e6d2c9563670b84b1..35003ab457f38109072f3baa067839c230fee840 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetViewBean.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationWorkingsetViewBean.java
@@ -47,7 +47,7 @@ import com.vaadin.ui.themes.ValoTheme;
 import eu.etaxonomy.cdm.api.dto.RegistrationDTO.RankedNameReference;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWorkingSet;
 import eu.etaxonomy.cdm.api.service.dto.RegistrationWrapperDTO;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationSet.TypeDesignationSetType;
+import eu.etaxonomy.cdm.api.service.name.TypeDesignationGroup.TypeDesignationSetType;
 import eu.etaxonomy.cdm.api.util.RoleProberImpl;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.name.Registration;