1. extract method getSimpleMasterPageToUse()

2. clean up signature for createPage()

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

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index bee9a73363494dc504b4bd7a9cbdca603eabb654..e31e33770b87f397e271f9faf88b95b32e86bc59 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -450,7 +450,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
     private PageViewport makeNewPage(boolean bIsBlank, boolean bIsLast) {
         finishPage();
         try {
-            curPage = createPage(pageSequence, pageCount, bIsBlank, isFirstPage, bIsLast);
+            curPage = createPage(bIsBlank, bIsLast);
             isFirstPage = false;
         } catch (FOPException fopex) { /* ???? */
             fopex.printStackTrace();
@@ -710,29 +710,16 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
     }
 
     /**
-     * Called by PageLayoutManager when it needs a new page on which to
-     * place content. The PageSequence manages the page number (odd/even),
-     * but the PLM tells it if the page is blank or is the last page.
+     * Called when a new page is needed.
      *
-     * @param pageNumber the page number to create page for
      * @param bIsBlank If true, use a master for a blank page.
-     * @param firstPage true if this is the first page
      * @param bIsLast If true, use the master for the last page in the sequence.
      * @return the page viewport created for the page number
      * @throws FOPException if there is an error creating page
      */
-    public PageViewport createPage(PageSequence pageSequence, int pageNumber,
-                                   boolean bIsBlank, boolean firstPage,
-                                   boolean bIsLast)
+    public PageViewport createPage(boolean bIsBlank, boolean bIsLast)
                                    throws FOPException {
-        if (pageSequence.getPageSequenceMaster() == null) {
-            currentSimplePageMaster = pageSequence.getSimplePageMaster();
-        } else {
-            currentSimplePageMaster = pageSequence.getPageSequenceMaster()
-              .getNextSimplePageMaster(((pageNumber % 2) == 1),
-                                       firstPage,
-                                       bIsBlank);
-        }
+        currentSimplePageMaster = getSimpleMasterPageToUse(bIsBlank);
         Region body = currentSimplePageMaster.getRegion(Region.BODY);
         if (!pageSequence.getMainFlow().getFlowName().equals(body.getRegionName())) {
           throw new FOPException("Flow '" + pageSequence.getMainFlow().getFlowName()
@@ -740,7 +727,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
                                  + currentSimplePageMaster.getMasterName() + "'");
         }
         PageMaster pageMaster = currentSimplePageMaster.getPageMaster();
-        if ( pageMaster == null) {
+        if (pageMaster == null) {
             createSimplePageMasterAreas(currentSimplePageMaster);
         }
         pageMaster = currentSimplePageMaster.getPageMaster();
@@ -758,6 +745,16 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
         //forcePage(areaTree, firstAvailPageNumber);
     }
 
+    private SimplePageMaster getSimpleMasterPageToUse(boolean bIsBlank)
+            throws FOPException {
+        if (pageSequence.getPageSequenceMaster() == null) {
+            return pageSequence.getSimplePageMaster();
+        }
+        boolean isOddPage = ((pageCount % 2) == 1);
+        return pageSequence.getPageSequenceMaster()
+              .getNextSimplePageMaster(isOddPage, isFirstPage, bIsBlank);
+    }
+
     public void createSimplePageMasterAreas(SimplePageMaster node) {
         int pageWidth =
                 node.properties.get("page-width").getLength().getValue();