vmote 2003/08/28 10:13:22
Modified: src/java/org/apache/fop/apps FOUserAgent.java
src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
move setDefaultXMLHandler() and addXMLHandler() from apps/FOUserAgent to
render/AbstractRenderer
Revision Changes Path
1.2 +3 -27 xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java
Index: FOUserAgent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/FOUserAgent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FOUserAgent.java 22 Aug 2003 17:42:41 -0000 1.1
+++ FOUserAgent.java 28 Aug 2003 17:13:22 -0000 1.2
@@ -90,8 +90,8 @@
public class FOUserAgent implements LogEnabled {
private Logger log;
- private Map defaults = new java.util.HashMap();
- private Map handlers = new java.util.HashMap();
+ public Map defaults = new java.util.HashMap();
+ public Map handlers = new java.util.HashMap();
private String baseURL;
private PDFEncryptionParams pdfEncryptionParams;
private float px2mm = 0.35277777777777777778f; //72dpi (=25.4/dpi)
@@ -186,30 +186,6 @@
*/
public boolean linkToFootnotes() {
return true;
- }
-
- /**
- * Set the default xml handler for the given mime type.
- * @param mime MIME type
- * @param handler XMLHandler to use
- */
- public void setDefaultXMLHandler(String mime, XMLHandler handler) {
- defaults.put(mime, handler);
- }
-
- /**
- * Add an xml handler for the given mime type and xml namespace.
- * @param mime MIME type
- * @param ns Namespace URI
- * @param handler XMLHandler to use
- */
- public void addXMLHandler(String mime, String ns, XMLHandler handler) {
- Map mh = (Map) handlers.get(mime);
- if (mh == null) {
- mh = new java.util.HashMap();
- handlers.put(mime, mh);
- }
- mh.put(ns, handler);
}
/**
1.9 +26 -0 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractRenderer.java 27 Aug 2003 18:14:46 -0000 1.8
+++ AbstractRenderer.java 28 Aug 2003 17:13:22 -0000 1.9
@@ -676,5 +676,31 @@
}
}
+ /**
+ * Set the default xml handler for the given mime type.
+ * @param mime MIME type
+ * @param handler XMLHandler to use
+ */
+ public void setDefaultXMLHandler(FOUserAgent foua, String mime,
+ XMLHandler handler) {
+ foua.defaults.put(mime, handler);
+ }
+
+ /**
+ * Add an xml handler for the given mime type and xml namespace.
+ * @param mime MIME type
+ * @param ns Namespace URI
+ * @param handler XMLHandler to use
+ */
+ public void addXMLHandler(FOUserAgent foua, String mime, String ns,
+ XMLHandler handler) {
+ Map mh = (Map) foua.handlers.get(mime);
+ if (mh == null) {
+ mh = new java.util.HashMap();
+ foua.handlers.put(mime, mh);
+ }
+ mh.put(ns, handler);
+ }
+
}
1.13 +1 -1 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PDFRenderer.java 22 Aug 2003 17:42:42 -0000 1.12
+++ PDFRenderer.java 28 Aug 2003 17:13:22 -0000 1.13
@@ -260,7 +260,7 @@
PDFXMLHandler xmlHandler = new PDFXMLHandler();
//userAgent.setDefaultXMLHandler(MIME_TYPE, xmlHandler);
String svg = "http://www.w3.org/2000/svg";;
- userAgent.addXMLHandler(MIME_TYPE, svg, xmlHandler);
+ addXMLHandler(userAgent, MIME_TYPE, svg, xmlHandler);
}
/**
1.12 +1 -1 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PSRenderer.java 22 Aug 2003 17:42:42 -0000 1.11
+++ PSRenderer.java 28 Aug 2003 17:13:22 -0000 1.12
@@ -143,7 +143,7 @@
PSXMLHandler xmlHandler = new PSXMLHandler();
//userAgent.setDefaultXMLHandler(MIME_TYPE, xmlHandler);
String svg = "http://www.w3.org/2000/svg";;
- userAgent.addXMLHandler(MIME_TYPE, svg, xmlHandler);
+ addXMLHandler(userAgent, MIME_TYPE, svg, xmlHandler);
}
/**
1.8 +2 -2 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderer.java 23 Aug 2003 17:38:13 -0000 1.7
+++ SVGRenderer.java 28 Aug 2003 17:13:22 -0000 1.8
@@ -161,8 +161,8 @@
*/
public void setUserAgent(FOUserAgent agent) {
super.setUserAgent(agent);
- userAgent.setDefaultXMLHandler(SVG_MIME_TYPE, this);
- userAgent.addXMLHandler(SVG_MIME_TYPE, SVG_NAMESPACE, this);
+ setDefaultXMLHandler(userAgent, SVG_MIME_TYPE, this);
+ addXMLHandler(userAgent, SVG_MIME_TYPE, SVG_NAMESPACE, this);
}
/**
1.8 +2 -2 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLRenderer.java 27 Aug 2003 18:14:46 -0000 1.7
+++ XMLRenderer.java 28 Aug 2003 17:13:22 -0000 1.8
@@ -147,9 +147,9 @@
//
//userAgent.addExtensionHandler();
XMLHandler handler = new XMLXMLHandler();
- userAgent.setDefaultXMLHandler(XML_MIME_TYPE, handler);
+ setDefaultXMLHandler(userAgent, XML_MIME_TYPE, handler);
String svg = "http://www.w3.org/2000/svg";;
- userAgent.addXMLHandler(XML_MIME_TYPE, svg, handler);
+ addXMLHandler(userAgent, XML_MIME_TYPE, svg, handler);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
