diff options
Diffstat (limited to 'src/java/org/apache/fop/area')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/area/CachedRenderPagesModel.java b/src/java/org/apache/fop/area/CachedRenderPagesModel.java index d09f00001..6c3d1cc1a 100644 --- a/src/java/org/apache/fop/area/CachedRenderPagesModel.java +++ b/src/java/org/apache/fop/area/CachedRenderPagesModel.java @@ -83,7 +83,7 @@ public class CachedRenderPagesModel extends RenderPagesModel { if (!p.isResolved()) { String[] idrefs = p.getIDRefs(); for (int count = 0; count < idrefs.length; count++) { - log.warn("Page " + p.getPageNumber() + + log.warn("Page " + p.getPageNumberString() + ": Unresolved id reference \"" + idrefs[count] + "\" found."); } diff --git a/src/java/org/apache/fop/area/PageViewport.java b/src/java/org/apache/fop/area/PageViewport.java index 74a491614..90f3aaba6 100644 --- a/src/java/org/apache/fop/area/PageViewport.java +++ b/src/java/org/apache/fop/area/PageViewport.java @@ -42,7 +42,7 @@ public class PageViewport implements Resolvable, Cloneable { private Page page; private Rectangle2D viewArea; private boolean clip = false; - private String pageNumber = null; + private String pageNumberString = null; // list of id references and the rectangle on the page private Map idReferences = null; @@ -100,16 +100,16 @@ public class PageViewport implements Resolvable, Cloneable { * Set the page number for this page. * @param num the string representing the page number */ - public void setPageNumber(String num) { - pageNumber = num; + public void setPageNumberString(String num) { + pageNumberString = num; } /** * Get the page number of this page. * @return the string that represents this page */ - public String getPageNumber() { - return pageNumber; + public String getPageNumberString() { + return pageNumberString; } /** @@ -368,7 +368,7 @@ public class PageViewport implements Resolvable, Cloneable { public String toString() { StringBuffer sb = new StringBuffer(64); sb.append("PageViewport: page="); - sb.append(getPageNumber()); + sb.append(getPageNumberString()); return sb.toString(); } } diff --git a/src/java/org/apache/fop/area/RenderPagesModel.java b/src/java/org/apache/fop/area/RenderPagesModel.java index c28b7fb61..b16a1c71a 100644 --- a/src/java/org/apache/fop/area/RenderPagesModel.java +++ b/src/java/org/apache/fop/area/RenderPagesModel.java @@ -151,7 +151,7 @@ public class RenderPagesModel extends StorePagesModel { if (!p.isResolved()) { String[] idrefs = p.getIDRefs(); for (int count = 0; count < idrefs.length; count++) { - log.warn("Page " + p.getPageNumber() + + log.warn("Page " + p.getPageNumberString() + ": Unresolved id reference \"" + idrefs[count] + "\" found."); } diff --git a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java index 09115fdf8..29a4438f4 100644 --- a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java +++ b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java @@ -65,7 +65,7 @@ public class UnresolvedPageNumber extends TextArea implements Resolvable { if (pageIDRef.equals(id) && pages != null) { resolved = true; PageViewport page = (PageViewport)pages.get(0); - text = page.getPageNumber(); + text = page.getPageNumberString(); /**@todo Update IPD ??? */ } } |