diff artifacts/src/main/java/org/dive4elements/river/artifacts/common/JasperReporter.java @ 9150:23945061daec

gigantic refactoring: exporter, result, results to support multiple jaspers -> collisions
author gernotbelger
date Thu, 14 Jun 2018 16:56:31 +0200
parents 460fcc128794
children 8024e51e828a
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/JasperReporter.java	Thu Jun 14 15:12:25 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/JasperReporter.java	Thu Jun 14 16:56:31 2018 +0200
@@ -79,9 +79,7 @@
             final JasperPrint print = JasperFillManager.fillReport(compiled, this.parameters, source);
             jasperPrintList.add(print);
         } else {
-
-            int totalpagesoffset = 0;
-            int pagesCount = 0;
+            Integer totalpages = 0;
 
             // erstes Rendern, um Seitenzahl zu ermitteln
             for (final JasperDesigner designer : this.designs) {
@@ -91,16 +89,15 @@
                 final MetaAndTableJRDataSource source = designer.getSource();
                 final JasperPrint print = JasperFillManager.fillReport(compiled, this.parameters, source);
 
-                pagesCount = print.getPages().size();
-                designer.setPagesCount(totalpagesoffset);
+                final Integer pagesCount = print.getPages().size();
+                designer.setPagesCount(totalpages);
 
-                totalpagesoffset += pagesCount;
+                totalpages += pagesCount;
             }
-            totalpagesoffset = totalpagesoffset - pagesCount; // offset darf die letzten Seiten nicht beinhalten!
 
             // Sources mit pages machen
             for (final JasperDesigner designer : this.designs) {
-                final JRDataSource sourceWithPages = designer.getSource().withPagePageOffsets(designer.getPagesCount(), totalpagesoffset);
+                final JRDataSource sourceWithPages = designer.getSource().withPagePageOffsets(designer.getPagesCount(), totalpages);
                 sourcesWithPages.add(sourceWithPages);
             }
 

http://dive4elements.wald.intevation.org