You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2007/03/09 05:55:34 UTC

svn commit: r516299 - /xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java

Author: mrglavas
Date: Thu Mar  8 20:55:33 2007
New Revision: 516299

URL: http://svn.apache.org/viewvc?view=rev&rev=516299
Log:
When support for DTD validation support was added to DOMNormalizer we forgot to add 
"http://www.w3.org/TR/REC-xml" as an allowable value for the "schema-type" property.
The entity resolver property wasn't included in the parameter list returned from 
getParameterNames() and was not accounted for in canSetParameter(). Both of these
minor bugs should be fixed now.

Modified:
    xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java

Modified: xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java?view=diff&rev=516299&r1=516298&r2=516299
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/dom/DOMConfigurationImpl.java Thu Mar  8 20:55:33 2007
@@ -1036,8 +1036,12 @@
         }
         else if (name.equalsIgnoreCase(Constants.DOM_SCHEMA_TYPE)) {
             // REVISIT: should null value be supported?
-            //as of now we are only supporting W3C XML Schema
-            return ( (value instanceof String) && value.equals(Constants.NS_XMLSCHEMA) ) ? true : false ;
+            // as of now we are only supporting W3C XML Schema and DTD.
+            return ((value instanceof String) && 
+                    (value.equals(Constants.NS_XMLSCHEMA) || value.equals(Constants.NS_DTD))) ? true : false;
+        }
+        else if (name.equalsIgnoreCase(ENTITY_RESOLVER)) {
+            return (value instanceof XMLEntityResolver) ? true : false;
         }
         else if (name.equalsIgnoreCase(SYMBOL_TABLE)){
             // Xerces Symbol Table
@@ -1061,47 +1065,48 @@
      * can be set by the application. Note that this list can also contain
      * parameter names defined outside this specification.
      */
-    public DOMStringList getParameterNames() {
-    	if (fRecognizedParameters == null){
-			Vector parameters = new Vector();
-
-			//Add DOM recognized parameters
-			//REVISIT: Would have been nice to have a list of
-			//recognized paramters.
-			parameters.add(Constants.DOM_COMMENTS);
-			parameters.add(Constants.DOM_DATATYPE_NORMALIZATION);
-			parameters.add(Constants.DOM_CDATA_SECTIONS);
-			parameters.add(Constants.DOM_ENTITIES);
-			parameters.add(Constants.DOM_SPLIT_CDATA);
-			parameters.add(Constants.DOM_NAMESPACES);
-			parameters.add(Constants.DOM_VALIDATE);
-
-			parameters.add(Constants.DOM_INFOSET);
-			parameters.add(Constants.DOM_NORMALIZE_CHARACTERS);
-			parameters.add(Constants.DOM_CANONICAL_FORM);
-			parameters.add(Constants.DOM_VALIDATE_IF_SCHEMA);
-			parameters.add(Constants.DOM_CHECK_CHAR_NORMALIZATION);
-			parameters.add(Constants.DOM_WELLFORMED);
-
-			parameters.add(Constants.DOM_NAMESPACE_DECLARATIONS);
-			parameters.add(Constants.DOM_ELEMENT_CONTENT_WHITESPACE);
-
-			parameters.add(Constants.DOM_ERROR_HANDLER);
-			parameters.add(Constants.DOM_SCHEMA_TYPE);
-			parameters.add(Constants.DOM_SCHEMA_LOCATION);
-			parameters.add(Constants.DOM_RESOURCE_RESOLVER);
-
-			//Add recognized xerces features and properties
-			parameters.add(GRAMMAR_POOL);
-			parameters.add(SYMBOL_TABLE);
-			parameters.add(SEND_PSVI);
+	public DOMStringList getParameterNames() {
+	    if (fRecognizedParameters == null){
+	        Vector parameters = new Vector();
+
+	        //Add DOM recognized parameters
+	        //REVISIT: Would have been nice to have a list of
+	        //recognized paramters.
+	        parameters.add(Constants.DOM_COMMENTS);
+	        parameters.add(Constants.DOM_DATATYPE_NORMALIZATION);
+	        parameters.add(Constants.DOM_CDATA_SECTIONS);
+	        parameters.add(Constants.DOM_ENTITIES);
+	        parameters.add(Constants.DOM_SPLIT_CDATA);
+	        parameters.add(Constants.DOM_NAMESPACES);
+	        parameters.add(Constants.DOM_VALIDATE);
+
+	        parameters.add(Constants.DOM_INFOSET);
+	        parameters.add(Constants.DOM_NORMALIZE_CHARACTERS);
+	        parameters.add(Constants.DOM_CANONICAL_FORM);
+	        parameters.add(Constants.DOM_VALIDATE_IF_SCHEMA);
+	        parameters.add(Constants.DOM_CHECK_CHAR_NORMALIZATION);
+	        parameters.add(Constants.DOM_WELLFORMED);
+
+	        parameters.add(Constants.DOM_NAMESPACE_DECLARATIONS);
+	        parameters.add(Constants.DOM_ELEMENT_CONTENT_WHITESPACE);
+
+	        parameters.add(Constants.DOM_ERROR_HANDLER);
+	        parameters.add(Constants.DOM_SCHEMA_TYPE);
+	        parameters.add(Constants.DOM_SCHEMA_LOCATION);
+	        parameters.add(Constants.DOM_RESOURCE_RESOLVER);
+
+	        //Add recognized xerces features and properties
+	        parameters.add(ENTITY_RESOLVER);
+	        parameters.add(GRAMMAR_POOL);
+	        parameters.add(SYMBOL_TABLE);
+	        parameters.add(SEND_PSVI);
 
-			fRecognizedParameters = new DOMStringListImpl(parameters);
+	        fRecognizedParameters = new DOMStringListImpl(parameters);
 
-    	}
+	    }
 
-    	return fRecognizedParameters;
-    }//getParameterNames
+	    return fRecognizedParameters;
+	}//getParameterNames
 
     //
     // Protected methods



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org