ref #6065 improved Pager handling

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
index 54340a831e1a3e98c28bfad36c864e00bbf599ed..f37a353a6b8b1a565a604fce06a5164e675d0398 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
@@ -118,29 +118,21 @@ public class TaxonNodeServiceImpl extends AnnotatableServiceBase<TaxonNode, ITax
 
         allRecords.addAll(synList);
 
-
         List<TaxonNodeDto> dtos = new ArrayList<>(pageSize==null?25:pageSize);
-        Integer start = PagerUtils.startFor(pageSize, pageIndex);
-        Integer limit = PagerUtils.limitFor(pageSize);
-        limit = limit == null ? Integer.MAX_VALUE : limit;
         Long totalCount = Long.valueOf(allRecords.size());
 
-            TaxonNameBase<?,?> parentName = null;
-
-//            for(int i = start; i < Math.min(totalCount, start + limit); i++) {
-            for(CdmBase record : PagerUtils.pageList(allRecords, pageIndex, pageSize)) {
-                if (record.isInstanceOf(TaxonNode.class)){
-                    dtos.add(new TaxonNodeDto(CdmBase.deproxy(record, TaxonNode.class)));
-                }else if (record.isInstanceOf(Synonym.class)){
-                    Synonym synonym = CdmBase.deproxy(record, Synonym.class);
-                    parentName = parentName == null? parentNode.getTaxon().getName(): parentName;
-                    boolean isHomotypic = synonym.getName().isHomotypic(parentName);
-                    dtos.add(new TaxonNodeDto(synonym, isHomotypic));
-                }
-            }
-
-//        }
+        TaxonNameBase<?,?> parentName = null;
 
+        for(CdmBase record : PagerUtils.pageList(allRecords, pageIndex, pageSize)) {
+            if (record.isInstanceOf(TaxonNode.class)){
+                dtos.add(new TaxonNodeDto(CdmBase.deproxy(record, TaxonNode.class)));
+            }else if (record.isInstanceOf(Synonym.class)){
+                Synonym synonym = CdmBase.deproxy(record, Synonym.class);
+                parentName = parentName == null? parentNode.getTaxon().getName(): parentName;
+                boolean isHomotypic = synonym.getName().isHomotypic(parentName);
+                dtos.add(new TaxonNodeDto(synonym, isHomotypic));
+            }
+        }
         return new DefaultPagerImpl<TaxonNodeDto>(pageIndex, totalCount, pageSize , dtos);
     }