Project

General

Profile

« Previous | Next » 

Revision 3fb08830

Added by Andreas Müller almost 2 years ago

ref #10089 remove TypedEntityReference from TypeDesignationWorkingSet

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/dto/RegistrationDTO.java
258 258
        return name;
259 259
    }
260 260

  
261
    public Map<TypedEntityReference<? extends VersionableEntity>, TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
261
    public Map<VersionableEntity,TypeDesignationWorkingSet> getOrderedTypeDesignationWorkingSets() {
262 262
        return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationWorkingSets() : null;
263 263
    }
264 264

  
265
    public TypeDesignationWorkingSet getTypeDesignationWorkingSet(TypedEntityReference baseEntityReference) {
266
        return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationWorkingSets().get(baseEntityReference) : null;
265
    public TypeDesignationWorkingSet getTypeDesignationWorkingSet(VersionableEntity baseEntity) {
266
        return typeDesignationManager != null ? typeDesignationManager.getOrderedTypeDesignationWorkingSets().get(baseEntity) : null;
267 267
    }
268 268

  
269
    public Set<TypeDesignationBase> getTypeDesignationsInWorkingSet(TypedEntityReference baseEntityReference) {
269
    public Set<TypeDesignationBase> getTypeDesignationsInWorkingSet(VersionableEntity baseEntity) {
270 270
        Set<TypeDesignationBase> typeDesignations = new HashSet<>();
271
        TypeDesignationWorkingSet workingSet = getTypeDesignationWorkingSet(baseEntityReference);
271
        TypeDesignationWorkingSet workingSet = getTypeDesignationWorkingSet(baseEntity);
272 272
        for(TypeDesignationDTO<?> ref :  workingSet.getTypeDesignations()){
273 273
            typeDesignations.add(findTypeDesignation(ref));
274 274
        }
275 275
        return typeDesignations;
276 276
    }
277 277

  
278
    public NameTypeDesignation getNameTypeDesignation(TypedEntityReference baseEntityReference) {
279
        Set<TypeDesignationBase> typeDesignations = getTypeDesignationsInWorkingSet(baseEntityReference);
278
    public NameTypeDesignation getNameTypeDesignation(VersionableEntity baseEntity) {
279
        Set<TypeDesignationBase> typeDesignations = getTypeDesignationsInWorkingSet(baseEntity);
280 280
        if(typeDesignations.size() == 1){
281 281
            TypeDesignationBase<?> item = typeDesignations.iterator().next();
282 282
            return (NameTypeDesignation)item ;

Also available in: Unified diff