Pulled out the AreaTreeHandler from the LayoutManager interface, only

its LayoutManagerMaker (now included) was being called.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198557 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 7c6030b84e906d5c5322700b2f1512ee1da2794d..a0f789e78d2dc517498b712fb3b604ab70bab6a3 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -23,7 +23,6 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Resolvable;
 import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.AreaTreeHandler;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.flow.RetrieveMarker;
 import org.apache.fop.fo.flow.Marker;
@@ -422,13 +421,13 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     }
 
     /**
-     * Delegate getAreaTreeHandler to the parent layout manager.
+     * Delegate getLayoutManagerMaker to the parent layout manager.
      *
      * @see org.apache.fop.layoutmgr.LayoutManager
-     * @return the AreaTreeHandler object.
+     * @return the LayoutManagerMaker object.
      */
-    public AreaTreeHandler getAreaTreeHandler() {
-        return parentLM.getAreaTreeHandler();
+    public LayoutManagerMaker getLayoutManagerMaker() {
+        return parentLM.getLayoutManagerMaker();
     }
 
     /**
@@ -470,7 +469,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
                 FONode foNode = (FONode) theobj;
                 foNode = handleRetrieveMarker(foNode);
                 if (foNode != null) {
-                    getAreaTreeHandler().getLayoutManagerMaker().
+                    getLayoutManagerMaker().
                         makeLayoutManagers(foNode, newLMs);
                 }
             }

diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index da351aa210ecb892e8996d217f161dcf54cb4058..6223d1bce3e649635dd5f548147a80fd1882cbd8 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -24,7 +24,6 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.pagination.Title;
 import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.area.Area;
-import org.apache.fop.area.AreaTreeHandler;
 import org.apache.fop.area.LineArea;
 import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.area.Resolvable;
@@ -47,7 +46,6 @@ import org.apache.commons.logging.LogFactory;
  */
 public class ContentLayoutManager implements InlineLevelLayoutManager {
     private FOUserAgent userAgent;
-    private AreaTreeHandler areaTreeHandler;
     private Area holder;
     private int stackSize;
     private LayoutManager parentLM;
@@ -284,10 +282,10 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
 
     /**
      * @see org.apache.fop.layoutmgr.LayoutManager
-     * @return the AreaTreeHandler object.
+     * @return the LayoutManagerMaker object.
      */
-    public AreaTreeHandler getAreaTreeHandler() {
-        return parentLM.getAreaTreeHandler();
+    public LayoutManagerMaker getLayoutManagerMaker() {
+        return parentLM.getLayoutManagerMaker();
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 9c88651e9f0d08df882b957e22935aa2b291925c..768b6f4f0902913dce72623ba3e11fbb610f68df 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -27,7 +27,6 @@ import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Resolvable;
 import org.apache.fop.area.PageViewport;
-import org.apache.fop.area.AreaTreeHandler;
 import org.apache.fop.fo.FObj;
 
 /**
@@ -226,9 +225,9 @@ public interface LayoutManager {
     Marker retrieveMarker(String name, int pos, int boundary);
 
     /**
-     * @return the AreaTreeHandler object.
+     * @return the LayoutManagerMaker object.
      */
-    AreaTreeHandler getAreaTreeHandler();
+    LayoutManagerMaker getLayoutManagerMaker();
 
     /**
      * Load next child LMs, up to child LM index pos

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index a5148c81031ef2e7497403cf1a82017672f17afc..f83d79790dd9ee70647e6a94bf1e9b2fa0d3f236 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -115,10 +115,10 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
 
     /**
      * @see org.apache.fop.layoutmgr.LayoutManager
-     * @return the AreaTreeHandler object
+     * @return the LayoutManagerMaker object
      */
-    public AreaTreeHandler getAreaTreeHandler() {
-        return areaTreeHandler;
+    public LayoutManagerMaker getLayoutManagerMaker() {
+        return areaTreeHandler.getLayoutManagerMaker();
     }
 
     /**