Revision 5ab3e456
Added by Katja Luther over 8 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java | ||
|---|---|---|
| 117 | 117 |
} |
| 118 | 118 |
|
| 119 | 119 |
|
| 120 |
|
|
| 121 | 120 |
Classification classification = oldTaxonNode.getClassification(); |
| 122 |
Taxon oldTaxon = HibernateProxyHelper.deproxy(oldTaxonNode.getTaxon(), Taxon.class); |
|
| 123 |
Taxon newAcceptedTaxon = HibernateProxyHelper.deproxy(this.taxonService.load(newAcceptedTaxonNode.getTaxon().getUuid()), Taxon.class); |
|
| 124 |
|
|
| 121 |
Taxon oldTaxon = (Taxon) HibernateProxyHelper.deproxy(oldTaxonNode.getTaxon()); |
|
| 122 |
Taxon newAcceptedTaxon = (Taxon)this.taxonService.load(newAcceptedTaxonNode.getTaxon().getUuid()); |
|
| 125 | 123 |
// Move oldTaxon to newTaxon |
| 126 | 124 |
//TaxonNameBase<?,?> synonymName = oldTaxon.getName(); |
| 127 | 125 |
TaxonNameBase<?,?> synonymName = (TaxonNameBase)HibernateProxyHelper.deproxy(oldTaxon.getName()); |
| ... | ... | |
| 237 | 235 |
|
| 238 | 236 |
TaxonDeletionConfigurator conf = new TaxonDeletionConfigurator(); |
| 239 | 237 |
conf.setDeleteSynonymsIfPossible(false); |
| 240 |
conf.setDeleteNameIfPossible(false); |
|
| 241 | 238 |
DeleteResult result = taxonService.isDeletable(oldTaxon, conf); |
| 242 | 239 |
conf.setDeleteNameIfPossible(false); |
| 243 | 240 |
|
| ... | ... | |
| 251 | 248 |
result.includeResult(deleteTaxonNode(oldTaxonNode, conf)); |
| 252 | 249 |
} |
| 253 | 250 |
result.addUpdatedObject(newAcceptedTaxon); |
| 254 |
//result.addUpdatedObject(oldTaxon);
|
|
| 251 |
result.addUpdatedObject(oldTaxon); |
|
| 255 | 252 |
|
| 256 | 253 |
//oldTaxonNode.delete(); |
| 257 | 254 |
return result; |
| ... | ... | |
| 459 | 456 |
} |
| 460 | 457 |
|
| 461 | 458 |
result.setCdmEntity(node); |
| 462 |
|
|
| 463 |
boolean success = true; |
|
| 464 |
if(taxon != null){
|
|
| 465 |
success = taxon.removeTaxonNode(node); |
|
| 466 |
} |
|
| 467 |
|
|
| 459 |
boolean success = taxon.removeTaxonNode(node); |
|
| 460 |
dao.save(parent); |
|
| 468 | 461 |
taxonService.saveOrUpdate(taxon); |
| 469 | 462 |
result.addUpdatedObject(parent); |
| 470 | 463 |
|
Also available in: Unified diff
Revert "minor"
This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.