Revision 6055cbe0
Added by Andreas Kohlbecker almost 6 years ago
src/main/java/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImpl.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.api.service.DeleteResult; |
28 | 28 |
import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator; |
29 | 29 |
import eu.etaxonomy.cdm.api.service.dto.RegistrationDTO; |
30 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationComparator; |
|
30 | 31 |
import eu.etaxonomy.cdm.api.service.name.TypeDesignationSetManager.TypeDesignationWorkingSet; |
31 | 32 |
import eu.etaxonomy.cdm.api.service.registration.IRegistrationWorkingSetService; |
32 | 33 |
import eu.etaxonomy.cdm.api.service.registration.RegistrationWorkingSetService; |
... | ... | |
104 | 105 |
@Override |
105 | 106 |
@Transactional |
106 | 107 |
public SpecimenTypeDesignationWorkingSetDTO<Registration> load(UUID registrationUuid, TypedEntityReference<? extends IdentifiableEntity<?>> baseEntityRef) { |
108 |
|
|
107 | 109 |
RegistrationDTO regDTO = registrationWorkingSetService.loadDtoByUuid(registrationUuid); |
108 | 110 |
// find the working set |
109 | 111 |
TypeDesignationWorkingSet typeDesignationWorkingSet = regDTO.getTypeDesignationWorkingSet(baseEntityRef); |
... | ... | |
112 | 114 |
} |
113 | 115 |
|
114 | 116 |
protected SpecimenTypeDesignationWorkingSetDTO<Registration> specimenTypeDesignationWorkingSetDTO(RegistrationDTO regDTO, TypedEntityReference baseEntityReference) { |
117 |
|
|
115 | 118 |
Set<TypeDesignationBase> typeDesignations = regDTO.getTypeDesignationsInWorkingSet(baseEntityReference); |
116 | 119 |
List<SpecimenTypeDesignation> specimenTypeDesignations = new ArrayList<>(typeDesignations.size()); |
117 | 120 |
typeDesignations.forEach(td -> specimenTypeDesignations.add((SpecimenTypeDesignation)td)); |
121 |
specimenTypeDesignations.sort(new TypeDesignationComparator()); |
|
118 | 122 |
VersionableEntity baseEntity = regDTO.getTypeDesignationWorkingSet(baseEntityReference).getBaseEntity(); |
119 | 123 |
|
120 | 124 |
SpecimenTypeDesignationWorkingSetDTO<Registration> dto = new SpecimenTypeDesignationWorkingSetDTO<Registration>(regDTO.registration(), |
Also available in: Unified diff
fix #7569 ordering typedesignations in workingset by type