You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dm...@apache.org on 2002/06/09 00:46:12 UTC
cvs commit: jakarta-commons/jxpath/src/java/org/apache/commons/jxpath XMLDocumentContainer.java
dmitri 2002/06/08 15:46:12
Modified: jxpath/src/java/org/apache/commons/jxpath
XMLDocumentContainer.java
Log:
Now using parser APIs instead of transformer
Revision Changes Path
1.5 +19 -9 jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java
Index: XMLDocumentContainer.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDocumentContainer.java 26 Apr 2002 03:28:36 -0000 1.4
+++ XMLDocumentContainer.java 8 Jun 2002 22:46:11 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java,v 1.4 2002/04/26 03:28:36 dmitri Exp $
- * $Revision: 1.4 $
- * $Date: 2002/04/26 03:28:36 $
+ * $Header: /home/cvs/jakarta-commons/jxpath/src/java/org/apache/commons/jxpath/XMLDocumentContainer.java,v 1.5 2002/06/08 22:46:11 dmitri Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/06/08 22:46:11 $
*
* ====================================================================
* The Apache Software License, Version 1.1
@@ -64,6 +64,7 @@
import java.io.InputStream;
import java.net.URL;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
@@ -83,7 +84,7 @@
* read at all.
*
* @author Dmitri Plotnikov
- * @version $Revision: 1.4 $ $Date: 2002/04/26 03:28:36 $
+ * @version $Revision: 1.5 $ $Date: 2002/06/08 22:46:11 $
*/
public class XMLDocumentContainer implements Container {
@@ -119,12 +120,21 @@
try {
if (xmlURL != null){
stream = xmlURL.openStream();
- source = new StreamSource(stream);
}
- DOMResult result = new DOMResult();
- Transformer trans = TransformerFactory.newInstance().newTransformer();
- trans.transform(source, result);
- document = (Document) result.getNode();
+ if (stream != null){
+ DocumentBuilderFactory factory =
+ DocumentBuilderFactory.newInstance();
+ document = factory.newDocumentBuilder().parse(stream);
+ }
+ else {
+ if (xmlURL != null){
+ source = new StreamSource(stream);
+ }
+ DOMResult result = new DOMResult();
+ Transformer trans = TransformerFactory.newInstance().newTransformer();
+ trans.transform(source, result);
+ document = (Document) result.getNode();
+ }
}
finally {
if (stream != null){
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>