Moved AddLMVisitor accessors into FOTreeHandler.

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

diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java
index 68c82cc73080e78aba485a475c30c3ffbc4362b3..68118a57694a95a7b4d191c361f901240b9e89c0 100644 (file)
--- a/src/java/org/apache/fop/apps/Document.java
+++ b/src/java/org/apache/fop/apps/Document.java
@@ -32,8 +32,6 @@ import org.apache.fop.fo.FOInputHandler;
 import org.apache.fop.fo.FOTreeControl;
 import org.apache.fop.fo.extensions.Bookmarks;
 import org.apache.fop.fonts.FontInfo;
-import org.apache.fop.layoutmgr.AddLMVisitor;
-
 
 import org.apache.commons.logging.Log;
 
@@ -60,10 +58,6 @@ public class Document implements FOTreeControl, AreaTreeControl {
 
     private Bookmarks bookmarks = null;
 
-    /** Useful only for allowing subclasses of AddLMVisitor to be set by those
-     extending FOP **/
-     private AddLMVisitor addLMVisitor = null;
-
     /**
      * The current set of id's in the FO tree.
      * This is used so we know if the FO tree contains duplicates.
@@ -142,25 +136,4 @@ public class Document implements FOTreeControl, AreaTreeControl {
         return foInputHandler;
     }
 
-    /**
-     * Public accessor to set the AddLMVisitor object that should be used.
-     * This allows subclasses of AddLMVisitor to be used, which can be useful
-     * for extensions to the FO Tree.
-     * @param addLMVisitor the AddLMVisitor object that should be used.
-     */
-    public void setAddLMVisitor(AddLMVisitor addLMVisitor) {
-        this.addLMVisitor = addLMVisitor;
-    }
-
-    /**
-     * Public accessor to get the AddLMVisitor object that should be used.
-     * @return the AddLMVisitor object that should be used.
-     */
-    public AddLMVisitor getAddLMVisitor() {
-        if (this.addLMVisitor == null) {
-            this.addLMVisitor = new AddLMVisitor();
-        }
-        return this.addLMVisitor;
-    }
-    
 }

diff --git a/src/java/org/apache/fop/fo/FOTreeHandler.java b/src/java/org/apache/fop/fo/FOTreeHandler.java
index a5b03e4226925ec6221493c93ea30a80b42ecde7..7cf13d32433e01326ca879a8e951fbcc91438821 100644 (file)
--- a/src/java/org/apache/fop/fo/FOTreeHandler.java
+++ b/src/java/org/apache/fop/fo/FOTreeHandler.java
@@ -50,6 +50,7 @@ import org.apache.fop.fo.flow.TableCell;
 import org.apache.fop.fo.flow.TableRow;
 import org.apache.fop.fo.pagination.Flow;
 import org.apache.fop.fo.pagination.PageSequence;
+import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.layoutmgr.ContentLayoutManager;
 import org.apache.fop.layoutmgr.InlineStackingLayoutManager;
 import org.apache.fop.layoutmgr.LMiter;
