From b7326926ad01239cbe89e64bf76d7ccc0cfb78cf Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Sat, 19 Jun 2004 13:35:33 +0000 Subject: 1.) FOInputHandler constructors switched from Document to FOUserAgent, Renderer added to FOTreeHandler interface. 2.) Apps.Document dropped. 3.) Validity checking added to fo.pagination.SinglePageMasterReference git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197737 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/render/awt/AWTRenderer.java | 1 - src/java/org/apache/fop/render/mif/MIFHandler.java | 8 +++++--- src/java/org/apache/fop/render/rtf/RTFHandler.java | 8 ++++---- src/java/org/apache/fop/render/svg/SVGRenderer.java | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/java/org/apache/fop/render') diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java index 2e727d17f..f4f934528 100644 --- a/src/java/org/apache/fop/render/awt/AWTRenderer.java +++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java @@ -46,7 +46,6 @@ import java.util.Map; import java.util.Vector; import org.apache.fop.fonts.FontInfo; -import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.InputHandler; import org.apache.fop.area.Area; diff --git a/src/java/org/apache/fop/render/mif/MIFHandler.java b/src/java/org/apache/fop/render/mif/MIFHandler.java index 4bfd23f3a..09f2b6fd1 100644 --- a/src/java/org/apache/fop/render/mif/MIFHandler.java +++ b/src/java/org/apache/fop/render/mif/MIFHandler.java @@ -22,7 +22,7 @@ package org.apache.fop.render.mif; import java.io.IOException; import java.io.OutputStream; -import org.apache.fop.apps.Document; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FOInputHandler; @@ -61,6 +61,7 @@ public class MIFHandler extends FOInputHandler { /** the MIFFile instance */ protected MIFFile mifFile; + /** the OutputStream to write to */ protected OutputStream outStream; @@ -70,10 +71,11 @@ public class MIFHandler extends FOInputHandler { /** * Creates a new MIF handler on a given OutputStream. + * @param ua FOUserAgent instance for this process * @param os OutputStream to write to */ - public MIFHandler(Document doc, OutputStream os) { - super(doc); + public MIFHandler(FOUserAgent ua, OutputStream os) { + super(ua); outStream = os; FontSetup.setup(fontInfo, null); } diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index 3f508ea35..21587b77c 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -27,6 +27,7 @@ import java.util.Iterator; import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.logging.Log; import org.apache.fop.apps.FOPException; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.fo.FOInputHandler; import org.apache.fop.fo.FObj; import org.apache.fop.fo.flow.BasicLink; @@ -57,7 +58,6 @@ import org.apache.fop.fo.properties.Property; import org.apache.fop.fo.properties.StringProperty; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FOText; -import org.apache.fop.apps.Document; import org.apache.fop.render.rtf.rtflib.rtfdoc.ITableAttributes; import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfAfterContainer; import org.apache.fop.render.rtf.rtflib.rtfdoc.IRtfBeforeContainer; @@ -122,11 +122,11 @@ public class RTFHandler extends FOInputHandler { /** * Creates a new RTF structure handler. - * @param doc the Document for which this RTFHandler is processing + * @param userAgent the FOUserAgent for this process * @param os OutputStream to write to */ - public RTFHandler(Document doc, OutputStream os) { - super(doc); + public RTFHandler(FOUserAgent userAgent, OutputStream os) { + super(userAgent); this.os = os; bDefer = false; bDeferredExecution = false; diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java index 7c9e3425b..fd7c855cf 100644 --- a/src/java/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java @@ -18,7 +18,6 @@ package org.apache.fop.render.svg; -import org.apache.fop.apps.Document; import org.apache.fop.apps.FOPException; import org.apache.fop.area.PageViewport; import org.apache.fop.area.Title; -- cgit v1.2.3