neeraj 2003/08/06 06:39:47
Modified: java/src/org/apache/xerces/parsers DOMParserImpl.java
Log:
We meet all the requirements of setting 'infoset' value to true when loading the DOM.
So, Changing the default value of 'infoset' feature to true.
Revision Changes Path
1.3 +12 -12 xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java
Index: DOMParserImpl.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMParserImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMParserImpl.java 30 Jul 2003 13:38:53 -0000 1.2
+++ DOMParserImpl.java 6 Aug 2003 13:39:47 -0000 1.3
@@ -208,10 +208,10 @@
fConfiguration.setFeature(Constants.DOM_CANONICAL_FORM, false);
fConfiguration.setFeature(Constants.DOM_CDATA_SECTIONS, true);
fConfiguration.setFeature(Constants.DOM_CHARSET_OVERRIDES_XML_ENCODING,
true);
- fConfiguration.setFeature(Constants.DOM_INFOSET, false);
+ fConfiguration.setFeature(Constants.DOM_INFOSET, true);
fConfiguration.setFeature(Constants.DOM_NAMESPACE_DECLARATIONS, true);
- fConfiguration.setFeature(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY, false);
- fConfiguration.setFeature(Constants.DOM_WELLFORMED, true);
+ fConfiguration.setFeature(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY, false);
+ fConfiguration.setFeature(Constants.DOM_WELLFORMED, true);
// REVISIT: by default Xerces assumes that input is certified.
// default is different from the one specified in the DOM spec
@@ -327,8 +327,7 @@
else if (name.equals(Constants.DOM_ENTITIES)) {
fConfiguration.setFeature(CREATE_ENTITY_REF_NODES, state);
}
- else if (name.equals(Constants.DOM_INFOSET)
- ||
name.equals(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY)
+ else if
(name.equals(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY)
||
name.equals(Constants.DOM_CANONICAL_FORM)) {
if (state) { // true is not supported
String msg =
@@ -345,7 +344,8 @@
}
else if (name.equals(Constants.DOM_CDATA_SECTIONS)
||
name.equals(Constants.DOM_NAMESPACE_DECLARATIONS)
- ||
name.equals(Constants.DOM_WELLFORMED)) {
+ || name.equals(Constants.DOM_WELLFORMED)
+ || name.equals(Constants.DOM_INFOSET)) {
if (!state) { // false is not supported
String msg =
DOMMessageFormatter.formatMessage(
@@ -354,7 +354,7 @@
new Object[] { name });
throw new
DOMException(DOMException.NOT_SUPPORTED_ERR, msg);
}
- // setting these features to true is no-op
+ // setting these features to true is no-op
// REVISIT: implement "namespace-declaration"
feature
}
else if (name.equals(Constants.DOM_VALIDATE)) {
@@ -634,16 +634,16 @@
public boolean canSetParameter(String name, Object value) {
if(value instanceof Boolean){
boolean state = ((Boolean)value).booleanValue();
- if (name.equals(Constants.DOM_INFOSET)
- || name.equals(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY)
- || name.equals(Constants.DOM_CANONICAL_FORM)) {
+ if ( name.equals(Constants.DOM_SUPPORTED_MEDIATYPES_ONLY)
+ || name.equals(Constants.DOM_CANONICAL_FORM) ) {
// true is not supported
return (state) ? false : true;
}
else if (
name.equals(Constants.DOM_CDATA_SECTIONS)
||
name.equals(Constants.DOM_NAMESPACE_DECLARATIONS)
- || name.equals(Constants.DOM_WELLFORMED)) {
+ || name.equals(Constants.DOM_WELLFORMED)
+ || name.equals(Constants.DOM_INFOSET) ) {
// false is not supported
return (state) ? true : false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
