Backtracked a bit with SCLM: switched to providing the Region FO

instead of the region-reference-area, the latter obtainable already
from getCurrentPV().

Switched to a tighter 3-param SCLM constructor, also new
convenience method in PV.


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

1 files changed, 9 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
index 4b235c09d..d47cd059f 100644
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
@@ -56,6 +56,7 @@ import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.flow.Wrapper;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.fo.pagination.SideRegion;
 import org.apache.fop.fo.pagination.StaticContent;
 import org.apache.fop.fo.pagination.Title;
 import org.apache.fop.area.AreaTreeHandler;
@@ -118,7 +119,6 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
         makers.put(TableFooter.class, new /*TableBodyLayoutManager*/Maker());
         makers.put(TableHeader.class, new /*TableBodyLayoutManager*/Maker());
         makers.put(Flow.class, new FlowLayoutManagerMaker());
-        makers.put(StaticContent.class, new StaticContentLayoutManagerMaker());
         makers.put(Wrapper.class, new WrapperLayoutManagerMaker());
         makers.put(Title.class, new InlineLayoutManagerMaker());
     }
@@ -158,6 +158,14 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
         return new PageSequenceLayoutManager(ath, ps);
     }
 
+    /*
+     * @see org.apache.fop.layoutmgr.LayoutManagerMaker#makeStaticContentLayoutManager(org.apache.fop.layoutmgr.PageSequenceLayoutManager, org.apache.fop.fo.pagination.StaticContent, org.apache.fop.fo.pagination.Region)
+     */
+    public StaticContentLayoutManager makeStaticContentLayoutManager(
+            PageSequenceLayoutManager pslm, StaticContent sc, SideRegion reg) {
+        return new StaticContentLayoutManager(pslm, sc, reg);
+    }
+    
     public static class Maker {
         public void make(FONode node, List lms) {
             // no layout manager
@@ -389,12 +397,6 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
          }
     }
 
-    public static class StaticContentLayoutManagerMaker extends Maker {
-         public void make(FONode node, List lms) {
-             lms.add(new StaticContentLayoutManager((StaticContent) node));
-         }
-    }
-
     public class WrapperLayoutManagerMaker extends Maker {
         public void make(FONode node, List lms) {
             Iterator baseIter;