-// $Id$\r
/**\r
* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
+* European Distributed Institute of Taxonomy\r
* http://www.e-taxonomy.eu\r
-* \r
+*\r
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao;\r
import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
\r
-public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO extends IAnnotatableDao<T>> extends VersionableServiceBase<T, DAO>\r
+public abstract class AnnotatableServiceBase<T extends AnnotatableEntity,DAO extends IAnnotatableDao<T>>\r
+ extends VersionableServiceBase<T, DAO>\r
implements IAnnotatableService<T> {\r
- @Transactional(readOnly = true)\r
+\r
+ @Override\r
+ @Transactional(readOnly = true)\r
public Pager<Annotation> getAnnotations(T annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
- Integer numberOfResults = dao.countAnnotations(annotatedObj, status);\r
- \r
- List<Annotation> results = new ArrayList<Annotation>();\r
- if(numberOfResults > 0) { // no point checking again\r
- results = dao.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); \r
+ long numberOfResults = dao.countAnnotations(annotatedObj, status);\r
+\r
+ List<Annotation> results = new ArrayList<>();\r
+ if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
+ results = dao.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths);\r
}\r
- \r
- return new DefaultPagerImpl<Annotation>(pageNumber, numberOfResults, pageSize, results);\r
+\r
+ return new DefaultPagerImpl<>(pageNumber, numberOfResults, pageSize, results);\r
}\r
- \r
- @Transactional(readOnly = true)\r
+\r
+ @Override\r
+ @Transactional(readOnly = true)\r
public Pager<Marker> getMarkers(T annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {\r
- Integer numberOfResults = dao.countMarkers(annotatableEntity, technical);\r
- \r
- List<Marker> results = new ArrayList<Marker>();\r
- if(numberOfResults > 0) { // no point checking again\r
+ long numberOfResults = dao.countMarkers(annotatableEntity, technical);\r
+\r
+ List<Marker> results = new ArrayList<>();\r
+ if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)\r
results = dao.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths);\r
}\r
- \r
- return new DefaultPagerImpl<Marker>(pageNumber, numberOfResults, pageSize, results);\r
+\r
+ return new DefaultPagerImpl<>(pageNumber, numberOfResults, pageSize, results);\r
}\r
- \r
\r
- @Transactional(readOnly = true)\r
+\r
+ @Override\r
+ @Transactional(readOnly = true)\r
public List<Object[]> groupMarkers(Class<? extends T> clazz, Boolean technical, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {\r
return dao.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths);\r
}\r
\r
- @Transactional(readOnly = true)\r
+ @Override\r
+ @Transactional(readOnly = true)\r
public int countMarkers(Class<? extends T> clazz, Boolean technical) {\r
return dao.countMarkers(clazz, technical);\r
}\r
+\r
+\r
+\r
+\r
}\r