Created new Root.notifyPageSequenceFinished() method, consolidating

two other methods to better stress that these occur as a unit.


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198460 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 11 deletions

diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index 42e7bfdc5..ffe6ea971 100644
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -159,14 +159,6 @@ public class Root extends FObj {
     }
 
     /**
-     * Sets the last page number by the just-finished page-sequence
-     * @param lastPageNumber the last page number of the sequence
-     */
-    public void setEndingPageNumberOfPreviousSequence(int lastPageNumber) {
-        endingPageNumberOfPreviousSequence = lastPageNumber;
-    }
-
-    /**
      * Returns the total number of pages generated by FOP
      * (May not equal endingPageNumberOfPreviousSequence due to
      * initial-page-number property on fo:page-sequences.)
@@ -178,16 +170,19 @@ public class Root extends FObj {
 
     /**
      * Notify additional pages generated to increase the totalPagesGenerated counter
-     * @param lastPageNumber the last page number of the sequence
+     * @param lastPageNumber the last page number generated by the sequence
+     * @param additionalPages the total pages generated by the sequence (for statistics)
      * @throws IllegalArgumentException for negative additional page counts
      */
-    public void notifyAdditionalPagesGenerated(int additionalPages) {
+    public void notifyPageSequenceFinished(int lastPageNumber, int additionalPages) {    
+        
         if (additionalPages >= 0) {
             totalPagesGenerated += additionalPages;
+            endingPageNumberOfPreviousSequence = lastPageNumber;           
         } else {
             throw new IllegalArgumentException(
                 "Number of additional pages must be zero or greater.");
-        }
+        }       
     }
 
     /**