Author: jeremias
Date: Fri Nov 21 09:24:32 2008
New Revision: 719646
URL: http://svn.apache.org/viewvc?rev=719646&view=rev
Log:
Fixed possible ClassCastException that was caused by my earlier attempt to
support SVG 1.2. Batik's SAXSVGDocumentFactory doesn't currently deal well with
the case when namespaces are declared outside of its scope. Worked around that
by doing the SVG version detection in FOP code. SVG12DOMImplementation is
obtained by reflection in order to keep backwards compatilibility with earlier
Batik versions that don't support SVG 1.2.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java?rev=719646&r1=719645&r2=719646&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
Fri Nov 21 09:24:32 2008
@@ -19,25 +19,37 @@
package org.apache.fop.fo.extensions.svg;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.sax.TransformerHandler;
+
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+
+import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.apache.batik.dom.svg.SVGDOMImplementation;
-import org.apache.batik.util.XMLResourceDescriptor;
-import org.apache.fop.svg.FOPSAXSVGDocumentFactory;
import org.apache.fop.util.ContentHandlerFactory;
+import org.apache.fop.util.DelegatingContentHandler;
/**
- * ContentHandlerFactory which constructs ContentHandlers that build SVG DOM
Documents.
+ * ContentHandlerFactory which constructs ContentHandlers that build SVG DOM
+ * Documents.
*/
public class SVGDOMContentHandlerFactory implements ContentHandlerFactory {
+ private static SAXTransformerFactory tFactory
+ = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
+
/**
* Default Constructor.
*/
public SVGDOMContentHandlerFactory() {
- //nop
+ // nop
}
/** [EMAIL PROTECTED] */
@@ -50,13 +62,18 @@
return new Handler();
}
- private static class Handler extends FOPSAXSVGDocumentFactory
- implements ContentHandlerFactory.ObjectSource {
+ private static class Handler extends DelegatingContentHandler implements
+ ContentHandlerFactory.ObjectSource {
+ private Document doc;
private ObjectBuiltListener obListener;
public Handler() throws SAXException {
- super(XMLResourceDescriptor.getXMLParserClassName());
+ super();
+ }
+
+ public Document getDocument() {
+ return this.doc;
}
/** [EMAIL PROTECTED] */
@@ -70,6 +87,58 @@
}
/** [EMAIL PROTECTED] */
+ public void startDocument() throws SAXException {
+ // Suppress startDocument() call if doc has not been set, yet. It
+ // will be done later.
+ if (doc != null) {
+ super.startDocument();
+ }
+ }
+
+ private DOMImplementation getDOMImplementation(String ver) {
+ //TODO It would be great if Batik provided this method as static
helper method.
+ if (ver == null || ver.length() == 0
+ || ver.equals("1.0") || ver.equals("1.1")) {
+ return SVGDOMImplementation.getDOMImplementation();
+ } else if (ver.equals("1.2")) {
+ try {
+ Class clazz = Class.forName(
+
"org.apache.batik.dom.svg12.SVG12DOMImplementation");
+ return (DOMImplementation)clazz.getMethod(
+ "getDOMImplementation", null).invoke(null, null);
+ } catch (Exception e) {
+ return SVGDOMImplementation.getDOMImplementation();
+ }
+ }
+ throw new RuntimeException("Unsupport SVG version '" + ver + "'");
+ }
+
+ /** [EMAIL PROTECTED] */
+ public void startElement(String uri, String localName, String qName,
Attributes atts)
+ throws SAXException {
+ if (doc == null) {
+ TransformerHandler handler;
+ try {
+ handler = tFactory.newTransformerHandler();
+ } catch (TransformerConfigurationException e) {
+ throw new SAXException("Error creating a new
TransformerHandler", e);
+ }
+ String version = atts.getValue("version");
+ DOMImplementation domImplementation =
getDOMImplementation(version);
+ doc = domImplementation.createDocument(uri, qName, null);
+ // It's easier to work with an empty document, so remove the
+ // root element
+ doc.removeChild(doc.getDocumentElement());
+ handler.setResult(new DOMResult(doc));
+ setDelegateContentHandler(handler);
+ setDelegateLexicalHandler(handler);
+ setDelegateDTDHandler(handler);
+ handler.startDocument();
+ }
+ super.startElement(uri, localName, qName, atts);
+ }
+
+ /** [EMAIL PROTECTED] */
public void endDocument() throws SAXException {
super.endDocument();
if (obListener != null) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=719646&r1=719645&r2=719646&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
Fri Nov 21 09:24:32 2008
@@ -26,7 +26,6 @@
import java.net.URL;
import org.w3c.dom.Element;
-import org.w3c.dom.svg.SVGDocument;
import org.apache.batik.bridge.UnitProcessor;
import org.apache.batik.dom.svg.SVGContext;
@@ -85,7 +84,6 @@
log.error("Could not set base URL for svg", e);
}
- Element e = ((SVGDocument)doc).getRootElement();
final float ptmm = getUserAgent().getSourcePixelUnitToMillimeter();
// temporary svg context
SVGContext dc = new SVGContext() {
@@ -138,7 +136,8 @@
public void deselectAll() {
}
};
- ((SVGOMElement)e).setSVGContext(dc);
+ SVGOMElement e = (SVGOMElement)svgRoot;
+ e.setSVGContext(dc);
//if (!e.hasAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns")) {
e.setAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns",
@@ -146,7 +145,7 @@
//}
int fontSize = 12;
Point2D p2d = getSize(fontSize, svgRoot,
getUserAgent().getSourcePixelUnitToMillimeter());
- ((SVGOMElement)e).setSVGContext(null);
+ e.setSVGContext(null);
return p2d;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
