Project

General

Profile

« Previous | Next » 

Revision 296fa5af

Added by Katja Luther over 2 years ago

ref #9340, #9734, #9668: result should be of type DeleteResult

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
136 136
	 * Changes the taxa associated with the given taxon nodes into synonyms of the new accepted taxon node.
137 137
	 * All data associated with the former taxa are moved to the newly accepted taxon.
138 138
	 */
139
	public UpdateResult makeTaxonNodeSynonymsOfAnotherTaxonNode(Set<UUID> oldTaxonNodeUuids, UUID newAcceptedTaxonNodeUUIDs,
139
	public DeleteResult makeTaxonNodeSynonymsOfAnotherTaxonNode(Set<UUID> oldTaxonNodeUuids, UUID newAcceptedTaxonNodeUUIDs,
140 140
			SynonymType synonymType, UUID citationUuid, String microReference, SecReferenceHandlingEnum secHandling, boolean setNameInSource);
141 141

  
142
	public UpdateResult makeTaxonNodeASynonymOfAnotherTaxonNode(UUID oldTaxonNodeUuid,
142
	public DeleteResult makeTaxonNodeASynonymOfAnotherTaxonNode(UUID oldTaxonNodeUuid,
143 143
	        UUID newAcceptedTaxonNodeUUID,
144 144
	        SynonymType synonymType,
145 145
	        UUID citationUuid,
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
467 467
    }
468 468
    @Override
469 469
    @Transactional(readOnly = false)
470
    public UpdateResult makeTaxonNodeSynonymsOfAnotherTaxonNode( Set<UUID> oldTaxonNodeUuids,
470
    public DeleteResult makeTaxonNodeSynonymsOfAnotherTaxonNode( Set<UUID> oldTaxonNodeUuids,
471 471
            UUID newAcceptedTaxonNodeUUIDs,
472 472
            SynonymType synonymType,
473 473
            UUID citation,
......
483 483

  
484 484
    @Override
485 485
    @Transactional(readOnly = false)
486
    public UpdateResult makeTaxonNodeASynonymOfAnotherTaxonNode(UUID oldTaxonNodeUuid,
486
    public DeleteResult makeTaxonNodeASynonymOfAnotherTaxonNode(UUID oldTaxonNodeUuid,
487 487
            UUID newAcceptedTaxonNodeUUID,
488 488
            SynonymType synonymType,
489 489
            UUID citationUuid,
......
524 524
                citation,
525 525
                microReference,
526 526
                secHandling, setNameInSource);
527
        UpdateResult updateResult = new UpdateResult();
528
        updateResult.includeResult(result);
529
        updateResult.addUpdatedCdmId(new CdmEntityIdentifier(oldTaxonParentNode.getId(), TaxonNode.class));
530
        updateResult.addUpdatedCdmId(new CdmEntityIdentifier(newTaxonNode.getId(), TaxonNode.class));
531
        updateResult.setCdmEntity(oldTaxonParentNode);
532
        return updateResult;
527

  
528
        result.addUpdatedCdmId(new CdmEntityIdentifier(oldTaxonParentNode.getId(), TaxonNode.class));
529
        result.addUpdatedCdmId(new CdmEntityIdentifier(newTaxonNode.getId(), TaxonNode.class));
530
        result.setCdmEntity(oldTaxonParentNode);
531
        return result;
533 532
    }
534 533

  
535 534
    @Override

Also available in: Unified diff