cargilld 2004/12/09 06:45:35
Modified: c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/util/Platforms/Win32 Version.rc
c/src/xercesc/validators/schema TraverseSchema.cpp
Log:
More error message updates.
Revision Changes Path
1.53 +5 -5 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- XMLErrList_EN_US.Xml 6 Dec 2004 11:38:09 -0000 1.52
+++ XMLErrList_EN_US.Xml 9 Dec 2004 14:45:33 -0000 1.53
@@ -28,7 +28,7 @@
<Message Id="AnonSimpleTypeWithName" Text="Anonymous simpleType
in element {0} has a name attribute"/>
<Message Id="InvalidElementContent" Text="The content of an
element information item does not match (annotation?, (simpleType |
complexType)?, (unique | key | keyref)*)"/>
<Message Id="UntypedElement" Text="Untyped element: {0}"/>
- <Message Id="SimpleTypeContentError" Text="Error in content of
simpleType"/>
+ <Message Id="SimpleTypeContentError" Text="Error in content of
simpleType, '{0}' is invalid. Only allowed one of (restriction | list |
union)."/>
<Message Id="ExpectedSimpleTypeInList" Text="Expected simpleType
in 'list' declaration for {0}"/>
<Message Id="ListUnionRestrictionError" Text="List | Union |
Restriction content is invalid for type {0}"/>
<Message Id="SimpleTypeDerivationByListError" Text="Error in
content of derivation by list for {0}"/>
@@ -665,10 +665,10 @@
<Message Id="FACET_len_base_fixed" Text="len '{0}' must be equal
to base's len '{1}' , fixed"/>
<Message Id="FACET_whitespace_base_fixed" Text="whitespace '{0}'
must be equal to base's whitespace '{1}' , fixed"/>
<Message Id="FACET_internalError_fixed" Text="internal Error:
fixed"/>
- <Message Id="FACET_List_Null_baseValidator" Text="Null base
validator in List "/>
- <Message Id="FACET_Union_Null_memberTypeValidators" Text="Null
member type validators in Union "/>
- <Message Id="FACET_Union_Null_baseValidator" Text="Null base
validator in Union"/>
- <Message Id="FACET_Union_invalid_baseValidatorType"
Text="Union's base validator's type '{0}' must be union too "/>
+ <Message Id="FACET_List_Null_baseValidator" Text="simpleType
list's 'itemType' is empty."/>
+ <Message Id="FACET_Union_Null_memberTypeValidators"
Text="simpleType union's 'memberTypes' is empty."/>
+ <Message Id="FACET_Union_Null_baseValidator" Text="simpleType
restriction's union 'base' is empty."/>
+ <Message Id="FACET_Union_invalid_baseValidatorType"
Text="simpleType restriction's union 'base' type is '{0}' instead of union."/>
<Message Id="VALUE_NotMatch_Pattern" Text="Value '{0}' does not
match regular expression facet '{1}'"/>
<Message Id="VALUE_Not_Base64" Text="Value '{0}' is not encoded
in Base64 "/>
<Message Id="VALUE_Not_HexBin" Text="Value '{0}' is not encoded
in HexBin "/>
1.45 +5 -5
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- en_US.txt 6 Dec 2004 11:38:10 -0000 1.44
+++ en_US.txt 9 Dec 2004 14:45:33 -0000 1.45
@@ -23,7 +23,7 @@
"Anonymous simpleType in element {0} has a name attribute " ,
"The content of an element information item does not match
(annotation?, (simpleType | complexType)?, (unique | key | keyref)*) " ,
"Untyped element: {0} " ,
- "Error in content of simpleType " ,
+ "Error in content of simpleType, '{0}' is invalid. Only
allowed one of (restriction | list | union). " ,
"Expected simpleType in 'list' declaration for {0} " ,
"List | Union | Restriction content is invalid for type {0} " ,
"Error in content of derivation by list for {0} " ,
@@ -666,10 +666,10 @@
"len '{0}' must be equal to base's len '{1}' , fixed " ,
"whitespace '{0}' must be equal to base's whitespace '{1}' ,
fixed " ,
"internal Error: fixed " ,
- "Null base validator in List " ,
- "Null member type validators in Union " ,
- "Null base validator in Union " ,
- "Union's base validator's type '{0}' must be union too " ,
+ "simpleType list's 'itemType' is empty. " ,
+ "simpleType union's 'memberTypes' is empty. " ,
+ "simpleType restriction's union 'base' is empty. " ,
+ "simpleType restriction's union 'base' type is '{0}' instead of
union. " ,
"Value '{0}' does not match regular expression facet '{1}' " ,
"Value '{0}' is not encoded in Base64 " ,
"Value '{0}' is not encoded in HexBin " ,
1.35 +11 -7
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- XercesMessages_en_US.hpp 6 Dec 2004 11:38:11 -0000 1.34
+++ XercesMessages_en_US.hpp 9 Dec 2004 14:45:33 -0000 1.35
@@ -54,7 +54,9 @@
0x002C,0x0020,0x0028,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x007C,0x0020,0x0063,0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0054,0x0079,0x0070,0x0065,0x0029,0x003F,0x002C,0x0020,0x0028,0x0075,0x006E,0x0069,
0x0071,0x0075,0x0065,0x0020,0x007C,0x0020,0x006B,0x0065,0x0079,0x0020,0x007C,0x0020,0x006B,0x0065,0x0079,0x0072,0x0065,0x0066,0x0029,0x002A,0x0029,0x00
}
, {
0x0055,0x006E,0x0074,0x0079,0x0070,0x0065,0x0064,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x003A,0x0020,0x007B,0x0030,0x007D,0x00
}
- , {
0x0045,0x0072,0x0072,0x006F,0x0072,0x0020,0x0069,0x006E,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x006F,0x0066,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x00
}
+ , {
0x0045,0x0072,0x0072,0x006F,0x0072,0x0020,0x0069,0x006E,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x006F,0x0066,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x002C,0x0020,0x0027,0x007B,0x0030,
+
0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x002E,0x0020,0x0020,0x004F,0x006E,0x006C,0x0079,0x0020,0x0061,0x006C,0x006C,0x006F,0x0077,0x0065,0x0064,0x0020,0x006F,0x006E,0x0065,0x0020,0x006F,0x0066,
+
0x0020,0x0028,0x0072,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x0020,0x007C,0x0020,0x006C,0x0069,0x0073,0x0074,0x0020,0x007C,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x0029,0x002E,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0069,0x006E,0x0020,0x0027,0x006C,0x0069,0x0073,0x0074,0x0027,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,
0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0066,0x006F,0x0072,0x0020,0x007B,0x0030,0x007D,0x00
}
, {
0x004C,0x0069,0x0073,0x0074,0x0020,0x007C,0x0020,0x0055,0x006E,0x0069,0x006F,0x006E,0x0020,0x007C,0x0020,0x0052,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,
@@ -1364,12 +1366,14 @@
, {
0x0077,0x0068,0x0069,0x0074,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0065,0x0071,0x0075,0x0061,0x006C,0x0020,0x0074,0x006F,0x0020,0x0062,
0x0061,0x0073,0x0065,0x0027,0x0073,0x0020,0x0077,0x0068,0x0069,0x0074,0x0065,0x0073,0x0070,0x0061,0x0063,0x0065,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x002C,0x0020,0x0066,0x0069,0x0078,0x0065,0x0064,0x00
}
, {
0x0069,0x006E,0x0074,0x0065,0x0072,0x006E,0x0061,0x006C,0x0020,0x0045,0x0072,0x0072,0x006F,0x0072,0x003A,0x0020,0x0066,0x0069,0x0078,0x0065,0x0064,0x00
}
- , {
0x004E,0x0075,0x006C,0x006C,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x006F,0x0072,0x0020,0x0069,0x006E,0x0020,0x004C,0x0069,0x0073,0x0074,0x0020,0x00
}
- , {
0x004E,0x0075,0x006C,0x006C,0x0020,0x006D,0x0065,0x006D,0x0062,0x0065,0x0072,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x006F,0x0072,0x0073,0x0020,0x0069,0x006E,0x0020,0x0055,0x006E,0x0069,0x006F,
- 0x006E,0x0020,0x00 }
- , {
0x004E,0x0075,0x006C,0x006C,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x006F,0x0072,0x0020,0x0069,0x006E,0x0020,0x0055,0x006E,0x0069,0x006F,0x006E,0x00
}
- , {
0x0055,0x006E,0x0069,0x006F,0x006E,0x0027,0x0073,0x0020,0x0062,0x0061,0x0073,0x0065,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x006F,0x0072,0x0027,0x0073,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,
-
0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x0020,0x0074,0x006F,0x006F,0x0020,0x00
}
+ , {
0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x006C,0x0069,0x0073,0x0074,0x0027,0x0073,0x0020,0x0027,0x0069,0x0074,0x0065,0x006D,0x0054,0x0079,0x0070,0x0065,0x0027,0x0020,0x0069,0x0073,0x0020,0x0065,0x006D,0x0070,
+ 0x0074,0x0079,0x002E,0x00 }
+ , {
0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x0027,0x0073,0x0020,0x0027,0x006D,0x0065,0x006D,0x0062,0x0065,0x0072,0x0054,0x0079,0x0070,0x0065,0x0073,0x0027,0x0020,0x0069,0x0073,
+ 0x0020,0x0065,0x006D,0x0070,0x0074,0x0079,0x002E,0x00 }
+ , {
0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0072,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x0027,0x0073,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x0020,0x0027,0x0062,0x0061,0x0073,
+
0x0065,0x0027,0x0020,0x0069,0x0073,0x0020,0x0065,0x006D,0x0070,0x0074,0x0079,0x002E,0x00
}
+ , {
0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0072,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x0027,0x0073,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x0020,0x0027,0x0062,0x0061,0x0073,
+
0x0065,0x0027,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0069,0x0073,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x006E,0x0073,0x0074,0x0065,0x0061,0x0064,0x0020,0x006F,0x0066,0x0020,0x0075,0x006E,0x0069,0x006F,0x006E,0x002E,0x00
}
, {
0x0056,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0064,0x006F,0x0065,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x006D,0x0061,0x0074,0x0063,0x0068,0x0020,0x0072,0x0065,0x0067,0x0075,0x006C,0x0061,0x0072,0x0020,
0x0065,0x0078,0x0070,0x0072,0x0065,0x0073,0x0073,0x0069,0x006F,0x006E,0x0020,0x0066,0x0061,0x0063,0x0065,0x0074,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x00
}
, {
0x0056,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0065,0x006E,0x0063,0x006F,0x0064,0x0065,0x0064,0x0020,0x0069,0x006E,0x0020,0x0042,0x0061,0x0073,0x0065,0x0036,
1.34 +5 -5
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XercesMessages_en_US.Msg 6 Dec 2004 11:38:12 -0000 1.33
+++ XercesMessages_en_US.Msg 9 Dec 2004 14:45:33 -0000 1.34
@@ -18,7 +18,7 @@
19 Anonymous simpleType in element {0} has a name attribute
20 The content of an element information item does not match (annotation?,
(simpleType | complexType)?, (unique | key | keyref)*)
21 Untyped element: {0}
-22 Error in content of simpleType
+22 Error in content of simpleType, '{0}' is invalid. Only allowed one of
(restriction | list | union).
23 Expected simpleType in 'list' declaration for {0}
24 List | Union | Restriction content is invalid for type {0}
25 Error in content of derivation by list for {0}
@@ -649,10 +649,10 @@
231 len '{0}' must be equal to base's len '{1}' , fixed
232 whitespace '{0}' must be equal to base's whitespace '{1}' , fixed
233 internal Error: fixed
-234 Null base validator in List
-235 Null member type validators in Union
-236 Null base validator in Union
-237 Union's base validator's type '{0}' must be union too
+234 simpleType list's 'itemType' is empty.
+235 simpleType union's 'memberTypes' is empty.
+236 simpleType restriction's union 'base' is empty.
+237 simpleType restriction's union 'base' type is '{0}' instead of union.
238 Value '{0}' does not match regular expression facet '{1}'
239 Value '{0}' is not encoded in Base64
240 Value '{0}' is not encoded in HexBin
1.65 +5 -5 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Version.rc 6 Dec 2004 11:38:13 -0000 1.64
+++ Version.rc 9 Dec 2004 14:45:33 -0000 1.65
@@ -120,7 +120,7 @@
19
L"\x0041\x006E\x006F\x006E\x0079\x006D\x006F\x0075\x0073\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0069\x006E\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x007B\x0030\x007D\x0020\x0068\x0061\x0073\x0020\x0061\x0020\x006E\x0061\x006D\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x00"
20
L"\x0054\x0068\x0065\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0061\x006E\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0069\x006E\x0066\x006F\x0072\x006D\x0061\x0074\x0069\x006F\x006E\x0020\x0069\x0074\x0065\x006D\x0020\x0064\x006F\x0065\x0073\x0020\x006E\x006F\x0074\x0020\x006D\x0061\x0074\x0063\x0068\x0020\x0028\x0061\x006E\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x003F\x002C\x0020\x0028\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x007C\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x0029\x003F\x002C\x0020\x0028\x0075\x006E\x0069\x0071\x0075\x0065\x0020\x007C\x0020\x006B\x0065\x0079\x0020\x007C\x0020\x006B\x0065\x0079\x0072\x0065\x0066\x0029\x002A\x0029\x00"
21
L"\x0055\x006E\x0074\x0079\x0070\x0065\x0064\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x003A\x0020\x007B\x0030\x007D\x00"
- 22
L"\x0045\x0072\x0072\x006F\x0072\x0020\x0069\x006E\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x00"
+ 22
L"\x0045\x0072\x0072\x006F\x0072\x0020\x0069\x006E\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x002E\x0020\x0020\x004F\x006E\x006C\x0079\x0020\x0061\x006C\x006C\x006F\x0077\x0065\x0064\x0020\x006F\x006E\x0065\x0020\x006F\x0066\x0020\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0020\x007C\x0020\x0075\x006E\x0069\x006F\x006E\x0029\x002E\x00"
23
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0069\x006E\x0020\x0027\x006C\x0069\x0073\x0074\x0027\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0020\x0066\x006F\x0072\x0020\x007B\x0030\x007D\x00"
24
L"\x004C\x0069\x0073\x0074\x0020\x007C\x0020\x0055\x006E\x0069\x006F\x006E\x0020\x007C\x0020\x0052\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0069\x0073\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0066\x006F\x0072\x0020\x0074\x0079\x0070\x0065\x0020\x007B\x0030\x007D\x00"
25
L"\x0045\x0072\x0072\x006F\x0072\x0020\x0069\x006E\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006F\x0066\x0020\x0064\x0065\x0072\x0069\x0076\x0061\x0074\x0069\x006F\x006E\x0020\x0062\x0079\x0020\x006C\x0069\x0073\x0074\x0020\x0066\x006F\x0072\x0020\x007B\x0030\x007D\x00"
@@ -751,10 +751,10 @@
8423
L"\x006C\x0065\x006E\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0065\x0071\x0075\x0061\x006C\x0020\x0074\x006F\x0020\x0062\x0061\x0073\x0065\x0027\x0073\x0020\x006C\x0065\x006E\x0020\x0027\x007B\x0031\x007D\x0027\x0020\x002C\x0020\x0066\x0069\x0078\x0065\x0064\x00"
8424
L"\x0077\x0068\x0069\x0074\x0065\x0073\x0070\x0061\x0063\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0065\x0071\x0075\x0061\x006C\x0020\x0074\x006F\x0020\x0062\x0061\x0073\x0065\x0027\x0073\x0020\x0077\x0068\x0069\x0074\x0065\x0073\x0070\x0061\x0063\x0065\x0020\x0027\x007B\x0031\x007D\x0027\x0020\x002C\x0020\x0066\x0069\x0078\x0065\x0064\x00"
8425
L"\x0069\x006E\x0074\x0065\x0072\x006E\x0061\x006C\x0020\x0045\x0072\x0072\x006F\x0072\x003A\x0020\x0066\x0069\x0078\x0065\x0064\x00"
- 8426
L"\x004E\x0075\x006C\x006C\x0020\x0062\x0061\x0073\x0065\x0020\x0076\x0061\x006C\x0069\x0064\x0061\x0074\x006F\x0072\x0020\x0069\x006E\x0020\x004C\x0069\x0073\x0074\x0020\x00"
- 8427
L"\x004E\x0075\x006C\x006C\x0020\x006D\x0065\x006D\x0062\x0065\x0072\x0020\x0074\x0079\x0070\x0065\x0020\x0076\x0061\x006C\x0069\x0064\x0061\x0074\x006F\x0072\x0073\x0020\x0069\x006E\x0020\x0055\x006E\x0069\x006F\x006E\x0020\x00"
- 8428
L"\x004E\x0075\x006C\x006C\x0020\x0062\x0061\x0073\x0065\x0020\x0076\x0061\x006C\x0069\x0064\x0061\x0074\x006F\x0072\x0020\x0069\x006E\x0020\x0055\x006E\x0069\x006F\x006E\x00"
- 8429
L"\x0055\x006E\x0069\x006F\x006E\x0027\x0073\x0020\x0062\x0061\x0073\x0065\x0020\x0076\x0061\x006C\x0069\x0064\x0061\x0074\x006F\x0072\x0027\x0073\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0075\x006E\x0069\x006F\x006E\x0020\x0074\x006F\x006F\x0020\x00"
+ 8426
L"\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x006C\x0069\x0073\x0074\x0027\x0073\x0020\x0027\x0069\x0074\x0065\x006D\x0054\x0079\x0070\x0065\x0027\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x002E\x00"
+ 8427
L"\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0075\x006E\x0069\x006F\x006E\x0027\x0073\x0020\x0027\x006D\x0065\x006D\x0062\x0065\x0072\x0054\x0079\x0070\x0065\x0073\x0027\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x002E\x00"
+ 8428
L"\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0027\x0073\x0020\x0075\x006E\x0069\x006F\x006E\x0020\x0027\x0062\x0061\x0073\x0065\x0027\x0020\x0069\x0073\x0020\x0065\x006D\x0070\x0074\x0079\x002E\x00"
+ 8429
L"\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0027\x0073\x0020\x0075\x006E\x0069\x006F\x006E\x0020\x0027\x0062\x0061\x0073\x0065\x0027\x0020\x0074\x0079\x0070\x0065\x0020\x0069\x0073\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x006E\x0073\x0074\x0065\x0061\x0064\x0020\x006F\x0066\x0020\x0075\x006E\x0069\x006F\x006E\x002E\x00"
8430
L"\x0056\x0061\x006C\x0075\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0064\x006F\x0065\x0073\x0020\x006E\x006F\x0074\x0020\x006D\x0061\x0074\x0063\x0068\x0020\x0072\x0065\x0067\x0075\x006C\x0061\x0072\x0020\x0065\x0078\x0070\x0072\x0065\x0073\x0073\x0069\x006F\x006E\x0020\x0066\x0061\x0063\x0065\x0074\x0020\x0027\x007B\x0031\x007D\x0027\x00"
8431
L"\x0056\x0061\x006C\x0075\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x006E\x0063\x006F\x0064\x0065\x0064\x0020\x0069\x006E\x0020\x0042\x0061\x0073\x0065\x0036\x0034\x0020\x00"
8432
L"\x0056\x0061\x006C\x0075\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x006E\x0063\x006F\x0064\x0065\x0064\x0020\x0069\x006E\x0020\x0048\x0065\x0078\x0042\x0069\x006E\x0020\x00"
1.127 +10 -7
xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- TraverseSchema.cpp 25 Nov 2004 17:03:18 -0000 1.126
+++ TraverseSchema.cpp 9 Dec 2004 14:45:34 -0000 1.127
@@ -2878,8 +2878,9 @@
contentElem, GeneralAttributeCheck::E_List, this, false,
fNonXSAttList
);
- if (XUtil::getNextSiblingElement(contentElem) != 0) {
- reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError);
+ const DOMElement* tempEl = XUtil::getNextSiblingElement(contentElem);
+ if (tempEl != 0) {
+ reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError, tempEl->getLocalName());
}
DOMElement* content = 0;
@@ -2991,8 +2992,9 @@
contentElem, GeneralAttributeCheck::E_Restriction, this, false,
fNonXSAttList
);
- if (XUtil::getNextSiblingElement(contentElem) != 0) {
- reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError);
+ const DOMElement* tempEl = XUtil::getNextSiblingElement(contentElem);
+ if (tempEl != 0) {
+ reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError, tempEl->getLocalName());
}
DOMElement* content = 0;
@@ -3252,8 +3254,9 @@
contentElem, GeneralAttributeCheck::E_Union, this, false,
fNonXSAttList
);
- if (XUtil::getNextSiblingElement(contentElem) != 0) {
- reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError);
+ const DOMElement* tempEl = XUtil::getNextSiblingElement(contentElem);
+ if (tempEl != 0) {
+ reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::SimpleTypeContentError, tempEl->getLocalName());
}
const XMLCh* baseTypeName =
getElementAttValue(contentElem, SchemaSymbols::fgATT_MEMBERTYPES);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
