Removed duplication of pageNumber & pageNumberString in PSLM;

removed LM.getCurrPageString() in favor of already existing
curPage.getPageString(); switched from LM.getCurrentPageString() to
LM.getCurrentPageViewport()  (latter giving access to the former.)

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

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index a0f789e78d2dc517498b712fb3b604ab70bab6a3..8f62f9775747a3377ec064748def94be26f5e160 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -347,12 +347,12 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     }
 
     /**
-     * Delegate getting the current page number to the parent layout manager.
+     * Delegate getting the current page viewport to the parent layout manager.
      *
      * @see org.apache.fop.layoutmgr.LayoutManager
      */
-    public String getCurrentPageNumberString() {
-        return parentLM.getCurrentPageNumberString();
+    public PageViewport getCurrentPageViewport() {
+        return parentLM.getCurrentPageViewport();
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index 6223d1bce3e649635dd5f548147a80fd1882cbd8..4b9159b8c51f9f52ee860ea42c79cf98bcd41324 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -251,8 +251,8 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
             Position bp2) { }
 
     /** @see org.apache.fop.layoutmgr.LayoutManager */
-    public String getCurrentPageNumberString() {
-        return parentLM.getCurrentPageNumberString();
+    public PageViewport getCurrentPageViewport() {
+        return parentLM.getCurrentPageViewport();
     }
 
     /** @see org.apache.fop.layoutmgr.LayoutManager */

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 768b6f4f0902913dce72623ba3e11fbb610f68df..0b473786b0b16f1c327e0aab57cc51d9e8a0f847 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -168,11 +168,11 @@ public interface LayoutManager {
     void addAreas(PositionIterator posIter, LayoutContext context);
 
     /**
-     * Get the string of the current page number.
+     * Get the PageViewport currently being generated
      *
-     * @return the string for the current page number
+     * @return the current PageViewport
      */
-    String getCurrentPageNumberString();
+    PageViewport getCurrentPageViewport();
 
     /**
      * Resolve the id reference.

diff --git a/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
index 89298bb699e3975bd21422f5e5025d1fe0165ce1..305a0725a6d9827b045d7da4478b6629d28ec6e3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
@@ -46,7 +46,7 @@ public class PageNumberLayoutManager extends LeafNodeLayoutManager {
     public InlineArea get(LayoutContext context) {
         // get page string from parent, build area
         TextArea inline = new TextArea();
-        String str = parentLM.getCurrentPageNumberString();
+        String str = parentLM.getCurrentPageViewport().getPageNumberString();
         int width = 0;
         for (int count = 0; count < str.length(); count++) {
             width += font.getCharWidth(str.charAt(count));

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index f83d79790dd9ee70647e6a94bf1e9b2fa0d3f236..ad88b662bfbcec86f768781a89df5a71f518c9cc 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -64,7 +64,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
 
     private int startPageNum = 0;
     private int currentPageNum = 0;
-    private String pageNumberString;
 
     /** Current page being worked on. */
     private PageViewport curPage = null;
@@ -129,7 +128,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
     public void activateLayout() {
         startPageNum = pageSeq.getStartingPageNumber();
         currentPageNum = startPageNum - 1;
-        pageNumberString = pageSeq.makeFormattedPageNumber(currentPageNum);
 
         LineArea title = null;
 
@@ -268,16 +266,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         return null;
     }
 
-    /**
-     * Get the current page number string.
-     * This returns the formatted string for the current page.
-     *
-     * @return the formatted page number string
-     */
-    public String getCurrentPageNumberString() {
-        return pageNumberString;
-    }
-    
     /**
      * Provides access to the current page.
      * @return the current PageViewport
@@ -415,7 +403,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         }
 
         currentPageNum++;
-        pageNumberString = pageSeq.makeFormattedPageNumber(currentPageNum);
+        String pageNumberString = pageSeq.makeFormattedPageNumber(currentPageNum);
 
         try {
             // create a new page
@@ -485,7 +473,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         MinOptMax range = new MinOptMax(rv.getRegionReference().getIPD());
         lm.doLayout(reg, lm, range);
         
-        
         /*
         while (!lm.isFinished()) {
             BreakPoss bp = lm.getNextBreakPoss(childLC);