Revision f3fd528a
Added by Andreas Müller almost 3 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java | ||
|---|---|---|
| 3031 | 3031 |
Taxon toTaxon = (Taxon) dao.load(toTaxonUuid); |
| 3032 | 3032 |
result = changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymType); |
| 3033 | 3033 |
|
| 3034 |
// result.addUpdatedObject(fromTaxon); |
|
| 3035 | 3034 |
result.addUpdatedObject(toTaxon); |
| 3036 | 3035 |
result.addUpdatedObject(result.getCdmEntity()); |
| 3037 | 3036 |
|
| ... | ... | |
| 3097 | 3096 |
}else{
|
| 3098 | 3097 |
SynonymDeletionConfigurator synonymConfig = (SynonymDeletionConfigurator) config; |
| 3099 | 3098 |
result = isDeletableForSynonym(references, synonymConfig); |
| 3100 |
if (synonymConfig.isDeleteNameIfPossible()){
|
|
| 3101 |
if (taxonBase.getName() != null){
|
|
| 3102 |
DeleteResult nameResult = nameService.isDeletable(taxonBase.getName().getUuid(), synonymConfig.getNameDeletionConfig(), taxonBase.getUuid()); |
|
| 3103 |
if (!nameResult.isOk()){
|
|
| 3104 |
result.addExceptions(nameResult.getExceptions()); |
|
| 3099 |
if (synonymConfig.isDeleteNameIfPossible() && taxonBase.getName() != null){
|
|
| 3100 |
DeleteResult nameResult = nameService.isDeletable(taxonBase.getName().getUuid(), synonymConfig.getNameDeletionConfig(), taxonBase.getUuid()); |
|
| 3101 |
if (!nameResult.isOk()){
|
|
| 3102 |
result.addExceptions(nameResult.getExceptions()); |
|
| 3105 | 3103 |
|
| 3106 |
} |
|
| 3107 | 3104 |
} |
| 3108 | 3105 |
} |
| 3109 | 3106 |
} |
Also available in: Unified diff
cleanup