aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorGlen Mazza <gmazza@apache.org>2005-02-05 07:39:12 +0000
committerGlen Mazza <gmazza@apache.org>2005-02-05 07:39:12 +0000
commit0595a4565b50ef41330bd83b645fe96e47373528 (patch)
treea34bd9c08eb60afa652546a5c15d1072cdb76f3d /src/java
parente9849885b0c2300380703300f7a5ab0fea7a3249 (diff)
downloadxmlgraphics-fop-0595a4565b50ef41330bd83b645fe96e47373528.tar.gz
xmlgraphics-fop-0595a4565b50ef41330bd83b645fe96e47373528.zip
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
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/area/AreaTreeHandler.java2
-rw-r--r--src/java/org/apache/fop/fo/pagination/Root.java2
-rw-r--r--src/java/org/apache/fop/fo/pagination/Title.java6
-rw-r--r--src/java/org/apache/fop/render/mif/MIFHandler.java2
4 files changed, 3 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java
index e7fcf678b..60fb63ee2 100644
--- 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 e759a0eb2..639eab7f9 100644
--- 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 b64a9beec..a87b6031e 100644
--- 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 833659e53..78f108f82 100644
--- 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);
}
}