Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / AnnotationService.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
index 27b3baaf583634dddf97748730e5859c6c4768be..2d361b132894db1bc21ff1245120a9a3ff32455f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
  * Copyright (C) 2007 EDIT
  * European Distributed Institute of Taxonomy
@@ -22,7 +21,7 @@ import eu.etaxonomy.cdm.api.service.pager.impl.DefaultPagerImpl;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.permission.User;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotationDaoImpl;
 import eu.etaxonomy.cdm.persistence.query.OrderHint;
 
@@ -38,13 +37,13 @@ public class AnnotationService extends AnnotatableServiceBase<Annotation, Annota
        }
 
        @Override
-    public int count(Person commentator, MarkerType status) {
+    public long count(Person commentator, MarkerType status) {
                return dao.count(commentator, status);
        }
 
        @Override
     public Pager<Annotation> list(Person commentator, MarkerType status,Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths) {
-               Integer numberOfResults = dao.count(commentator, status);
+               Long numberOfResults = dao.count(commentator, status);
 
                List<Annotation> results = new ArrayList<Annotation>();
                if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
@@ -55,16 +54,16 @@ public class AnnotationService extends AnnotatableServiceBase<Annotation, Annota
        }
 
        @Override
-    public int count(User creator, MarkerType status) {
+    public long count(User creator, MarkerType status) {
                return dao.count(creator, status);
        }
 
        @Override
     public Pager<Annotation> list(User creator, MarkerType status,     Integer pageSize, Integer pageNumber, List<OrderHint> orderHints,
                        List<String> propertyPaths) {
-        Integer numberOfResults = dao.count(creator, status);
+        long numberOfResults = dao.count(creator, status);
 
-               List<Annotation> results = new ArrayList<Annotation>();
+               List<Annotation> results = new ArrayList<>();
                if(numberOfResults > 0) { // no point checking again //TODO use AbstractPagerImpl.hasResultsInRange(numberOfResults, pageNumber, pageSize)
                        results = dao.list(creator, status, pageSize, pageNumber, orderHints, propertyPaths);
                }