BGBM BDI Projects
/
cdmlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/5.32.0'
[cdmlib.git]
/
cdmlib-services
/
src
/
main
/
java
/
eu
/
etaxonomy
/
cdm
/
api
/
service
/
PolytomousKeyNodeServiceImpl.java
diff --git
a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
index 78a9422f4a88a1e080e135c5cf8fc497402795a2..b6e09b28978bd5c4a840743a9c0f12b6f56e503d 100644
(file)
--- a/
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
+++ b/
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
@@
-25,12
+25,12
@@
import eu.etaxonomy.cdm.persistence.dao.description.IPolytomousKeyNodeDao;
/**
* @author a.kohlbecker
* @since 24.03.2011
/**
* @author a.kohlbecker
* @since 24.03.2011
- *
*/
@Service
@Transactional(readOnly = false)
*/
@Service
@Transactional(readOnly = false)
-public class PolytomousKeyNodeServiceImpl extends VersionableServiceBase<PolytomousKeyNode, IPolytomousKeyNodeDao> implements IPolytomousKeyNodeService {
-
+public class PolytomousKeyNodeServiceImpl
+ extends VersionableServiceBase<PolytomousKeyNode, IPolytomousKeyNodeDao>
+ implements IPolytomousKeyNodeService {
@Override
@Autowired
@Override
@Autowired
@@
-46,8
+46,8
@@
public class PolytomousKeyNodeServiceImpl extends VersionableServiceBase<Polyto
DeleteResult result = new DeleteResult();
PolytomousKeyNode node = dao.findByUuid(nodeUUID);
node = HibernateProxyHelper.deproxy(node);
DeleteResult result = new DeleteResult();
PolytomousKeyNode node = dao.findByUuid(nodeUUID);
node = HibernateProxyHelper.deproxy(node);
- if(node == null) {
- // result.addException(new Exception("The polytomouskey node was already deleted."));
;
+ if
(node == null) {
+ // result.addException(new Exception("The polytomouskey node was already deleted."));
return result;
}
List<PolytomousKeyNode> children = new ArrayList<>();
return result;
}
List<PolytomousKeyNode> children = new ArrayList<>();
@@
-64,17
+64,14
@@
public class PolytomousKeyNodeServiceImpl extends VersionableServiceBase<Polyto
}
if(!deleteChildren){
}
if(!deleteChildren){
-
for (PolytomousKeyNode child: children){
if (!child.equals(node)){
parent.addChild(child);
dao.saveOrUpdate(child);
result.addUpdatedObject(child);
}
for (PolytomousKeyNode child: children){
if (!child.equals(node)){
parent.addChild(child);
dao.saveOrUpdate(child);
result.addUpdatedObject(child);
}
-
}
}
-
dao.saveOrUpdate(node);
result.addUpdatedObject(node);
}
dao.saveOrUpdate(node);
result.addUpdatedObject(node);
}
@@
-102,7
+99,5
@@
public class PolytomousKeyNodeServiceImpl extends VersionableServiceBase<Polyto
}
return result;
}
return result;
-
}
}
-
-}
+}
\ No newline at end of file