X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/6ed36ca86db6e135dbb438374629622d461a8ad1..ca3c7088bd59b1444a83b581eb37919b1b73fe24:/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java?ds=sidebyside

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
index bc9833f4bf..ba8bf7c078 100644
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java
@@ -21,7 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import eu.etaxonomy.cdm.api.service.config.FeatureNodeDeletionConfigurator;
+import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.persistence.dao.description.IFeatureNodeDao;
@@ -37,6 +40,9 @@ public class FeatureTreeServiceImpl extends IdentifiableServiceBase<FeatureTree,
     @Autowired
     private IVocabularyService vocabularyService;
 
+    @Autowired
+    private IFeatureNodeService featureNodeService;
+
     @Override
     @Autowired
     protected void setDao(IFeatureTreeDao dao) {
@@ -111,7 +117,7 @@ public class FeatureTreeServiceImpl extends IdentifiableServiceBase<FeatureTree,
         if(featureTree == null){
             throw new EntityNotFoundException("No FeatureTree entity found for " + uuid);
         }
-        dao.loadNodes(featureTree.getRoot(),nodePaths);
+        dao.deepLoadNodes(featureTree.getRoot().getChildNodes() ,nodePaths);
         return featureTree;
     }
 
@@ -137,6 +143,23 @@ public class FeatureTreeServiceImpl extends IdentifiableServiceBase<FeatureTree,
         return load(IFeatureTreeDao.DefaultFeatureTreeUuid);
     }
 
+    @Override
+    public DeleteResult delete(UUID featureTreeUuid){
+        DeleteResult result = new DeleteResult();
+        FeatureTree tree = dao.load(featureTreeUuid);
+
+        FeatureNode rootNode = HibernateProxyHelper.deproxy(tree.getRoot(), FeatureNode.class);
+        FeatureNodeDeletionConfigurator config = new FeatureNodeDeletionConfigurator();
+        config.setChildHandling(ChildHandling.DELETE);
+        result =featureNodeService.deleteFeatureNode(rootNode.getUuid(), config);
+        tree.setRoot(null);
+        if (result.isOk()){
+          dao.delete(tree);
+        }
+        return result;
+
+    }
+
 
 
 }