You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ed...@apache.org on 2002/02/09 20:39:59 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers AbstractDOMParser.java
edwingo 02/02/09 11:39:59
Modified: java/src/org/apache/xerces/jaxp DocumentBuilderImpl.java
java/src/org/apache/xerces/parsers AbstractDOMParser.java
Log:
Fix JAXP DocumentBuilderFactory.setIgnoringComments() and
DocumentBuilderFactory.setExpandEntityReferences().
Revision Changes Path
1.17 +1 -5 xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java
Index: DocumentBuilderImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/jaxp/DocumentBuilderImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DocumentBuilderImpl.java 3 Feb 2002 17:58:13 -0000 1.16
+++ DocumentBuilderImpl.java 9 Feb 2002 19:39:59 -0000 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: DocumentBuilderImpl.java,v 1.16 2002/02/03 17:58:13 edwingo Exp $
+ * $Id: DocumentBuilderImpl.java,v 1.17 2002/02/09 19:39:59 edwingo Exp $
*
* The Apache Software License, Version 1.1
*
@@ -117,7 +117,6 @@
dbf.isNamespaceAware());
// Set various parameters obtained from DocumentBuilderFactory
- try {
domParser.setFeature(Constants.XERCES_FEATURE_PREFIX +
Constants.INCLUDE_IGNORABLE_WHITESPACE,
!dbf.isIgnoringElementContentWhitespace());
@@ -130,9 +129,6 @@
domParser.setFeature(Constants.XERCES_FEATURE_PREFIX +
Constants.CREATE_CDATA_NODES_FEATURE,
!dbf.isCoalescing());
- } catch (Exception x) {
- // XXX ignore Exceptions for now until we figure out bug
- }
setDocumentBuilderFactoryAttributes(dbfAttrs);
}
1.38 +5 -3 xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java
Index: AbstractDOMParser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/AbstractDOMParser.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AbstractDOMParser.java 29 Jan 2002 20:44:02 -0000 1.37
+++ AbstractDOMParser.java 9 Feb 2002 19:39:59 -0000 1.38
@@ -105,7 +105,7 @@
* @author Andy Clark, IBM
* @author Elena Litani, IBM
*
- * @version $Id: AbstractDOMParser.java,v 1.37 2002/01/29 20:44:02 neilg Exp $
+ * @version $Id: AbstractDOMParser.java,v 1.38 2002/02/09 19:39:59 edwingo Exp $
*/
public abstract class AbstractDOMParser
extends AbstractXMLDocumentParser {
@@ -125,10 +125,12 @@
Constants.SAX_FEATURE_PREFIX+Constants.NAMESPACES_FEATURE;
/** Feature id: include comments. */
- protected static final String INCLUDE_COMMENTS_FEATURE = Constants.INCLUDE_COMMENTS_FEATURE;
+ protected static final String INCLUDE_COMMENTS_FEATURE =
+ Constants.XERCES_FEATURE_PREFIX + Constants.INCLUDE_COMMENTS_FEATURE;
/** Feature id: create cdata nodes. */
- protected static final String CREATE_CDATA_NODES_FEATURE = Constants.CREATE_CDATA_NODES_FEATURE;
+ protected static final String CREATE_CDATA_NODES_FEATURE =
+ Constants.XERCES_FEATURE_PREFIX + Constants.CREATE_CDATA_NODES_FEATURE;
/** Feature id: include ignorable whitespace. */
protected static final String INCLUDE_IGNORABLE_WHITESPACE =
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org