move fo/pagination/StaticContent.getLayoutManager() to layoutmgr/PageLayoutManager...

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

diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java
index 39c5d311783a477aa68be68e42ba57a41ec3a56e..a996e2e5dae8053b1a7763c3d21dda9546b6cd75 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/StaticContent.java
+++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java
@@ -54,7 +54,6 @@ package org.apache.fop.fo.pagination;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTreeVisitor;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.layoutmgr.StaticContentLayoutManager;
 
 /**
  * Class modelling the fo:static-content object. See Sec. 6.4.19 of the XSL-FO
@@ -87,20 +86,6 @@ public class StaticContent extends Flow {
 
     }
 
-    private StaticContentLayoutManager lm;
-
-    /**
-     * @return this object's layout manager
-     */
-    public StaticContentLayoutManager getLayoutManager() {
-        if (lm == null) {
-            lm = new StaticContentLayoutManager();
-            lm.setUserAgent(getUserAgent());
-            lm.setFObj(this);
-        }
-        return lm;
-    }
-
     /**
      * This is a hook for an FOTreeVisitor subclass to be able to access
      * this object.

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index b9b4ae602b9db81e50eab567e245973b5855b49d..d37f24fd86381fc22d06179d4b99df651439d129 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -479,7 +479,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
         if (reg == null) {
             getLogger().error("no region viewport: shouldn't happen");
         }
-        StaticContentLayoutManager lm = flow.getLayoutManager();
+        StaticContentLayoutManager lm = getStaticContentLayoutManager(flow);
         lm.setUserAgent(getUserAgent());
         lm.init();
         lm.setRegionReference(reg.getRegion());
@@ -891,4 +891,14 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
                 r.getPropertyManager().getWritingMode(), absRegVPRect, reldims));
     }
 
+    /**
+     * @return a StaticContent layout manager
+     */
+    public StaticContentLayoutManager getStaticContentLayoutManager(StaticContent sc) {
+        StaticContentLayoutManager lm = new StaticContentLayoutManager();
+        lm.setUserAgent(getUserAgent());
+        lm.setFObj(sc);
+        return lm;
+    }
+
 }