Minor simplification to layoutStaticContent() method.

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

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 390e7ba96f5f9f3fbbabc1beee8f3e5a2a7f8254..1569990f31258a6e9f4a567589859f60ef8faa1a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -484,7 +484,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager implements
         return curPage;
     }
 
-    private void layoutStaticContent(Region region, int regionClass) {
+    private void layoutStaticContent(Region region) {
         if (region == null) {
             return;
         }
@@ -492,7 +492,8 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager implements
         if (flow == null) {
             return;
         }
-        RegionViewport reg = curPage.getPage().getRegionViewport(regionClass);
+        
+        RegionViewport reg = curPage.getPage().getRegionViewport(region.getNameId());
         if (reg == null) {
             log.error("no region viewport: shouldn't happen");
         }
@@ -511,7 +512,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager implements
                 lm.addAreas(new BreakPossPosIter(vecBreakPoss, 0,
                                                   vecBreakPoss.size()), null);
             } else {
-              log.error("bp==null  cls=" + regionClass);
+              log.error("bp==null  cls=" + region.getRegionName());
             }
         }
         //lm.flush();
@@ -524,14 +525,10 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager implements
         }
         // Layout static content into the regions
         // Need help from pageseq for this
-        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_BEFORE),
-                            FO_REGION_BEFORE);
-        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_AFTER),
-                            FO_REGION_AFTER);
-        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_START),
-                            FO_REGION_START);
-        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_END),
-                            FO_REGION_END);
+        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_BEFORE));
+        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_AFTER));
+        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_START));
+        layoutStaticContent(currentSimplePageMaster.getRegion(FO_REGION_END));
         // Queue for ID resolution and rendering
         areaTreeModel.addPage(curPage);
         curPage = null;