@@ -90,6 +91,10 @@ public class FOTreeHandler extends FOInputHandler {
      */
     private long startTime;
 
+    /** Useful only for allowing subclasses of AddLMVisitor to be set by those
+     extending FOP **/
+    private AddLMVisitor addLMVisitor = null;
+
     /**
      * Main constructor
      * @param foTreeControl the FOTreeControl implementation that governs this
@@ -504,7 +509,7 @@ public class FOTreeHandler extends FOInputHandler {
 
         // This will layout pages and add them to the area tree
         PageLayoutManager pageLM = new PageLayoutManager(areaTree, pageSeq, 
-            getDocument());
+            this);
         pageLM.setPageCounting(pageSeq.getCurrentPageNumber(),
                                pageSeq.getPageNumberGenerator());
 
@@ -552,6 +557,27 @@ public class FOTreeHandler extends FOInputHandler {
         return title;
     }
 
+    /**
+     * Public accessor to set the AddLMVisitor object that should be used.
+     * This allows subclasses of AddLMVisitor to be used, which can be useful
+     * for extensions to the FO Tree.
+     * @param addLMVisitor the AddLMVisitor object that should be used.
+     */
+    public void setAddLMVisitor(AddLMVisitor addLMVisitor) {
+        this.addLMVisitor = addLMVisitor;
+    }
+
+    /**
+     * Public accessor to get the AddLMVisitor object that should be used.
+     * @return the AddLMVisitor object that should be used.
+     */
+    public AddLMVisitor getAddLMVisitor() {
+        if (this.addLMVisitor == null) {
+            this.addLMVisitor = new AddLMVisitor();
+        }
+        return this.addLMVisitor;
+    }
+
     /**
      *
      * @param pagenum PageNumber that is starting.

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index b4b7a08f17cb2d1f6551d17ae3e507c36e118661..575c2df8ca7524cea929d17ae50b7c42637b6640 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -20,12 +20,12 @@ package org.apache.fop.layoutmgr;
 
 import org.apache.fop.fo.FObj;
 import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Document;
-import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.area.Area;
 import org.apache.fop.area.Resolveable;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.fo.Constants;
+import org.apache.fop.fo.flow.Marker;
+import org.apache.fop.fo.FOTreeHandler;
 import org.apache.fop.fo.PropertyManager;
 
 import org.apache.commons.logging.Log;
@@ -108,8 +108,8 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
         return this.parentLM;
     }
 
-    public Document getDocument() {
-        return getParent().getDocument();
+    public FOTreeHandler getFOTreeHandler() {
+        return getParent().getFOTreeHandler();
     }
 
     //     /**

diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index c1ee57b460061619b52a953ebcca2e38dfa69609..bad20c2fe101916aa46f2877ef11853a3e54627e 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -19,7 +19,7 @@
 package org.apache.fop.layoutmgr;
 
 import org.apache.fop.fo.FObj;
-import org.apache.fop.apps.Document;
+import org.apache.fop.fo.FOTreeHandler;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.area.Area;
@@ -171,8 +171,8 @@ public class ContentLayoutManager implements LayoutManager {
         return this.parentLM;
     }
 
-    public Document getDocument() {
-        return getParent().getDocument();
+    public FOTreeHandler getFOTreeHandler() {
+        return getParent().getFOTreeHandler();
     }
 
     /** @see org.apache.fop.layoutmgr.LayoutManager */

diff --git a/src/java/org/apache/fop/layoutmgr/LMiter.java b/src/java/org/apache/fop/layoutmgr/LMiter.java
index 774e03351c15e88dae48f7bc98f3f4d0faa28086..6243faf41377f73d41b008264c217c1c79c1afad 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LMiter.java
+++ b/src/java/org/apache/fop/layoutmgr/LMiter.java
@@ -46,7 +46,7 @@ public class LMiter implements ListIterator {
     }
 
     protected boolean preLoadNext() {
-        AddLMVisitor addLMVisitor = lp.getDocument().getAddLMVisitor();
+        AddLMVisitor addLMVisitor = lp.getFOTreeHandler().getAddLMVisitor();
         // skip over child FObj's that don't add lms
         while (baseIter != null && baseIter.hasNext()) {
             Object theobj = baseIter.next();

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 102c89978d9799196c74f5aa0a65b2486e527252..f1149106717b2c76d0a0d240da2b874ad251150a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -27,6 +27,7 @@ import org.apache.fop.area.Resolveable;
 import org.apache.fop.area.PageViewport;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FOTreeHandler;
 
 /**
  * The interface for all LayoutManagers.
@@ -57,10 +58,10 @@ public interface LayoutManager {
     LayoutManager getParent();
 
     /**
-     * Get the Document object that is at the top of the LM Tree
-     * @return the Document object that is at the top of the LM Tree
+     * Get the FOTreeHandler object that is activating the LM Tree
+     * @return the FOTreeHandler object
      */
-    org.apache.fop.apps.Document getDocument();
+    FOTreeHandler getFOTreeHandler();
 
     /**
      * Initialize this layout manager.

diff --git a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
index 4c4015521aacb8be65a77dcaaa402981ab2555ec..08832ae0b58f0a04cbad56783237083b108d3931 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageLayoutManager.java
@@ -18,7 +18,6 @@
 
 package org.apache.fop.layoutmgr;
 
-import org.apache.fop.apps.Document;
 import org.apache.fop.apps.FOPException;
 
 import org.apache.fop.area.CTM;
@@ -42,6 +41,7 @@ import org.apache.fop.datatypes.PercentBase;
 import org.apache.fop.datatypes.FODimension;
 
 import org.apache.fop.fo.FObj;
+import org.apache.fop.fo.FOTreeHandler;
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.flow.Marker;
 import org.apache.fop.fo.pagination.PageNumberGenerator;
@@ -110,7 +110,7 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
      */
     private AreaTree areaTree;
     private PageSequence pageSequence;
-    private Document doc;
+    private FOTreeHandler foTreeHandler;
 
     /**
      * This is the SimplePageMaster that should be used to create the page. It
@@ -134,11 +134,11 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
      * @param pageseq the page sequence fo
      */
     public PageLayoutManager(AreaTree areaTree, PageSequence pageseq,
-        Document doc) {
+        FOTreeHandler foTreeHandler) {
         super(pageseq);
         this.areaTree = areaTree;
         pageSequence = pageseq;
-        this.doc = doc;
+        this.foTreeHandler = foTreeHandler;
     }
 
     /**
@@ -899,9 +899,9 @@ public class PageLayoutManager extends AbstractLayoutManager implements Runnable
     }
 
     /**
-     * @return the apps.Document object controlling this generation
+     * @return the apps.FOTreeHandler object controlling this generation
      */
-    public Document getDocument() {
-        return doc;
+    public FOTreeHandler getFOTreeHandler() {
+        return foTreeHandler;
     }
 }