Use a more direct notify mechanism for the formatting results

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

diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java
index 5619dcbb63765986afc1c68e8c4bd1d837daa9c9..47b5c163468ba20a0077c71d4fb1d189ff5e2dfe 100644 (file)
--- a/src/java/org/apache/fop/area/AreaTreeHandler.java
+++ b/src/java/org/apache/fop/area/AreaTreeHandler.java
@@ -272,14 +272,16 @@ public class AreaTreeHandler extends FOEventHandler {
             pageSLM = getLayoutManagerMaker().makePageSequenceLayoutManager(
                     this, pageSequence);
             pageSLM.activateLayout();
-            this.results.haveFormattedPageSequence(pageSequence, 
-                    getAreaTreeModel().getPageCount(getAreaTreeModel().getPageSequenceCount()));
-            if (log.isDebugEnabled()) {
-                log.debug("Last page-sequence produced " 
-                        + getAreaTreeModel().getPageCount(
-                                getAreaTreeModel().getPageSequenceCount())
-                        + " pages.");
-            }
+        }
+    }
+
+    public void notifyPageSequenceFinished(PageSequence pageSequence,
+                                           int pageCount) {
+        this.results.haveFormattedPageSequence(pageSequence, 
+                                               pageCount);
+        if (log.isDebugEnabled()) {
+            log.debug("Last page-sequence produced " 
+                    + pageCount + " pages.");
         }
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index e5e73066016a8cac6b4a3cd3599d55b9781f5deb..c052bf94e28cb5a8086d4e5413e8219ad44d23de 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -149,6 +149,8 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         finishPage();
         pageSeq.getRoot().notifyPageSequenceFinished(currentPageNum,
                 (currentPageNum - startPageNum) + 1);
+        areaTreeHandler.notifyPageSequenceFinished(pageSeq,
+                (currentPageNum - startPageNum) + 1);
         log.debug("Ending layout");
     }