PR:

Obtained from:
Submitted by:
Reviewed by:
Switch to Root's page number counter.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198379 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 e7fcf678bf3d6457582c7f470aaee351a4671a24..60fb63ee2c5f51b26d5f4f375329b92c78b516fb 100644 (file)
--- a/src/java/org/apache/fop/area/AreaTreeHandler.java
+++ b/src/java/org/apache/fop/area/AreaTreeHandler.java
@@ -272,7 +272,7 @@ public class AreaTreeHandler extends FOEventHandler {
             log.debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
             log.debug("Total memory used: " + memoryUsed + "Kb");
             log.debug("Total time used: " + timeUsed + "ms");
-            log.debug("Pages rendered: " + pageCount);
+            log.debug("Pages rendered: " + rootFObj.getRunningPageNumberCounter());
             if (pageCount > 0) {
                 log.debug("Avg render time: " + (timeUsed / pageCount) + "ms/page");
             }

diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index e759a0eb2bae03bf070de26b94791f339aba9c1f..639eab7f9ff464eddf9c56776cd7adfbd2ae9eb4 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -153,7 +153,7 @@ public class Root extends FObj {
      * Returns the number of pages generated (over all PageSequence instances).
      * @return the number of pages
      */
-    protected int getRunningPageNumberCounter() {
+    public int getRunningPageNumberCounter() {
         return this.runningPageNumberCounter;
     }
 

diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java
index b64a9beecb7c503645a0246501ea7099c24477eb..a87b6031efd826183ec1cb3422d5be02bad7214c 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/Title.java
+++ b/src/java/org/apache/fop/fo/pagination/Title.java
@@ -33,7 +33,7 @@ import org.apache.fop.fo.flow.InlineLevel;
  */
 public class Title extends InlineLevel {
     // The value of properties relevant for fo:title.
-    // See also superclass InlineLevel
+    // See superclass InlineLevel
     // End of property values
 
     /**
@@ -43,10 +43,6 @@ public class Title extends InlineLevel {
         super(parent);
     }
 
-    public void bind(PropertyList pList) throws FOPException {
-        super.bind(pList);
-    }
-
     /**
      * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
         XSL/FOP: (#PCDATA|%inline;)*

diff --git a/src/java/org/apache/fop/render/mif/MIFHandler.java b/src/java/org/apache/fop/render/mif/MIFHandler.java
index 833659e5367f90b0b8cc005f5bbbe83ee0163c55..78f108f82c899419fa29cc742a4dd0ad0f90ca07 100644 (file)
--- a/src/java/org/apache/fop/render/mif/MIFHandler.java
+++ b/src/java/org/apache/fop/render/mif/MIFHandler.java
@@ -148,8 +148,6 @@ public class MIFHandler extends FOEventHandler {
            textRect.addElement(prop);
            page.addElement(textRect);
 
-
-
            mifFile.addPage(page);
         }
     }