morten 01/07/23 01:47:56
Modified: java/src/org/apache/xalan/xsltc/trax
TransformerFactoryImpl.java TransformerImpl.java
Log:
Added support for DOMSource as input to our Transformer implementation
Revision Changes Path
1.14 +4 -4
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TransformerFactoryImpl.java 2001/07/20 20:07:14 1.13
+++ TransformerFactoryImpl.java 2001/07/23 08:47:56 1.14
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransformerFactoryImpl.java,v 1.13 2001/07/20 20:07:14 tmiller Exp $
+ * @(#)$Id: TransformerFactoryImpl.java,v 1.14 2001/07/23 08:47:56 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,9 +73,11 @@
import java.util.Vector;
import javax.xml.transform.*;
-import javax.xml.transform.stream.*;
import javax.xml.transform.sax.*;
+import javax.xml.transform.dom.*;
+import javax.xml.transform.stream.*;
+import org.w3c.dom.Document;
import org.xml.sax.XMLFilter;
import org.xml.sax.InputSource;
@@ -86,8 +88,6 @@
import org.apache.xalan.xsltc.compiler.util.Util;
import org.apache.xalan.xsltc.runtime.AbstractTranslet;
-import org.w3c.dom.Document;
-import javax.xml.transform.dom.DOMSource;
/**
* Implementation of a JAXP1.1 TransformerFactory for Translets.
*/
1.9 +16 -1
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TransformerImpl.java 2001/07/20 15:24:33 1.8
+++ TransformerImpl.java 2001/07/23 08:47:56 1.9
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransformerImpl.java,v 1.8 2001/07/20 15:24:33 morten Exp $
+ * @(#)$Id: TransformerImpl.java,v 1.9 2001/07/23 08:47:56 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -84,10 +84,13 @@
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
+import org.w3c.dom.Document;
+
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.*;
import javax.xml.transform.sax.*;
+import javax.xml.transform.dom.*;
import javax.xml.transform.stream.*;
import org.apache.xalan.xsltc.Translet;
@@ -240,6 +243,18 @@
reader.setContentHandler(inputHandler);
reader.parse(input);
+ dom.setDocumentURI(systemId);
+ }
+ // Handle DOMSource input
+ else if (source instanceof DOMSource) {
+ final DOMSource domsrc = (DOMSource)source;
+ final Document tree = (Document)domsrc.getNode();
+ final DOM2SAX dom2sax = new DOM2SAX(tree);
+ final InputSource input = SAXSource.sourceToInputSource(source);
+ final String systemId = domsrc.getSystemId();
+ dtdMonitor.handleDTD(dom2sax);
+ dom2sax.setContentHandler(inputHandler);
+ dom2sax.parse(input);
dom.setDocumentURI(systemId);
}
// Handle StreamSource input
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
