Revision 815a9015
Added by Katja Luther about 6 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java | ||
|---|---|---|
| 114 | 114 |
Comparator<TaxonNode> comparator = sortMode.newComparator(); |
| 115 | 115 |
Collections.sort(childNodes, comparator); |
| 116 | 116 |
} |
| 117 |
defaultBeanInitializer.initializeAll(childNodes, propertyPaths); |
|
| 117 |
// defaultBeanInitializer.initializeAll(childNodes, propertyPaths);
|
|
| 118 | 118 |
return childNodes; |
| 119 | 119 |
} |
| 120 | 120 |
|
| ... | ... | |
| 141 | 141 |
* {@inheritDoc}
|
| 142 | 142 |
*/ |
| 143 | 143 |
@Override |
| 144 |
public List<UuidAndTitleCache<TaxonNode>> listChildNodesAsUuidAndTitleCache(UuidAndTitleCache<TaxonNode> parent) {
|
|
| 144 |
public List<TaxonNodeDto> listChildNodesAsUuidAndTitleCache(UuidAndTitleCache<TaxonNode> parent) {
|
|
| 145 | 145 |
return dao.listChildNodesAsUuidAndTitleCache(parent); |
| 146 | 146 |
} |
| 147 | 147 |
|
| ... | ... | |
| 157 | 157 |
* {@inheritDoc}
|
| 158 | 158 |
*/ |
| 159 | 159 |
@Override |
| 160 |
public List<UuidAndTitleCache<TaxonNode>> listChildNodesAsUuidAndTitleCache(ITaxonTreeNode parent) {
|
|
| 160 |
public List<TaxonNodeDto> listChildNodesAsUuidAndTitleCache(ITaxonTreeNode parent) {
|
|
| 161 | 161 |
UUID uuid = parent.getUuid(); |
| 162 | 162 |
int id = parent.getId(); |
| 163 | 163 |
UuidAndTitleCache<TaxonNode> uuidAndTitleCache = new UuidAndTitleCache<>(uuid, id, null); |
| ... | ... | |
| 587 | 587 |
parent.addChildNode(childNode, childNode.getReference(), childNode.getMicroReference()); |
| 588 | 588 |
} |
| 589 | 589 |
}else{
|
| 590 |
deleteTaxonNodes(node.getChildNodes(), config);
|
|
| 590 |
result.includeResult(deleteTaxonNodes(node.getChildNodes(), config));
|
|
| 591 | 591 |
} |
| 592 | 592 |
|
| 593 | 593 |
if (taxon != null){
|
| ... | ... | |
| 615 | 615 |
parent.removeChild(index); |
| 616 | 616 |
} |
| 617 | 617 |
if (!dao.delete(node, config.getTaxonNodeConfig().getChildHandling().equals(ChildHandling.DELETE)).equals(null)){
|
| 618 |
result.addDeletedObject(node); |
|
| 618 | 619 |
return result; |
| 619 | 620 |
} else {
|
| 620 | 621 |
result.setError(); |
Also available in: Unified diff
adapted deleteResult