From a81d6abc197c5c23ef130891a4ac3939f79c0c81 Mon Sep 17 00:00:00 2001
From: Alberto Massari <amassari@apache.org>
Date: Mon, 12 May 2008 15:59:03 +0000
Subject: [PATCH] Error messages for DOMException are expected to be defined in
the same order of the corresponding enum, but we were missing several of them
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@655539 13f79535-47bb-0310-9956-ffa450edef68
---
src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml | 12 +++-
.../util/MsgLoaders/ICU/resources/root.txt | 10 ++-
.../InMemory/XercesMessages_en_US.hpp | 24 +++++--
.../MsgCatalog/XercesMessages_en_US.Msg | 50 ++++++++-------
src/xercesc/util/MsgLoaders/Win32/Version.rc | 50 ++++++++-------
src/xercesc/util/XMLDOMMsg.hpp | 64 ++++++++++---------
6 files changed, 127 insertions(+), 83 deletions(-)
diff --git a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
index 6d0368c30..60d10d013 100644
--- a/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
+++ b/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
@@ -746,21 +746,26 @@
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XMLDOMMsg">
<FatalError>
-<!--The following are DOMException error text, same order as DOMException::ExceptionCode enum -->
+<!--The following are DOMException error text, same order as DOMException::ExceptionCode enum; do not remove them unless the corresponding enum is also removed -->
<!--DOMEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMExceptionCode enum -->
<Message Id="DOMEXCEPTION_ERRX" Text="Just an index"/>
<Message Id="INDEX_SIZE_ERR" Text="The index or size is negative, or greater than the allowed value"/>
+ <Message Id="DOMSTRING_SIZE_ERR" Text="The specified range of text does not fit into a DOMString"/>
<Message Id="HIERARCHY_REQUEST_ERR" Text="An attempt was made to insert a node where it is not permitted"/>
<Message Id="WRONG_DOCUMENT_ERR" Text="A node is used in a different document than the one that created it"/>
<Message Id="INVALID_CHARACTER_ERR" Text="An invalid or illegal XML character is specified"/>
+ <Message Id="NO_DATA_ALLOWED_ERR" Text="The node does not support storing data"/>
<Message Id="NO_MODIFICATION_ALLOWED_ERR" Text="An attempt is made to modify an object where modifications are not allowed"/>
<Message Id="NOT_FOUND_ERR" Text="An attempt is made to reference a node in a context where it does not exist"/>
<Message Id="NOT_SUPPORTED_ERR" Text="The implementation does not support the requested type of object or operation"/>
<Message Id="INUSE_ATTRIBUTE_ERR" Text="An attempt is made to add an attribute that is already in use elsewhere"/>
- <Message Id="INVALID_STATE_ERR " Text="An attempt is made to use an object that is not, or is no longer, usable."/>
+ <Message Id="INVALID_STATE_ERR" Text="An attempt is made to use an object that is not, or is no longer, usable"/>
+ <Message Id="SYNTAX_ERR" Text="An invalid or illegal string has been specified"/>
+ <Message Id="INVALID_MODIFICATION_ERR" Text="An attempt has been made to modify the type of the underlying object"/>
<Message Id="NAMESPACE_ERR" Text="An attempt is made to create or change an object in a way which is incorrect with regard to namespaces"/>
- <Message Id="INVALID_ACCESS_ERR" Text="An attempt is made to use an object that is not, or is no longer, usable"/>
+ <Message Id="INVALID_ACCESS_ERR" Text="The parameter or the requested operation is not supported by the underlying object"/>
<Message Id="VALIDATION_ERR" Text="A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar"/>
+ <Message Id="TYPE_MISMATCH_ERR" Text="The type of an object is incompatible with the expected type of the parameter associated to the object"/>
<!--The following are DOMRangeException error text, same order as DOMRangeException::RangeExceptionCode enum -->
<!--DOMRANGEEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMRangeException::RangeExceptionCode enum -->
<Message Id="DOMRANGEEXCEPTION_ERRX" Text="Just an index"/>
@@ -770,6 +775,7 @@
<!--DOMLSEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMLSException::LSExceptionCode enum -->
<Message Id="DOMLSEXCEPTION_ERRX" Text="Just an index"/>
<Message Id="PARSE_ERR" Text="An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped"/>
+ <Message Id="SERIALIZE_ERR" Text="An attempt was made to serialize a DOMNode using DOMLSSerializer, and the processing has been stopped"/>
<!--The following are DOMXPathException error text, same order as DOMXPathException::ExceptionCode enum -->
<!--DOMXPATHEXCEPTION_ERRX is not an error, it's just used to indicate the start of DOMXPathException::ExceptionCode enum -->
<Message Id="DOMXPATHEXCEPTION_ERRX" Text="Just an index"/>
diff --git a/src/xercesc/util/MsgLoaders/ICU/resources/root.txt b/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
index 7e5f501da..557dce04b 100644
--- a/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
+++ b/src/xercesc/util/MsgLoaders/ICU/resources/root.txt
@@ -752,22 +752,28 @@ root {
"F_ Start " ,
"Just an index" ,
"The index or size is negative, or greater than the allowed value" ,
+ "The specified range of text does not fit into a DOMString" ,
"An attempt was made to insert a node where it is not permitted" ,
"A node is used in a different document than the one that created it" ,
"An invalid or illegal XML character is specified" ,
+ "The node does not support storing data" ,
"An attempt is made to modify an object where modifications are not allowed" ,
"An attempt is made to reference a node in a context where it does not exist" ,
"The implementation does not support the requested type of object or operation" ,
"An attempt is made to add an attribute that is already in use elsewhere" ,
- "An attempt is made to use an object that is not, or is no longer, usable." ,
- "An attempt is made to create or change an object in a way which is incorrect with regard to namespaces" ,
"An attempt is made to use an object that is not, or is no longer, usable" ,
+ "An invalid or illegal string has been specified" ,
+ "An attempt has been made to modify the type of the underlying object" ,
+ "An attempt is made to create or change an object in a way which is incorrect with regard to namespaces" ,
+ "The parameter or the requested operation is not supported by the underlying object" ,
"A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar" ,
+ "The type of an object is incompatible with the expected type of the parameter associated to the object" ,
"Just an index" ,
"The boundary-points of a Range do not meet specific requirements" ,
"The container of a Range's boundary-point is set to a node of an invalid type or to a node with an ancestor of an invalid type" ,
"Just an index" ,
"An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped" ,
+ "An attempt was made to serialize a DOMNode using DOMLSSerializer, and the processing has been stopped" ,
"Just an index" ,
"The expression has a syntax error, or contains XPath features not supported by the XPath for XMLSchema syntax" ,
"The requested result type is not supported" ,
diff --git a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
index 214fc2bd7..4f20ffef6 100644
--- a/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
+++ b/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
@@ -1505,12 +1505,16 @@ const XMLCh gXMLDOMMsgArray[][128] =
, { 0x004A,0x0075,0x0073,0x0074,0x0020,0x0061,0x006E,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x0020,0x006F,0x0072,0x0020,0x0073,0x0069,0x007A,0x0065,0x0020,0x0069,0x0073,0x0020,0x006E,0x0065,0x0067,0x0061,0x0074,0x0069,0x0076,0x0065,0x002C,0x0020,0x006F,0x0072,0x0020,0x0067,
0x0072,0x0065,0x0061,0x0074,0x0065,0x0072,0x0020,0x0074,0x0068,0x0061,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0069,0x0065,0x0064,0x0020,0x0072,0x0061,0x006E,0x0067,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0065,0x0078,0x0074,0x0020,0x0064,0x006F,0x0065,0x0073,0x0020,0x006E,0x006F,
+ 0x0074,0x0020,0x0066,0x0069,0x0074,0x0020,0x0069,0x006E,0x0074,0x006F,0x0020,0x0061,0x0020,0x0044,0x004F,0x004D,0x0053,0x0074,0x0072,0x0069,0x006E,0x0067,0x00 }
, { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0077,0x0061,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x0069,0x006E,0x0073,0x0065,0x0072,0x0074,0x0020,0x0061,0x0020,0x006E,0x006F,0x0064,
0x0065,0x0020,0x0077,0x0068,0x0065,0x0072,0x0065,0x0020,0x0069,0x0074,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0070,0x0065,0x0072,0x006D,0x0069,0x0074,0x0074,0x0065,0x0064,0x00 }
, { 0x0041,0x0020,0x006E,0x006F,0x0064,0x0065,0x0020,0x0069,0x0073,0x0020,0x0075,0x0073,0x0065,0x0064,0x0020,0x0069,0x006E,0x0020,0x0061,0x0020,0x0064,0x0069,0x0066,0x0066,0x0065,0x0072,0x0065,0x006E,0x0074,0x0020,0x0064,0x006F,0x0063,0x0075,0x006D,
0x0065,0x006E,0x0074,0x0020,0x0074,0x0068,0x0061,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x006F,0x006E,0x0065,0x0020,0x0074,0x0068,0x0061,0x0074,0x0020,0x0063,0x0072,0x0065,0x0061,0x0074,0x0065,0x0064,0x0020,0x0069,0x0074,0x00 }
, { 0x0041,0x006E,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x006F,0x0072,0x0020,0x0069,0x006C,0x006C,0x0065,0x0067,0x0061,0x006C,0x0020,0x0058,0x004D,0x004C,0x0020,0x0063,0x0068,0x0061,0x0072,0x0061,0x0063,0x0074,0x0065,0x0072,
0x0020,0x0069,0x0073,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0069,0x0065,0x0064,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x006E,0x006F,0x0064,0x0065,0x0020,0x0064,0x006F,0x0065,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0020,0x0073,0x0074,0x006F,0x0072,0x0069,0x006E,0x0067,0x0020,0x0064,
+ 0x0061,0x0074,0x0061,0x00 }
, { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0069,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x006D,0x006F,0x0064,0x0069,0x0066,0x0079,0x0020,0x0061,0x006E,0x0020,0x006F,0x0062,0x006A,
0x0065,0x0063,0x0074,0x0020,0x0077,0x0068,0x0065,0x0072,0x0065,0x0020,0x006D,0x006F,0x0064,0x0069,0x0066,0x0069,0x0063,0x0061,0x0074,0x0069,0x006F,0x006E,0x0073,0x0020,0x0061,0x0072,0x0065,0x0020,0x006E,0x006F,0x0074,0x0020,0x0061,0x006C,0x006C,
0x006F,0x0077,0x0065,0x0064,0x00 }
@@ -1525,17 +1529,24 @@ const XMLCh gXMLDOMMsgArray[][128] =
0x0065,0x00 }
, { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0069,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x0075,0x0073,0x0065,0x0020,0x0061,0x006E,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,
0x0020,0x0074,0x0068,0x0061,0x0074,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x002C,0x0020,0x006F,0x0072,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0020,0x006C,0x006F,0x006E,0x0067,0x0065,0x0072,0x002C,0x0020,0x0075,0x0073,0x0061,0x0062,
- 0x006C,0x0065,0x002E,0x00 }
+ 0x006C,0x0065,0x00 }
+ , { 0x0041,0x006E,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x006F,0x0072,0x0020,0x0069,0x006C,0x006C,0x0065,0x0067,0x0061,0x006C,0x0020,0x0073,0x0074,0x0072,0x0069,0x006E,0x0067,0x0020,0x0068,0x0061,0x0073,0x0020,0x0062,0x0065,
+ 0x0065,0x006E,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0069,0x0065,0x0064,0x00 }
+ , { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0068,0x0061,0x0073,0x0020,0x0062,0x0065,0x0065,0x006E,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x006D,0x006F,0x0064,0x0069,0x0066,0x0079,0x0020,
+ 0x0074,0x0068,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0075,0x006E,0x0064,0x0065,0x0072,0x006C,0x0079,0x0069,0x006E,0x0067,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,0x00 }
, { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0069,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x0063,0x0072,0x0065,0x0061,0x0074,0x0065,0x0020,0x006F,0x0072,0x0020,0x0063,0x0068,0x0061,
0x006E,0x0067,0x0065,0x0020,0x0061,0x006E,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,0x0020,0x0069,0x006E,0x0020,0x0061,0x0020,0x0077,0x0061,0x0079,0x0020,0x0077,0x0068,0x0069,0x0063,0x0068,0x0020,0x0069,0x0073,0x0020,0x0069,0x006E,0x0063,
0x006F,0x0072,0x0072,0x0065,0x0063,0x0074,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0072,0x0065,0x0067,0x0061,0x0072,0x0064,0x0020,0x0074,0x006F,0x0020,0x006E,0x0061,0x006D,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0073,0x00 }
- , { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0069,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x0075,0x0073,0x0065,0x0020,0x0061,0x006E,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,
- 0x0020,0x0074,0x0068,0x0061,0x0074,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x002C,0x0020,0x006F,0x0072,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0020,0x006C,0x006F,0x006E,0x0067,0x0065,0x0072,0x002C,0x0020,0x0075,0x0073,0x0061,0x0062,
- 0x006C,0x0065,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0070,0x0061,0x0072,0x0061,0x006D,0x0065,0x0074,0x0065,0x0072,0x0020,0x006F,0x0072,0x0020,0x0074,0x0068,0x0065,0x0020,0x0072,0x0065,0x0071,0x0075,0x0065,0x0073,0x0074,0x0065,0x0064,0x0020,0x006F,0x0070,0x0065,0x0072,
+ 0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x0062,0x0079,0x0020,0x0074,0x0068,0x0065,0x0020,0x0075,0x006E,0x0064,0x0065,0x0072,
+ 0x006C,0x0079,0x0069,0x006E,0x0067,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,0x00 }
, { 0x0041,0x0020,0x0063,0x0061,0x006C,0x006C,0x0020,0x0074,0x006F,0x0020,0x0061,0x0020,0x006D,0x0065,0x0074,0x0068,0x006F,0x0064,0x0020,0x0073,0x0075,0x0063,0x0068,0x0020,0x0061,0x0073,0x0020,0x0069,0x006E,0x0073,0x0065,0x0072,0x0074,0x0042,0x0065,
0x0066,0x006F,0x0072,0x0065,0x0020,0x006F,0x0072,0x0020,0x0072,0x0065,0x006D,0x006F,0x0076,0x0065,0x0043,0x0068,0x0069,0x006C,0x0064,0x0020,0x0077,0x006F,0x0075,0x006C,0x0064,0x0020,0x006D,0x0061,0x006B,0x0065,0x0020,0x0074,0x0068,0x0065,0x0020,
0x004E,0x006F,0x0064,0x0065,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0072,0x0065,0x0073,0x0070,0x0065,0x0063,0x0074,0x0020,0x0074,0x006F,0x0020,0x0064,0x006F,0x0063,0x0075,0x006D,0x0065,
0x006E,0x0074,0x0020,0x0067,0x0072,0x0061,0x006D,0x006D,0x0061,0x0072,0x00 }
+ , { 0x0054,0x0068,0x0065,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x006F,0x0066,0x0020,0x0061,0x006E,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,0x0020,0x0069,0x0073,0x0020,0x0069,0x006E,0x0063,0x006F,0x006D,0x0070,0x0061,0x0074,0x0069,0x0062,
+ 0x006C,0x0065,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0074,0x0068,0x0065,0x0020,0x0065,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x006F,0x0066,0x0020,0x0074,0x0068,0x0065,0x0020,0x0070,0x0061,
+ 0x0072,0x0061,0x006D,0x0065,0x0074,0x0065,0x0072,0x0020,0x0061,0x0073,0x0073,0x006F,0x0063,0x0069,0x0061,0x0074,0x0065,0x0064,0x0020,0x0074,0x006F,0x0020,0x0074,0x0068,0x0065,0x0020,0x006F,0x0062,0x006A,0x0065,0x0063,0x0074,0x00 }
, { 0x004A,0x0075,0x0073,0x0074,0x0020,0x0061,0x006E,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0062,0x006F,0x0075,0x006E,0x0064,0x0061,0x0072,0x0079,0x002D,0x0070,0x006F,0x0069,0x006E,0x0074,0x0073,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0052,0x0061,0x006E,0x0067,0x0065,0x0020,0x0064,0x006F,0x0020,0x006E,
0x006F,0x0074,0x0020,0x006D,0x0065,0x0065,0x0074,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0069,0x0063,0x0020,0x0072,0x0065,0x0071,0x0075,0x0069,0x0072,0x0065,0x006D,0x0065,0x006E,0x0074,0x0073,0x00 }
@@ -1548,6 +1559,9 @@ const XMLCh gXMLDOMMsgArray[][128] =
0x0065,0x006E,0x0074,0x002C,0x0020,0x006F,0x0072,0x0020,0x0061,0x006E,0x0020,0x0058,0x004D,0x004C,0x0020,0x0046,0x0072,0x0061,0x0067,0x006D,0x0065,0x006E,0x0074,0x002C,0x0020,0x0075,0x0073,0x0069,0x006E,0x0067,0x0020,0x0044,0x004F,0x004D,0x004C,
0x0053,0x0050,0x0061,0x0072,0x0073,0x0065,0x0072,0x0020,0x0061,0x006E,0x0064,0x0020,0x0074,0x0068,0x0065,0x0020,0x0070,0x0072,0x006F,0x0063,0x0065,0x0073,0x0073,0x0069,0x006E,0x0067,0x0020,0x0068,0x0061,0x0073,0x0020,0x0062,0x0065,0x0065,0x006E,
0x0020,0x0073,0x0074,0x006F,0x0070,0x0070,0x0065,0x0064,0x00 }
+ , { 0x0041,0x006E,0x0020,0x0061,0x0074,0x0074,0x0065,0x006D,0x0070,0x0074,0x0020,0x0077,0x0061,0x0073,0x0020,0x006D,0x0061,0x0064,0x0065,0x0020,0x0074,0x006F,0x0020,0x0073,0x0065,0x0072,0x0069,0x0061,0x006C,0x0069,0x007A,0x0065,0x0020,0x0061,0x0020,
+ 0x0044,0x004F,0x004D,0x004E,0x006F,0x0064,0x0065,0x0020,0x0075,0x0073,0x0069,0x006E,0x0067,0x0020,0x0044,0x004F,0x004D,0x004C,0x0053,0x0053,0x0065,0x0072,0x0069,0x0061,0x006C,0x0069,0x007A,0x0065,0x0072,0x002C,0x0020,0x0061,0x006E,0x0064,0x0020,
+ 0x0074,0x0068,0x0065,0x0020,0x0070,0x0072,0x006F,0x0063,0x0065,0x0073,0x0073,0x0069,0x006E,0x0067,0x0020,0x0068,0x0061,0x0073,0x0020,0x0062,0x0065,0x0065,0x006E,0x0020,0x0073,0x0074,0x006F,0x0070,0x0070,0x0065,0x0064,0x00 }
, { 0x004A,0x0075,0x0073,0x0074,0x0020,0x0061,0x006E,0x0020,0x0069,0x006E,0x0064,0x0065,0x0078,0x00 }
, { 0x0054,0x0068,0x0065,0x0020,0x0065,0x0078,0x0070,0x0072,0x0065,0x0073,0x0073,0x0069,0x006F,0x006E,0x0020,0x0068,0x0061,0x0073,0x0020,0x0061,0x0020,0x0073,0x0079,0x006E,0x0074,0x0061,0x0078,0x0020,0x0065,0x0072,0x0072,0x006F,0x0072,0x002C,0x0020,
0x006F,0x0072,0x0020,0x0063,0x006F,0x006E,0x0074,0x0061,0x0069,0x006E,0x0073,0x0020,0x0058,0x0050,0x0061,0x0074,0x0068,0x0020,0x0066,0x0065,0x0061,0x0074,0x0075,0x0072,0x0065,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,
@@ -1565,7 +1579,7 @@ const XMLCh gXMLDOMMsgArray[][128] =
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLDOMMsgArraySize = 33;
+const unsigned int gXMLDOMMsgArraySize = 39;
XERCES_CPP_NAMESPACE_END
diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
index d22d35e58..c09dfc2b3 100644
--- a/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
+++ b/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
@@ -731,29 +731,35 @@ $set 3
$set 4
2 Just an index
3 The index or size is negative, or greater than the allowed value
-4 An attempt was made to insert a node where it is not permitted
-5 A node is used in a different document than the one that created it
-6 An invalid or illegal XML character is specified
-7 An attempt is made to modify an object where modifications are not allowed
-8 An attempt is made to reference a node in a context where it does not exist
-9 The implementation does not support the requested type of object or operation
-10 An attempt is made to add an attribute that is already in use elsewhere
-11 An attempt is made to use an object that is not, or is no longer, usable.
-12 An attempt is made to create or change an object in a way which is incorrect with regard to namespaces
+4 The specified range of text does not fit into a DOMString
+5 An attempt was made to insert a node where it is not permitted
+6 A node is used in a different document than the one that created it
+7 An invalid or illegal XML character is specified
+8 The node does not support storing data
+9 An attempt is made to modify an object where modifications are not allowed
+10 An attempt is made to reference a node in a context where it does not exist
+11 The implementation does not support the requested type of object or operation
+12 An attempt is made to add an attribute that is already in use elsewhere
13 An attempt is made to use an object that is not, or is no longer, usable
-14 A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar
-15 Just an index
-16 The boundary-points of a Range do not meet specific requirements
-17 The container of a Range's boundary-point is set to a node of an invalid type or to a node with an ancestor of an invalid type
-18 Just an index
-19 An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped
+14 An invalid or illegal string has been specified
+15 An attempt has been made to modify the type of the underlying object
+16 An attempt is made to create or change an object in a way which is incorrect with regard to namespaces
+17 The parameter or the requested operation is not supported by the underlying object
+18 A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar
+19 The type of an object is incompatible with the expected type of the parameter associated to the object
20 Just an index
-21 The expression has a syntax error, or contains XPath features not supported by the XPath for XMLSchema syntax
-22 The requested result type is not supported
-23 Nested CDATA sections
-24 Unrepresentable character data
-25 Unrecognized Node Type
-26 Parse may not be called while parsing
-27 Parsing has been aborted by the user
+21 The boundary-points of a Range do not meet specific requirements
+22 The container of a Range's boundary-point is set to a node of an invalid type or to a node with an ancestor of an invalid type
+23 Just an index
+24 An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped
+25 An attempt was made to serialize a DOMNode using DOMLSSerializer, and the processing has been stopped
+26 Just an index
+27 The expression has a syntax error, or contains XPath features not supported by the XPath for XMLSchema syntax
+28 The requested result type is not supported
+29 Nested CDATA sections
+30 Unrepresentable character data
+31 Unrecognized Node Type
+32 Parse may not be called while parsing
+33 Parsing has been aborted by the user
diff --git a/src/xercesc/util/MsgLoaders/Win32/Version.rc b/src/xercesc/util/MsgLoaders/Win32/Version.rc
index 834271050..2fa9ad35a 100644
--- a/src/xercesc/util/MsgLoaders/Win32/Version.rc
+++ b/src/xercesc/util/MsgLoaders/Win32/Version.rc
@@ -834,30 +834,36 @@ STRINGTABLE DISCARDABLE
BEGIN
24578 L"Just an index\x00"
24579 L"The index or size is negative, or greater than the allowed value\x00"
- 24580 L"An attempt was made to insert a node where it is not permitted\x00"
- 24581 L"A node is used in a different document than the one that created it\x00"
- 24582 L"An invalid or illegal XML character is specified\x00"
- 24583 L"An attempt is made to modify an object where modifications are not allowed\x00"
- 24584 L"An attempt is made to reference a node in a context where it does not exist\x00"
- 24585 L"The implementation does not support the requested type of object or operation\x00"
- 24586 L"An attempt is made to add an attribute that is already in use elsewhere\x00"
- 24587 L"An attempt is made to use an object that is not, or is no longer, usable.\x00"
- 24588 L"An attempt is made to create or change an object in a way which is incorrect with regard to namespaces\x00"
+ 24580 L"The specified range of text does not fit into a DOMString\x00"
+ 24581 L"An attempt was made to insert a node where it is not permitted\x00"
+ 24582 L"A node is used in a different document than the one that created it\x00"
+ 24583 L"An invalid or illegal XML character is specified\x00"
+ 24584 L"The node does not support storing data\x00"
+ 24585 L"An attempt is made to modify an object where modifications are not allowed\x00"
+ 24586 L"An attempt is made to reference a node in a context where it does not exist\x00"
+ 24587 L"The implementation does not support the requested type of object or operation\x00"
+ 24588 L"An attempt is made to add an attribute that is already in use elsewhere\x00"
24589 L"An attempt is made to use an object that is not, or is no longer, usable\x00"
- 24590 L"A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar\x00"
- 24591 L"Just an index\x00"
- 24592 L"The boundary-points of a Range do not meet specific requirements\x00"
- 24593 L"The container of a Range's boundary-point is set to a node of an invalid type or to a node with an ancestor of an invalid type\x00"
- 24594 L"Just an index\x00"
- 24595 L"An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped\x00"
+ 24590 L"An invalid or illegal string has been specified\x00"
+ 24591 L"An attempt has been made to modify the type of the underlying object\x00"
+ 24592 L"An attempt is made to create or change an object in a way which is incorrect with regard to namespaces\x00"
+ 24593 L"The parameter or the requested operation is not supported by the underlying object\x00"
+ 24594 L"A call to a method such as insertBefore or removeChild would make the Node invalid with respect to document grammar\x00"
+ 24595 L"The type of an object is incompatible with the expected type of the parameter associated to the object\x00"
24596 L"Just an index\x00"
- 24597 L"The expression has a syntax error, or contains XPath features not supported by the XPath for XMLSchema syntax\x00"
- 24598 L"The requested result type is not supported\x00"
- 24599 L"Nested CDATA sections\x00"
- 24600 L"Unrepresentable character data\x00"
- 24601 L"Unrecognized Node Type\x00"
- 24602 L"Parse may not be called while parsing\x00"
- 24603 L"Parsing has been aborted by the user\x00"
+ 24597 L"The boundary-points of a Range do not meet specific requirements\x00"
+ 24598 L"The container of a Range's boundary-point is set to a node of an invalid type or to a node with an ancestor of an invalid type\x00"
+ 24599 L"Just an index\x00"
+ 24600 L"An attempt was made to load a document, or an XML Fragment, using DOMLSParser and the processing has been stopped\x00"
+ 24601 L"An attempt was made to serialize a DOMNode using DOMLSSerializer, and the processing has been stopped\x00"
+ 24602 L"Just an index\x00"
+ 24603 L"The expression has a syntax error, or contains XPath features not supported by the XPath for XMLSchema syntax\x00"
+ 24604 L"The requested result type is not supported\x00"
+ 24605 L"Nested CDATA sections\x00"
+ 24606 L"Unrepresentable character data\x00"
+ 24607 L"Unrecognized Node Type\x00"
+ 24608 L"Parse may not be called while parsing\x00"
+ 24609 L"Parsing has been aborted by the user\x00"
END
#endif // English (U.S.) resources
diff --git a/src/xercesc/util/XMLDOMMsg.hpp b/src/xercesc/util/XMLDOMMsg.hpp
index 2e72796c5..430f16fa0 100644
--- a/src/xercesc/util/XMLDOMMsg.hpp
+++ b/src/xercesc/util/XMLDOMMsg.hpp
@@ -18,35 +18,41 @@ public :
, F_LowBounds = 1
, DOMEXCEPTION_ERRX = 2
, INDEX_SIZE_ERR = 3
- , HIERARCHY_REQUEST_ERR = 4
- , WRONG_DOCUMENT_ERR = 5
- , INVALID_CHARACTER_ERR = 6
- , NO_MODIFICATION_ALLOWED_ERR = 7
- , NOT_FOUND_ERR = 8
- , NOT_SUPPORTED_ERR = 9
- , INUSE_ATTRIBUTE_ERR = 10
- , INVALID_STATE_ERR = 11
- , NAMESPACE_ERR = 12
- , INVALID_ACCESS_ERR = 13
- , VALIDATION_ERR = 14
- , DOMRANGEEXCEPTION_ERRX = 15
- , BAD_BOUNDARYPOINTS_ERR = 16
- , INVALID_NODE_TYPE_ERR = 17
- , DOMLSEXCEPTION_ERRX = 18
- , PARSE_ERR = 19
- , DOMXPATHEXCEPTION_ERRX = 20
- , INVALID_EXPRESSION_ERR = 21
- , TYPE_ERR = 22
- , Writer_NestedCDATA = 23
- , Writer_NotRepresentChar = 24
- , Writer_NotRecognizedType = 25
- , LSParser_ParseInProgress = 26
- , LSParser_ParsingAborted = 27
- , F_HighBounds = 28
- , W_LowBounds = 29
- , W_HighBounds = 30
- , E_LowBounds = 31
- , E_HighBounds = 32
+ , DOMSTRING_SIZE_ERR = 4
+ , HIERARCHY_REQUEST_ERR = 5
+ , WRONG_DOCUMENT_ERR = 6
+ , INVALID_CHARACTER_ERR = 7
+ , NO_DATA_ALLOWED_ERR = 8
+ , NO_MODIFICATION_ALLOWED_ERR = 9
+ , NOT_FOUND_ERR = 10
+ , NOT_SUPPORTED_ERR = 11
+ , INUSE_ATTRIBUTE_ERR = 12
+ , INVALID_STATE_ERR = 13
+ , SYNTAX_ERR = 14
+ , INVALID_MODIFICATION_ERR = 15
+ , NAMESPACE_ERR = 16
+ , INVALID_ACCESS_ERR = 17
+ , VALIDATION_ERR = 18
+ , TYPE_MISMATCH_ERR = 19
+ , DOMRANGEEXCEPTION_ERRX = 20
+ , BAD_BOUNDARYPOINTS_ERR = 21
+ , INVALID_NODE_TYPE_ERR = 22
+ , DOMLSEXCEPTION_ERRX = 23
+ , PARSE_ERR = 24
+ , SERIALIZE_ERR = 25
+ , DOMXPATHEXCEPTION_ERRX = 26
+ , INVALID_EXPRESSION_ERR = 27
+ , TYPE_ERR = 28
+ , Writer_NestedCDATA = 29
+ , Writer_NotRepresentChar = 30
+ , Writer_NotRecognizedType = 31
+ , LSParser_ParseInProgress = 32
+ , LSParser_ParsingAborted = 33
+ , F_HighBounds = 34
+ , W_LowBounds = 35
+ , W_HighBounds = 36
+ , E_LowBounds = 37
+ , E_HighBounds = 38
};
static bool isFatal(const XMLDOMMsg::Codes toCheck)
--
GitLab