cargilld 2004/12/13 18:06:40
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/DTD DTDScanner.cpp
c/src/xercesc/validators/schema TraverseSchema.cpp
Log:
More error message updates.
Revision Changes Path
1.55 +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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- XMLErrList_EN_US.Xml 13 Dec 2004 21:31:45 -0000 1.54
+++ XMLErrList_EN_US.Xml 14 Dec 2004 02:06:39 -0000 1.55
@@ -55,12 +55,12 @@
<Message Id="InvalidChildFollowingConplexContent" Text="Invalid
child following the complexContent child in the complexType"/>
<Message Id="InvalidComplexTypeBlockValue" Text="The 'block'
attribute values of a complexType must be #all | list(restriction,extension);
{0} was found"/>
<Message Id="InvalidComplexTypeFinalValue" Text="The 'final'
attribute values of a complexType must be #all | list(restriction,extension);
{0} was found"/>
- <Message Id="AttributeDefaultFixedValue" Text="Attribute '{0}'
cannot have both 'fixed' and 'default' present at the same time."/>
- <Message Id="NotOptionalDefaultAttValue" Text="If default and
use are both present, use must have the value 'optional'."/>
+ <Message Id="AttributeDefaultFixedValue" Text="Attribute
'{0}={1}' cannot have both 'fixed' and 'default' present at the same time."/>
+ <Message Id="NotOptionalDefaultAttValue" Text="For attribute
'{0}={1}' default and use are both present so use must have the value
'optional'."/>
<Message Id="LocalAttributeWithNameRef" Text="Local
attribute:{0} has also a ref defined - name ignored"/>
<Message Id="GlobalAttributeWithNameRef" Text="Global
attribute:'{0}' cannot have a ref defined"/>
<Message Id="DuplicateAttribute" Text="Error: Attribute '{0}'
declared more than once in the same scope- ignoring"/>
- <Message Id="AttributeWithTypeAndSimpleType" Text="Attribute
declarations may not contain both a type and a simpleType declaration"/>
+ <Message Id="AttributeWithTypeAndSimpleType" Text="Attribute
'{0}' may not contain both a type and a simpleType declaration."/>
<Message Id="AttributeSimpleTypeNotFound" Text="SimpleType
({0}:{1}) for attribute: {2} not found"/>
<Message Id="ElementWithFixedAndDefault" Text="Element '{0}'
cannot have both 'fixed' and 'default' present at the same time."/>
<Message Id="DeclarationWithNameRef" Text="{0}:'{1}' has also a
ref defined - name ignored"/>
@@ -89,7 +89,7 @@
<Message Id="InvalidElementBlockValue" Text="The 'block'
attribute values of an element must be #all |
list(substitution,restriction,extension); {0} was found"/>
<Message Id="InvalidElementFinalValue" Text="The 'final'
attribute values of an element must be #all | list(restriction,extension); {0}
was found"/>
<Message Id="InvalidAttValue" Text="Invalid value '{0}' for
attribute: '{1}'."/>
- <Message Id="AttributeRefContentError" Text="Ref is present, and
simpleType/form/type found"/>
+ <Message Id="AttributeRefContentError" Text="Ref is present, and
simpleType/form/type found for attribute '{0}={1}'"/>
<Message Id="DuplicateRefAttribute" Text="Duplicate reference
attribute {0}:{1} in complexType"/>
<Message Id="ForbiddenDerivationByRestriction" Text="Derivation
by restriction is forbidden by either the base type '{0}' or the schema"/>
<Message Id="ForbiddenDerivationByExtension" Text="Derivation by
extension is forbidden by either the base type '{0}' or the schema"/>
@@ -241,7 +241,7 @@
<Message Id="UnterminatedElementDecl" Text="Unterminated element
declaration, '{0}'"/>
<Message Id="ExpectedContentSpecExpr" Text="Expected content
specification expression for element '{0}'"/>
<Message Id="ExpectedAsterisk" Text="Expected asterisk"/>
- <Message Id="UnterminatedContentModel" Text="Unterminated
Content model"/>
+ <Message Id="UnterminatedContentModel" Text="'{0}' is a mixed
content model that is not terminated properly."/>
<Message Id="ExpectedSystemId" Text="Expected system id"/>
<Message Id="ExpectedSystemOrPublicId" Text="Expected system or
public id"/>
<Message Id="UnterminatedNotationDecl" Text="Unterminated
notation declaration"/>
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- en_US.txt 13 Dec 2004 21:31:43 -0000 1.46
+++ en_US.txt 14 Dec 2004 02:06:39 -0000 1.47
@@ -50,12 +50,12 @@
"Invalid child following the complexContent child in the
complexType " ,
"The 'block' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found " ,
"The 'final' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found " ,
- "Attribute '{0}' cannot have both 'fixed' and 'default' present
at the same time. " ,
- "If default and use are both present, use must have the value
'optional'. " ,
+ "Attribute '{0}={1}' cannot have both 'fixed' and 'default'
present at the same time. " ,
+ "For attribute '{0}={1}' default and use are both present so
use must have the value 'optional'. " ,
"Local attribute:{0} has also a ref defined - name ignored " ,
"Global attribute:'{0}' cannot have a ref defined " ,
"Error: Attribute '{0}' declared more than once in the same
scope- ignoring " ,
- "Attribute declarations may not contain both a type and a
simpleType declaration " ,
+ "Attribute '{0}' may not contain both a type and a simpleType
declaration. " ,
"SimpleType ({0}:{1}) for attribute: {2} not found " ,
"Element '{0}' cannot have both 'fixed' and 'default' present
at the same time. " ,
"{0}:'{1}' has also a ref defined - name ignored " ,
@@ -84,7 +84,7 @@
"The 'block' attribute values of an element must be #all |
list(substitution,restriction,extension); {0} was found " ,
"The 'final' attribute values of an element must be #all |
list(restriction,extension); {0} was found " ,
"Invalid value '{0}' for attribute: '{1}'. " ,
- "Ref is present, and simpleType/form/type found " ,
+ "Ref is present, and simpleType/form/type found for attribute
'{0}={1}' " ,
"Duplicate reference attribute {0}:{1} in complexType " ,
"Derivation by restriction is forbidden by either the base type
'{0}' or the schema " ,
"Derivation by extension is forbidden by either the base type
'{0}' or the schema " ,
@@ -236,7 +236,7 @@
"Unterminated element declaration, '{0}' " ,
"Expected content specification expression for element '{0}' " ,
"Expected asterisk " ,
- "Unterminated Content model " ,
+ "'{0}' is a mixed content model that is not terminated
properly. " ,
"Expected system id " ,
"Expected system or public id " ,
"Unterminated notation declaration " ,
1.37 +13 -11
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- XercesMessages_en_US.hpp 13 Dec 2004 21:31:45 -0000 1.36
+++ XercesMessages_en_US.hpp 14 Dec 2004 02:06:39 -0000 1.37
@@ -109,12 +109,12 @@
, {
0x0054,0x0068,0x0065,0x0020,0x0027,0x0066,0x0069,0x006E,0x0061,0x006C,0x0027,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0073,0x0020,0x006F,0x0066,0x0020,0x0061,0x0020,0x0063,
0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0054,0x0079,0x0070,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0023,0x0061,0x006C,0x006C,0x0020,0x007C,0x0020,0x006C,0x0069,0x0073,0x0074,0x0028,0x0072,0x0065,0x0073,0x0074,
0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x002C,0x0065,0x0078,0x0074,0x0065,0x006E,0x0073,0x0069,0x006F,0x006E,0x0029,0x003B,0x0020,0x007B,0x0030,0x007D,0x0020,0x0077,0x0061,0x0073,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
- , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,
-
0x0069,0x0078,0x0065,0x0064,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,0x0074,0x0068,0x0065,0x0020,
-
0x0073,0x0061,0x006D,0x0065,0x0020,0x0074,0x0069,0x006D,0x0065,0x002E,0x00 }
- , {
0x0049,0x0066,0x0020,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0020,0x0061,0x006E,0x0064,0x0020,0x0075,0x0073,0x0065,0x0020,0x0061,0x0072,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,
-
0x002C,0x0020,0x0075,0x0073,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0074,0x0068,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x006F,0x0070,0x0074,0x0069,0x006F,0x006E,0x0061,0x006C,
- 0x0027,0x002E,0x00 }
+ , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x003D,0x007B,0x0031,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,
+
0x0068,0x0020,0x0027,0x0066,0x0069,0x0078,0x0065,0x0064,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0027,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0061,0x0074,0x0020,
+
0x0074,0x0068,0x0065,0x0020,0x0073,0x0061,0x006D,0x0065,0x0020,0x0074,0x0069,0x006D,0x0065,0x002E,0x00
}
+ , {
0x0046,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x003D,0x007B,0x0031,0x007D,0x0027,0x0020,0x0064,0x0065,0x0066,0x0061,0x0075,0x006C,0x0074,0x0020,0x0061,0x006E,0x0064,
+
0x0020,0x0075,0x0073,0x0065,0x0020,0x0061,0x0072,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0020,0x0073,0x006F,0x0020,0x0075,0x0073,0x0065,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,
+
0x0061,0x0076,0x0065,0x0020,0x0074,0x0068,0x0065,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x006F,0x0070,0x0074,0x0069,0x006F,0x006E,0x0061,0x006C,0x0027,0x002E,0x00
}
, {
0x004C,0x006F,0x0063,0x0061,0x006C,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003A,0x007B,0x0030,0x007D,0x0020,0x0068,0x0061,0x0073,0x0020,0x0061,0x006C,0x0073,0x006F,0x0020,0x0061,0x0020,0x0072,0x0065,0x0066,0x0020,
0x0064,0x0065,0x0066,0x0069,0x006E,0x0065,0x0064,0x0020,0x002D,0x0020,0x006E,0x0061,0x006D,0x0065,0x0020,0x0069,0x0067,0x006E,0x006F,0x0072,0x0065,0x0064,0x00
}
, {
0x0047,0x006C,0x006F,0x0062,0x0061,0x006C,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003A,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,
@@ -122,9 +122,9 @@
, {
0x0045,0x0072,0x0072,0x006F,0x0072,0x003A,0x0020,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0065,0x0064,0x0020,0x006D,0x006F,0x0072,
0x0065,0x0020,0x0074,0x0068,0x0061,0x006E,0x0020,0x006F,0x006E,0x0063,0x0065,0x0020,0x0069,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x0073,0x0061,0x006D,0x0065,0x0020,0x0073,0x0063,0x006F,0x0070,0x0065,0x002D,0x0020,0x0069,0x0067,0x006E,0x006F,
0x0072,0x0069,0x006E,0x0067,0x00 }
- , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x0073,0x0020,0x006D,0x0061,0x0079,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x006F,0x006E,0x0074,
-
0x0061,0x0069,0x006E,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0061,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0061,0x006E,0x0064,0x0020,0x0061,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0064,0x0065,
- 0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x00 }
+ , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x006D,0x0061,0x0079,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x006F,0x006E,0x0074,0x0061,0x0069,0x006E,0x0020,0x0062,0x006F,0x0074,
+
0x0068,0x0020,0x0061,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0061,0x006E,0x0064,0x0020,0x0061,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,
+ 0x006F,0x006E,0x002E,0x00 }
, {
0x0053,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x0020,0x0028,0x007B,0x0030,0x007D,0x003A,0x007B,0x0031,0x007D,0x0029,0x0020,0x0066,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003A,
0x0020,0x007B,0x0032,0x007D,0x0020,0x006E,0x006F,0x0074,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
, {
0x0045,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0068,0x0061,0x0076,0x0065,0x0020,0x0062,0x006F,0x0074,0x0068,0x0020,0x0027,0x0066,0x0069,0x0078,
@@ -197,7 +197,8 @@
, {
0x0049,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0066,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x003A,0x0020,
0x0027,0x007B,0x0031,0x007D,0x0027,0x002E,0x00 }
, {
0x0052,0x0065,0x0066,0x0020,0x0069,0x0073,0x0020,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x002C,0x0020,0x0061,0x006E,0x0064,0x0020,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x002F,0x0066,0x006F,0x0072,0x006D,
-
0x002F,0x0074,0x0079,0x0070,0x0065,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x00
}
+
0x002F,0x0074,0x0079,0x0070,0x0065,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x0020,0x0066,0x006F,0x0072,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x003D,0x007B,0x0031,0x007D,0x0027,
+ 0x00 }
, {
0x0044,0x0075,0x0070,0x006C,0x0069,0x0063,0x0061,0x0074,0x0065,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x0020,0x0061,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x007B,0x0030,0x007D,0x003A,0x007B,
0x0031,0x007D,0x0020,0x0069,0x006E,0x0020,0x0063,0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0054,0x0079,0x0070,0x0065,0x00
}
, {
0x0044,0x0065,0x0072,0x0069,0x0076,0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0062,0x0079,0x0020,0x0072,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x0020,0x0069,0x0073,0x0020,0x0066,0x006F,0x0072,0x0062,0x0069,0x0064,
@@ -528,7 +529,8 @@
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x0073,0x0070,0x0065,0x0063,0x0069,0x0066,0x0069,0x0063,0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0065,0x0078,0x0070,0x0072,
0x0065,0x0073,0x0073,0x0069,0x006F,0x006E,0x0020,0x0066,0x006F,0x0072,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0061,0x0073,0x0074,0x0065,0x0072,0x0069,0x0073,0x006B,0x00
}
- , {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0043,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x00
}
+ , {
0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x0073,0x0020,0x0061,0x0020,0x006D,0x0069,0x0078,0x0065,0x0064,0x0020,0x0063,0x006F,0x006E,0x0074,0x0065,0x006E,0x0074,0x0020,0x006D,0x006F,0x0064,0x0065,0x006C,0x0020,0x0074,0x0068,0x0061,0x0074,
+
0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x0070,0x0072,0x006F,0x0070,0x0065,0x0072,0x006C,0x0079,0x002E,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0073,0x0079,0x0073,0x0074,0x0065,0x006D,0x0020,0x0069,0x0064,0x00
}
, {
0x0045,0x0078,0x0070,0x0065,0x0063,0x0074,0x0065,0x0064,0x0020,0x0073,0x0079,0x0073,0x0074,0x0065,0x006D,0x0020,0x006F,0x0072,0x0020,0x0070,0x0075,0x0062,0x006C,0x0069,0x0063,0x0020,0x0069,0x0064,0x00
}
, {
0x0055,0x006E,0x0074,0x0065,0x0072,0x006D,0x0069,0x006E,0x0061,0x0074,0x0065,0x0064,0x0020,0x006E,0x006F,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x0020,0x0064,0x0065,0x0063,0x006C,0x0061,0x0072,0x0061,0x0074,0x0069,0x006F,0x006E,0x00
}
1.36 +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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- XercesMessages_en_US.Msg 13 Dec 2004 21:31:45 -0000 1.35
+++ XercesMessages_en_US.Msg 14 Dec 2004 02:06:39 -0000 1.36
@@ -45,12 +45,12 @@
46 Invalid child following the complexContent child in the complexType
47 The 'block' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found
48 The 'final' attribute values of a complexType must be #all |
list(restriction,extension); {0} was found
-49 Attribute '{0}' cannot have both 'fixed' and 'default' present at the
same time.
-50 If default and use are both present, use must have the value 'optional'.
+49 Attribute '{0}={1}' cannot have both 'fixed' and 'default' present at
the same time.
+50 For attribute '{0}={1}' default and use are both present so use must
have the value 'optional'.
51 Local attribute:{0} has also a ref defined - name ignored
52 Global attribute:'{0}' cannot have a ref defined
53 Error: Attribute '{0}' declared more than once in the same scope-
ignoring
-54 Attribute declarations may not contain both a type and a simpleType
declaration
+54 Attribute '{0}' may not contain both a type and a simpleType declaration.
55 SimpleType ({0}:{1}) for attribute: {2} not found
56 Element '{0}' cannot have both 'fixed' and 'default' present at the same
time.
57 {0}:'{1}' has also a ref defined - name ignored
@@ -79,7 +79,7 @@
80 The 'block' attribute values of an element must be #all |
list(substitution,restriction,extension); {0} was found
81 The 'final' attribute values of an element must be #all |
list(restriction,extension); {0} was found
82 Invalid value '{0}' for attribute: '{1}'.
-83 Ref is present, and simpleType/form/type found
+83 Ref is present, and simpleType/form/type found for attribute '{0}={1}'
84 Duplicate reference attribute {0}:{1} in complexType
85 Derivation by restriction is forbidden by either the base type '{0}' or
the schema
86 Derivation by extension is forbidden by either the base type '{0}' or
the schema
@@ -229,7 +229,7 @@
232 Unterminated element declaration, '{0}'
233 Expected content specification expression for element '{0}'
234 Expected asterisk
-235 Unterminated Content model
+235 '{0}' is a mixed content model that is not terminated properly.
236 Expected system id
237 Expected system or public id
238 Unterminated notation declaration
1.67 +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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- Version.rc 13 Dec 2004 21:31:44 -0000 1.66
+++ Version.rc 14 Dec 2004 02:06:39 -0000 1.67
@@ -147,12 +147,12 @@
46
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0066\x006F\x006C\x006C\x006F\x0077\x0069\x006E\x0067\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0043\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0063\x0068\x0069\x006C\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x00"
47
L"\x0054\x0068\x0065\x0020\x0027\x0062\x006C\x006F\x0063\x006B\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
48
L"\x0054\x0068\x0065\x0020\x0027\x0066\x0069\x006E\x0061\x006C\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
- 49
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x002E\x00"
- 50
L"\x0049\x0066\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0061\x006E\x0064\x0020\x0075\x0073\x0065\x0020\x0061\x0072\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x002C\x0020\x0075\x0073\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0074\x0068\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0027\x006F\x0070\x0074\x0069\x006F\x006E\x0061\x006C\x0027\x002E\x00"
+ 49
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x003D\x007B\x0031\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x002E\x00"
+ 50
L"\x0046\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x003D\x007B\x0031\x007D\x0027\x0020\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0020\x0061\x006E\x0064\x0020\x0075\x0073\x0065\x0020\x0061\x0072\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0073\x006F\x0020\x0075\x0073\x0065\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0074\x0068\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0027\x006F\x0070\x0074\x0069\x006F\x006E\x0061\x006C\x0027\x002E\x00"
51
L"\x004C\x006F\x0063\x0061\x006C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x007B\x0030\x007D\x0020\x0068\x0061\x0073\x0020\x0061\x006C\x0073\x006F\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x0020\x002D\x0020\x006E\x0061\x006D\x0065\x0020\x0069\x0067\x006E\x006F\x0072\x0065\x0064\x00"
52
L"\x0047\x006C\x006F\x0062\x0061\x006C\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x00"
53
L"\x0045\x0072\x0072\x006F\x0072\x003A\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x006D\x006F\x0072\x0065\x0020\x0074\x0068\x0061\x006E\x0020\x006F\x006E\x0063\x0065\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0073\x0063\x006F\x0070\x0065\x002D\x0020\x0069\x0067\x006E\x006F\x0072\x0069\x006E\x0067\x00"
- 54
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x0073\x0020\x006D\x0061\x0079\x0020\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0062\x006F\x0074\x0068\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x006E\x0064\x0020\x0061\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x00"
+ 54
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006D\x0061\x0079\x0020\x006E\x006F\x0074\x0020\x0063\x006F\x006E\x0074\x0061\x0069\x006E\x0020\x0062\x006F\x0074\x0068\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0061\x006E\x0064\x0020\x0061\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x002E\x00"
55
L"\x0053\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x0020\x0028\x007B\x0030\x007D\x003A\x007B\x0031\x007D\x0029\x0020\x0066\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x0020\x007B\x0032\x007D\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x00"
56
L"\x0045\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0062\x006F\x0074\x0068\x0020\x0027\x0066\x0069\x0078\x0065\x0064\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x0064\x0065\x0066\x0061\x0075\x006C\x0074\x0027\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0020\x0061\x0074\x0020\x0074\x0068\x0065\x0020\x0073\x0061\x006D\x0065\x0020\x0074\x0069\x006D\x0065\x002E\x00"
57
L"\x007B\x0030\x007D\x003A\x0027\x007B\x0031\x007D\x0027\x0020\x0068\x0061\x0073\x0020\x0061\x006C\x0073\x006F\x0020\x0061\x0020\x0072\x0065\x0066\x0020\x0064\x0065\x0066\x0069\x006E\x0065\x0064\x0020\x002D\x0020\x006E\x0061\x006D\x0065\x0020\x0069\x0067\x006E\x006F\x0072\x0065\x0064\x00"
@@ -181,7 +181,7 @@
80
L"\x0054\x0068\x0065\x0020\x0027\x0062\x006C\x006F\x0063\x006B\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x006E\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0073\x0075\x0062\x0073\x0074\x0069\x0074\x0075\x0074\x0069\x006F\x006E\x002C\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
81
L"\x0054\x0068\x0065\x0020\x0027\x0066\x0069\x006E\x0061\x006C\x0027\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0076\x0061\x006C\x0075\x0065\x0073\x0020\x006F\x0066\x0020\x0061\x006E\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0023\x0061\x006C\x006C\x0020\x007C\x0020\x006C\x0069\x0073\x0074\x0028\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x002C\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0029\x003B\x0020\x007B\x0030\x007D\x0020\x0077\x0061\x0073\x0020\x0066\x006F\x0075\x006E\x0064\x00"
82
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0076\x0061\x006C\x0075\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0066\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x003A\x0020\x0027\x007B\x0031\x007D\x0027\x002E\x00"
- 83
L"\x0052\x0065\x0066\x0020\x0069\x0073\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x002C\x0020\x0061\x006E\x0064\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x002F\x0066\x006F\x0072\x006D\x002F\x0074\x0079\x0070\x0065\x0020\x0066\x006F\x0075\x006E\x0064\x00"
+ 83
L"\x0052\x0065\x0066\x0020\x0069\x0073\x0020\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x002C\x0020\x0061\x006E\x0064\x0020\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x002F\x0066\x006F\x0072\x006D\x002F\x0074\x0079\x0070\x0065\x0020\x0066\x006F\x0075\x006E\x0064\x0020\x0066\x006F\x0072\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x003D\x007B\x0031\x007D\x0027\x00"
84
L"\x0044\x0075\x0070\x006C\x0069\x0063\x0061\x0074\x0065\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x0020\x0061\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x007B\x0030\x007D\x003A\x007B\x0031\x007D\x0020\x0069\x006E\x0020\x0063\x006F\x006D\x0070\x006C\x0065\x0078\x0054\x0079\x0070\x0065\x00"
85
L"\x0044\x0065\x0072\x0069\x0076\x0061\x0074\x0069\x006F\x006E\x0020\x0062\x0079\x0020\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x0020\x0069\x0073\x0020\x0066\x006F\x0072\x0062\x0069\x0064\x0064\x0065\x006E\x0020\x0062\x0079\x0020\x0065\x0069\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0065\x0020\x0062\x0061\x0073\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x00"
86
L"\x0044\x0065\x0072\x0069\x0076\x0061\x0074\x0069\x006F\x006E\x0020\x0062\x0079\x0020\x0065\x0078\x0074\x0065\x006E\x0073\x0069\x006F\x006E\x0020\x0069\x0073\x0020\x0066\x006F\x0072\x0062\x0069\x0064\x0064\x0065\x006E\x0020\x0062\x0079\x0020\x0065\x0069\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0065\x0020\x0062\x0061\x0073\x0065\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x006F\x0072\x0020\x0074\x0068\x0065\x0020\x0073\x0063\x0068\x0065\x006D\x0061\x00"
@@ -331,7 +331,7 @@
232
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x002C\x0020\x0027\x007B\x0030\x007D\x0027\x00"
233
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0069\x0063\x0061\x0074\x0069\x006F\x006E\x0020\x0065\x0078\x0070\x0072\x0065\x0073\x0073\x0069\x006F\x006E\x0020\x0066\x006F\x0072\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x00"
234
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0061\x0073\x0074\x0065\x0072\x0069\x0073\x006B\x00"
- 235
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0043\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006D\x006F\x0064\x0065\x006C\x00"
+ 235
L"\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x0061\x0020\x006D\x0069\x0078\x0065\x0064\x0020\x0063\x006F\x006E\x0074\x0065\x006E\x0074\x0020\x006D\x006F\x0064\x0065\x006C\x0020\x0074\x0068\x0061\x0074\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x0070\x0072\x006F\x0070\x0065\x0072\x006C\x0079\x002E\x00"
236
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0073\x0079\x0073\x0074\x0065\x006D\x0020\x0069\x0064\x00"
237
L"\x0045\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x0020\x0073\x0079\x0073\x0074\x0065\x006D\x0020\x006F\x0072\x0020\x0070\x0075\x0062\x006C\x0069\x0063\x0020\x0069\x0064\x00"
238
L"\x0055\x006E\x0074\x0065\x0072\x006D\x0069\x006E\x0061\x0074\x0065\x0064\x0020\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0061\x0074\x0069\x006F\x006E\x00"
1.36 +5 -2 xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp
Index: DTDScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/DTD/DTDScanner.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DTDScanner.cpp 30 Sep 2004 13:14:27 -0000 1.35
+++ DTDScanner.cpp 14 Dec 2004 02:06:40 -0000 1.36
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.36 2004/12/14 02:06:40 cargilld
+ * More error message updates.
+ *
* Revision 1.35 2004/09/30 13:14:27 amassari
* Fix jira#1280 - Borland leaks memory if break or continue are used inside
a catch block
*
@@ -3440,7 +3443,7 @@
if (!fReaderMgr->skippedChar(chCloseParen))
{
delete headNode;
- fScanner->emitError(XMLErrs::UnterminatedContentModel);
+ fScanner->emitError(XMLErrs::UnterminatedContentModel,
toFill.getElementName()->getLocalPart());
return false;
}
@@ -3451,7 +3454,7 @@
if (starRequired)
{
- if
(fScanner->emitErrorWillThrowException(XMLErrs::UnterminatedContentModel))
+ if
(fScanner->emitErrorWillThrowException(XMLErrs::ExpectedAsterisk))
{
delete headNode;
}
1.129 +11 -5
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.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- TraverseSchema.cpp 13 Dec 2004 21:31:44 -0000 1.128
+++ TraverseSchema.cpp 14 Dec 2004 02:06:40 -0000 1.129
@@ -2199,14 +2199,18 @@
if (fixedVal) {
fixedVal = 0;
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeDefaultFixedValue, name);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeDefaultFixedValue,
+ (name) ? SchemaSymbols::fgATT_NAME :
SchemaSymbols::fgATT_REF,
+ (name) ? name : ref);
}
if ((useVal && *useVal)
&& !XMLString::equals(useVal, SchemaSymbols::fgATTVAL_OPTIONAL))
{
useVal = 0;
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::NotOptionalDefaultAttValue);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::NotOptionalDefaultAttValue,
+ (name) ? SchemaSymbols::fgATT_NAME :
SchemaSymbols::fgATT_REF,
+ (name) ? name : ref);
}
}
@@ -2215,7 +2219,9 @@
// Check ref representation OK - 3.2.3::3.2
if (attForm || dvType || (simpleType != 0)) {
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeRefContentError);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeRefContentError,
+ (name) ? SchemaSymbols::fgATT_NAME :
SchemaSymbols::fgATT_REF,
+ (name) ? name : ref);
}
processAttributeDeclRef(elem, typeInfo, ref, useVal, defaultVal,
fixedVal);
@@ -2272,7 +2278,7 @@
if (simpleType != 0) {
if (dvType && *dvType) {
- reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeWithTypeAndSimpleType);
+ reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::AttributeWithTypeAndSimpleType, name);
}
dv = traverseSimpleTypeDecl(simpleType, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
