move renderXML() from apps/FOUserAgent to render/AbstractRenderer

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

diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java
index 27a3a7532708a4a46e27edeff0e0c488c1e6176c..cbd0ba9781f3d46edbcc2c7789f88d57df95a171 100644 (file)
--- a/src/java/org/apache/fop/apps/FOUserAgent.java
+++ b/src/java/org/apache/fop/apps/FOUserAgent.java
@@ -55,17 +55,12 @@ import java.util.Map;
 import java.io.IOException;
 import java.io.InputStream;
 
-// XML
-import org.w3c.dom.Document;
-
 // Avalon
 import org.apache.avalon.framework.logger.LogEnabled;
 import org.apache.avalon.framework.logger.Logger;
 
 // FOP
 import org.apache.fop.pdf.PDFEncryptionParams;
-import org.apache.fop.render.XMLHandler;
-import org.apache.fop.render.RendererContext;
 
 /**
  * The User Agent for fo.
@@ -188,39 +183,5 @@ public class FOUserAgent implements LogEnabled {
         return true;
     }
 
-    /**
-     * Render the xml document with the given xml namespace.
-     * The Render Context is by the handle to render into the current
-     * rendering target.
-     * @param ctx rendering context
-     * @param doc DOM Document containing the source document
-     * @param namespace Namespace URI of the document
-     */
-    public void renderXML(RendererContext ctx, Document doc,
-                          String namespace) {
-        String mime = ctx.getMimeType();
-        Map mh = (Map) handlers.get(mime);
-        XMLHandler handler = null;
-        if (mh != null) {
-            handler = (XMLHandler) mh.get(namespace);
-        }
-        if (handler == null) {
-            handler = (XMLHandler) defaults.get(mime);
-        }
-        if (handler != null) {
-            try {
-                handler.handleXML(ctx, doc, namespace);
-            } catch (Throwable t) {
-                // could not handle document
-                getLogger().error("Some XML content will be ignored. "
-                        + "Could not render XML", t);
-            }
-        } else {
-            // no handler found for document
-            getLogger().warn("Some XML content will be ignored. "
-                    + "No handler defined for XML: " + namespace);
-        }
-    }
-
 }
 

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index a9de32be6172b32bf32e15df3176346ee634bd36..5becb0f6b43bc699b84be213e1c06aa1f222d15d 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -58,6 +58,9 @@ import java.util.Map;
 import java.util.List;
 import java.util.Iterator;
 
+// XML
+import org.w3c.dom.Document;
+
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.area.Area;
@@ -702,5 +705,39 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
         mh.put(ns, handler);
     }
 
+    /**
+     * Render the xml document with the given xml namespace.
+     * The Render Context is by the handle to render into the current
+     * rendering target.
+     * @param ctx rendering context
+     * @param doc DOM Document containing the source document
+     * @param namespace Namespace URI of the document
+     */
+    public void renderXML(FOUserAgent foua, RendererContext ctx, Document doc,
+                          String namespace) {
+        String mime = ctx.getMimeType();
+        Map mh = (Map) foua.handlers.get(mime);
+        XMLHandler handler = null;
+        if (mh != null) {
+            handler = (XMLHandler) mh.get(namespace);
+        }
+        if (handler == null) {
+            handler = (XMLHandler) foua.defaults.get(mime);
+        }
+        if (handler != null) {
+            try {
+                handler.handleXML(ctx, doc, namespace);
+            } catch (Throwable t) {
+                // could not handle document
+                getLogger().error("Some XML content will be ignored. "
+                        + "Could not render XML", t);
+            }
+        } else {
+            // no handler found for document
+            getLogger().warn("Some XML content will be ignored. "
+                    + "No handler defined for XML: " + namespace);
+        }
+    }
+
 }
 

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index 42c917315bd0914eda09c389b807600cd3e23b18..2770b9a750246eb587a5c1bf9efb41104f5ee9f3 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -1190,7 +1190,7 @@ public class PDFRenderer extends PrintRenderer {
                             new Integer((int) pos.getWidth()));
         context.setProperty(PDFXMLHandler.PDF_HEIGHT,
                             new Integer((int) pos.getHeight()));
-        userAgent.renderXML(context, doc, ns);
+        renderXML(userAgent, context, doc, ns);
 
     }
 

diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java
index c71b08373620fd5e52c443fe49f0fd7f1c91d987..97551e29bc777d042984cb80cc85379fb6a6f2bb 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/java/org/apache/fop/render/ps/PSRenderer.java
@@ -885,7 +885,7 @@ public class PSRenderer extends AbstractRenderer {
         context.setProperty(PDFXMLHandler.PDF_HEIGHT,
                             new Integer((int) pos.getHeight()));
         */
-        userAgent.renderXML(context, doc, ns);
+        renderXML(userAgent, context, doc, ns);
 
     }
 

diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java
index 5bed6232e802c6e4e2448a21a73f41f97f232c71..97a3ee7587129e23d33faabb209a7b4d02114793 100644 (file)
--- a/src/java/org/apache/fop/render/svg/SVGRenderer.java
+++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java
@@ -354,7 +354,7 @@ public class SVGRenderer extends AbstractRenderer implements XMLHandler {
     public void renderForeignObject(ForeignObject fo) {
         org.w3c.dom.Document doc = fo.getDocument();
         String ns = fo.getNameSpace();
-        userAgent.renderXML(context, doc, ns);
+        renderXML(userAgent, context, doc, ns);
     }
 
     /**

diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index 6d6af46f33ffe3b679266c57b18e580928c033e7..43f065cf98544800baee13195983c6efe8600d63 100644 (file)
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -429,7 +429,7 @@ public class XMLRenderer extends AbstractRenderer {
         org.w3c.dom.Document doc = fo.getDocument();
         String ns = fo.getNameSpace();
         context.setProperty(XMLXMLHandler.WRITER, writer);
-        userAgent.renderXML(context, doc, ns);
+        renderXML(userAgent, context, doc, ns);
         writeEndTag("</foreignObject>");
     }