elena 2003/11/14 15:56:05 Modified: java/src/org/apache/xerces/dom DOMConfigurationImpl.java java/src/org/apache/xerces/impl/msg DOMMessages.properties java/src/org/apache/xerces/parsers DOMParserImpl.java java/src/org/apache/xml/serialize DOMSerializerImpl.java Log: Committing patches from Neil Delima ( DOM TYPE_MISMATCH_ERR) Revision Changes Path 1.12 +7 -7 xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java Index: DOMConfigurationImpl.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/dom/DOMConfigurationImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- DOMConfigurationImpl.java 13 Nov 2003 22:47:14 -0000 1.11 +++ DOMConfigurationImpl.java 14 Nov 2003 23:56:05 -0000 1.12 @@ -643,7 +643,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -660,7 +660,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -696,7 +696,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -727,7 +727,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -743,7 +743,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -757,7 +757,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } 1.5 +2 -1 xml-xerces/java/src/org/apache/xerces/impl/msg/DOMMessages.properties Index: DOMMessages.properties =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/DOMMessages.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DOMMessages.properties 3 Jan 2003 21:51:43 -0000 1.4 +++ DOMMessages.properties 14 Nov 2003 23:56:05 -0000 1.5 @@ -27,6 +27,7 @@ SYNTAX_ERR = An invalid or illegal string is specified. VALIDATION_ERR = A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar. WRONG_DOCUMENT_ERR = A node is used in a different document than the one that created it. +TYPE_MISMATCH_ERR = The value type for this parameter name is incompatible with the expected value type. #error messages or exceptions FEATURE_NOT_SUPPORTED = The parameter {0} is recognized but the requested value cannot be set. 1.5 +5 -5 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DOMParserImpl.java 13 Nov 2003 22:47:16 -0000 1.4 +++ DOMParserImpl.java 14 Nov 2003 23:56:05 -0000 1.5 @@ -413,7 +413,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -431,7 +431,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -479,7 +479,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } @@ -517,7 +517,7 @@ String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_SUPPORTED_ERR, msg); } 1.5 +3 -3 xml-xerces/java/src/org/apache/xml/serialize/DOMSerializerImpl.java Index: DOMSerializerImpl.java =================================================================== RCS file: /home/cvs/xml-xerces/java/src/org/apache/xml/serialize/DOMSerializerImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DOMSerializerImpl.java 13 Nov 2003 22:47:16 -0000 1.4 +++ DOMSerializerImpl.java 14 Nov 2003 23:56:05 -0000 1.5 @@ -202,7 +202,7 @@ // REVISIT: modify error exception to TYPE_MISMATCH String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_FOUND_ERR, msg); } @@ -215,7 +215,7 @@ // REVISIT: modify error exception to TYPE_MISMATCH String msg = DOMMessageFormatter.formatMessage( DOMMessageFormatter.DOM_DOMAIN, - "FEATURE_NOT_SUPPORTED", + "TYPE_MISMATCH_ERR", new Object[] { name }); throw new DOMException(DOMException.NOT_FOUND_ERR, msg); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]