1. Child element validity checking added for fo:page-sequence-master.

2. AreaTree object moved from Document/Driver to FOTreeHandler, as it is specific to this subclass of FOInputHandler only (RTFHandler and MIFHandler don't use area trees).


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

2 files changed, 9 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java
index ec28fa891..141ed6526 100644
--- a/src/java/org/apache/fop/apps/Document.java
+++ b/src/java/org/apache/fop/apps/Document.java
@@ -19,10 +19,9 @@
 package org.apache.fop.apps;
 
 // FOP
-import org.apache.fop.area.AreaTree;
-import org.apache.fop.area.AreaTreeModel;
 import org.apache.fop.fo.FOInputHandler;
 import org.apache.fop.fonts.FontInfo;
+import org.apache.fop.render.Renderer;
 
 // SAX
 import org.xml.sax.SAXException;
@@ -39,11 +38,8 @@ public class Document {
     /** The Font information relevant for this document */
     private FontInfo fontInfo;
     
-    /** The current AreaTree for the PageSequence being rendered. */
-    public AreaTree areaTree;
-
-    /** The AreaTreeModel for the PageSequence being rendered. */
-    public AreaTreeModel atModel;
+    /** The Renderer being used for this document */
+    protected Renderer renderer;
 
     /**
      * Structure handler used to notify structure
@@ -77,12 +73,12 @@ public class Document {
     }
 
     /**
-     * Get the area tree for this layout handler.
+     * Get the renderer for this document
      *
-     * @return the area tree for this document
+     * @return the renderer for this document
      */
-    public AreaTree getAreaTree() {
-        return areaTree;
+    public Renderer getRenderer() {
+        return renderer;
     }
 
     /**
diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index db981f716..afdee0e4d 100644
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -19,9 +19,6 @@
 package org.apache.fop.apps;
 
 // FOP
-import org.apache.fop.area.AreaTree;
-import org.apache.fop.area.RenderPagesModel;
-
 import org.apache.fop.fo.ElementMapping;
 import org.apache.fop.fo.FOTreeBuilder;
 
@@ -490,11 +487,9 @@ public class Driver {
                         "Renderer not set when using standard foInputHandler");
             }
 
+            currentDocument.renderer = renderer;
             foInputHandler = new FOTreeHandler(currentDocument, true);
-            currentDocument.areaTree = new AreaTree();
-            currentDocument.atModel = new RenderPagesModel(renderer);
-            //this.atModel = new CachedRenderPagesModel(renderer);
-            currentDocument.areaTree.setTreeModel(currentDocument.atModel);
+
             try {
                 renderer.setupFontInfo(currentDocument.getFontInfo());
                 // check that the "any,normal,400" font exists