amassari 2004/09/16 06:32:06
Modified: c/src/xercesc/validators/common AllContentModel.cpp
AllContentModel.hpp DFAContentModel.cpp
DFAContentModel.hpp MixedContentModel.hpp
SimpleContentModel.cpp SimpleContentModel.hpp
c/src/xercesc/validators/schema ComplexTypeInfo.cpp
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/Platforms/Win32 Version.rc
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/framework XMLContentModel.hpp
c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
Log:
Updated error message for UPA to also state the complex type that is failing the test
Revision Changes Path
1.10 +5 -0 xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp
Index: AllContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/AllContentModel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AllContentModel.cpp 8 Sep 2004 13:56:51 -0000 1.9
+++ AllContentModel.cpp 16 Sep 2004 13:32:03 -0000 1.10
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.10 2004/09/16 13:32:03 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.9 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -290,6 +293,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName /*= 0*/
)
{
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
@@ -318,6 +322,7 @@
fChildren[j],
&comparator)) {
pValidator->emitError(XMLValid::UniqueParticleAttributionFail,
+ pComplexTypeName,
fChildren[i]->getRawName(),
fChildren[j]->getRawName());
}
1.8 +4 -0 xml-xerces/c/src/xercesc/validators/common/AllContentModel.hpp
Index: AllContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/AllContentModel.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AllContentModel.hpp 8 Sep 2004 13:56:51 -0000 1.7
+++ AllContentModel.hpp 16 Sep 2004 13:32:03 -0000 1.8
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.8 2004/09/16 13:32:03 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.7 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -112,6 +115,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName = 0
) ;
private :
1.13 +6 -1 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp
Index: DFAContentModel.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DFAContentModel.cpp 8 Sep 2004 13:56:51 -0000 1.12
+++ DFAContentModel.cpp 16 Sep 2004 13:32:03 -0000 1.13
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.13 2004/09/16 13:32:03 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.12 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -1277,7 +1280,8 @@
GrammarResolver* const
pGrammarResolver,
XMLStringPool* const
pStringPool,
XMLValidator* const
pValidator,
- unsigned int* const
pContentSpecOrgURI)
+ unsigned int* const
pContentSpecOrgURI,
+ const XMLCh*
pComplexTypeName /*= 0*/)
{
SubstitutionGroupComparator comparator(pGrammarResolver, pStringPool);
@@ -1356,6 +1360,7 @@
buf2.set(fElemMap[k]->getRawName());
pValidator->emitError(XMLValid::UniqueParticleAttributionFail,
+ pComplexTypeName,
buf1.getRawBuffer(),
buf2.getRawBuffer());
}
1.8 +4 -0 xml-xerces/c/src/xercesc/validators/common/DFAContentModel.hpp
Index: DFAContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/DFAContentModel.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DFAContentModel.hpp 8 Sep 2004 13:56:51 -0000 1.7
+++ DFAContentModel.hpp 16 Sep 2004 13:32:03 -0000 1.8
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.8 2004/09/16 13:32:03 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.7 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -172,6 +175,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName = 0
) ;
virtual ContentLeafNameTypeVector* getContentLeafNameTypeVector() const ;
1.9 +5 -0 xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp
Index: MixedContentModel.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/MixedContentModel.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MixedContentModel.hpp 8 Sep 2004 13:56:51 -0000 1.8
+++ MixedContentModel.hpp 16 Sep 2004 13:32:04 -0000 1.9
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.9 2004/09/16 13:32:04 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.8 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -169,6 +172,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName = 0
) ;
private :
@@ -238,6 +242,7 @@
, XMLStringPool* const
, XMLValidator* const
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName /*= 0*/
)
{
// rename back
1.10 +5 -0
xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp
Index: SimpleContentModel.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SimpleContentModel.cpp 8 Sep 2004 13:56:51 -0000 1.9
+++ SimpleContentModel.cpp 16 Sep 2004 13:32:04 -0000 1.10
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.10 2004/09/16 13:32:04 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.9 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -478,6 +481,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName /*= 0*/
)
{
// rename back
@@ -508,6 +512,7 @@
&comparator))
pValidator->emitError(XMLValid::UniqueParticleAttributionFail,
+ pComplexTypeName,
fFirstChild->getRawName(),
fSecondChild->getRawName());
}
1.11 +4 -0
xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.hpp
Index: SimpleContentModel.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/common/SimpleContentModel.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SimpleContentModel.hpp 8 Sep 2004 13:56:51 -0000 1.10
+++ SimpleContentModel.hpp 16 Sep 2004 13:32:04 -0000 1.11
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.11 2004/09/16 13:32:04 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.10 2004/09/08 13:56:51 peiyongz
* Apache License Version 2.0
*
@@ -180,6 +183,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName = 0
) ;
private :
1.29 +4 -1 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp
Index: ComplexTypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ComplexTypeInfo.cpp 8 Sep 2004 13:56:56 -0000 1.28
+++ ComplexTypeInfo.cpp 16 Sep 2004 13:32:04 -0000 1.29
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.29 2004/09/16 13:32:04 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.28 2004/09/08 13:56:56 peiyongz
* Apache License Version 2.0
*
@@ -524,7 +527,7 @@
{
fContentModel = makeContentModel(true);
if (fContentModel) {
- fContentModel->checkUniqueParticleAttribution(pGrammar,
pGrammarResolver, pStringPool, pValidator, fContentSpecOrgURI);
+ fContentModel->checkUniqueParticleAttribution(pGrammar,
pGrammarResolver, pStringPool, pValidator, fContentSpecOrgURI, fTypeLocalName);
}
}
}
1.39 +1 -1 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- en_US.txt 3 Jun 2004 15:35:37 -0000 1.38
+++ en_US.txt 16 Sep 2004 13:32:04 -0000 1.39
@@ -401,7 +401,7 @@
"Entity '{0}' was not found " ,
"Partial markup in parameter entity replacement text. " ,
"Failed to validate '{0}' " ,
- "'{0}' and '{1}' violate the Unique Particle Attribution rule " ,
+ "Complex type '{0}' violates the Unique Particle Attribution rule in
its components '{1}' and '{2}' " ,
"Abstract type '{0}' should not be used in xsi:type " ,
"A member of abstract element {0} substitution group must be specified
" ,
"Element {0} is declared with a type that is abstract. Use xsi:type
to specify a non-abstract type " ,
1.56 +1 -1 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.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Version.rc 3 Jun 2004 15:37:09 -0000 1.55
+++ Version.rc 16 Sep 2004 13:32:04 -0000 1.56
@@ -492,7 +492,7 @@
16469
L"\x0045\x006E\x0074\x0069\x0074\x0079\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0066\x006F\x0075\x006E\x0064\x00"
16470
L"\x0050\x0061\x0072\x0074\x0069\x0061\x006C\x0020\x006D\x0061\x0072\x006B\x0075\x0070\x0020\x0069\x006E\x0020\x0070\x0061\x0072\x0061\x006D\x0065\x0074\x0065\x0072\x0020\x0065\x006E\x0074\x0069\x0074\x0079\x0020\x0072\x0065\x0070\x006C\x0061\x0063\x0065\x006D\x0065\x006E\x0074\x0020\x0074\x0065\x0078\x0074\x002E\x00"
16471
L"\x0046\x0061\x0069\x006C\x0065\x0064\x0020\x0074\x006F\x0020\x0076\x0061\x006C\x0069\x0064\x0061\x0074\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x00"
- 16472
L"\x0027\x007B\x0030\x007D\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x007B\x0031\x007D\x0027\x0020\x0076\x0069\x006F\x006C\x0061\x0074\x0065\x0020\x0074\x0068\x0065\x0020\x0055\x006E\x0069\x0071\x0075\x0065\x0020\x0050\x0061\x0072\x0074\x0069\x0063\x006C\x0065\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0069\x006F\x006E\x0020\x0072\x0075\x006C\x0065\x00"
+ 16472
L"\x0043\x006F\x006D\x0070\x006C\x0065\x0078\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0076\x0069\x006F\x006C\x0061\x0074\x0065\x0073\x0020\x0074\x0068\x0065\x0020\x0055\x006E\x0069\x0071\x0075\x0065\x0020\x0050\x0061\x0072\x0074\x0069\x0063\x006C\x0065\x0020\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0069\x006F\x006E\x0020\x0072\x0075\x006C\x0065\x0020\x0069\x006E\x0020\x0069\x0074\x0073\x0020\x0063\x006F\x006D\x0070\x006F\x006E\x0065\x006E\x0074\x0073\x0020\x0027\x007B\x0031\x007D\x0027\x0020\x0061\x006E\x0064\x0020\x0027\x007B\x0032\x007D\x0027\x00"
16473
L"\x0041\x0062\x0073\x0074\x0072\x0061\x0063\x0074\x0020\x0074\x0079\x0070\x0065\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0073\x0068\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x0075\x0073\x0065\x0064\x0020\x0069\x006E\x0020\x0078\x0073\x0069\x003A\x0074\x0079\x0070\x0065\x00"
16474
L"\x0041\x0020\x006D\x0065\x006D\x0062\x0065\x0072\x0020\x006F\x0066\x0020\x0061\x0062\x0073\x0074\x0072\x0061\x0063\x0074\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x007B\x0030\x007D\x0020\x0073\x0075\x0062\x0073\x0074\x0069\x0074\x0075\x0074\x0069\x006F\x006E\x0020\x0067\x0072\x006F\x0075\x0070\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0069\x0065\x0064\x00"
16475
L"\x0045\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x007B\x0030\x007D\x0020\x0069\x0073\x0020\x0064\x0065\x0063\x006C\x0061\x0072\x0065\x0064\x0020\x0077\x0069\x0074\x0068\x0020\x0061\x0020\x0074\x0079\x0070\x0065\x0020\x0074\x0068\x0061\x0074\x0020\x0069\x0073\x0020\x0061\x0062\x0073\x0074\x0072\x0061\x0063\x0074\x002E\x0020\x0020\x0055\x0073\x0065\x0020\x0078\x0073\x0069\x003A\x0074\x0079\x0070\x0065\x0020\x0074\x006F\x0020\x0073\x0070\x0065\x0063\x0069\x0066\x0079\x0020\x0061\x0020\x006E\x006F\x006E\x002D\x0061\x0062\x0073\x0074\x0072\x0061\x0063\x0074\x0020\x0074\x0079\x0070\x0065\x00"
1.29 +3 -2
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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XercesMessages_en_US.hpp 3 Jun 2004 15:36:02 -0000 1.28
+++ XercesMessages_en_US.hpp 16 Sep 2004 13:32:05 -0000 1.29
@@ -840,8 +840,9 @@
, {
0x0050,0x0061,0x0072,0x0074,0x0069,0x0061,0x006C,0x0020,0x006D,0x0061,0x0072,0x006B,0x0075,0x0070,0x0020,0x0069,0x006E,0x0020,0x0070,0x0061,0x0072,0x0061,0x006D,0x0065,0x0074,0x0065,0x0072,0x0020,0x0065,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,
0x0072,0x0065,0x0070,0x006C,0x0061,0x0063,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0074,0x0065,0x0078,0x0074,0x002E,0x00
}
, {
0x0046,0x0061,0x0069,0x006C,0x0065,0x0064,0x0020,0x0074,0x006F,0x0020,0x0076,0x0061,0x006C,0x0069,0x0064,0x0061,0x0074,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x00
}
- , {
0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x0076,0x0069,0x006F,0x006C,0x0061,0x0074,0x0065,0x0020,0x0074,0x0068,0x0065,0x0020,0x0055,0x006E,0x0069,0x0071,0x0075,0x0065,0x0020,
-
0x0050,0x0061,0x0072,0x0074,0x0069,0x0063,0x006C,0x0065,0x0020,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0069,0x006F,0x006E,0x0020,0x0072,0x0075,0x006C,0x0065,0x00
}
+ , {
0x0043,0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0076,0x0069,0x006F,0x006C,0x0061,0x0074,0x0065,0x0073,0x0020,0x0074,0x0068,0x0065,0x0020,0x0055,0x006E,0x0069,
+
0x0071,0x0075,0x0065,0x0020,0x0050,0x0061,0x0072,0x0074,0x0069,0x0063,0x006C,0x0065,0x0020,0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0069,0x006F,0x006E,0x0020,0x0072,0x0075,0x006C,0x0065,0x0020,0x0069,0x006E,0x0020,0x0069,0x0074,
+
0x0073,0x0020,0x0063,0x006F,0x006D,0x0070,0x006F,0x006E,0x0065,0x006E,0x0074,0x0073,0x0020,0x0027,0x007B,0x0031,0x007D,0x0027,0x0020,0x0061,0x006E,0x0064,0x0020,0x0027,0x007B,0x0032,0x007D,0x0027,0x00
}
, {
0x0041,0x0062,0x0073,0x0074,0x0072,0x0061,0x0063,0x0074,0x0020,0x0074,0x0079,0x0070,0x0065,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0073,0x0068,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0075,
0x0073,0x0065,0x0064,0x0020,0x0069,0x006E,0x0020,0x0078,0x0073,0x0069,0x003A,0x0074,0x0079,0x0070,0x0065,0x00
}
, {
0x0041,0x0020,0x006D,0x0065,0x006D,0x0062,0x0065,0x0072,0x0020,0x006F,0x0066,0x0020,0x0061,0x0062,0x0073,0x0074,0x0072,0x0061,0x0063,0x0074,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x007B,0x0030,0x007D,0x0020,0x0073,0x0075,
1.28 +1 -1
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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XercesMessages_en_US.Msg 3 Jun 2004 15:36:31 -0000 1.27
+++ XercesMessages_en_US.Msg 16 Sep 2004 13:32:05 -0000 1.28
@@ -390,7 +390,7 @@
85 Entity '{0}' was not found
86 Partial markup in parameter entity replacement text.
87 Failed to validate '{0}'
-88 '{0}' and '{1}' violate the Unique Particle Attribution rule
+88 Complex type '{0}' violates the Unique Particle Attribution rule in its
components '{1}' and '{2}'
89 Abstract type '{0}' should not be used in xsi:type
90 A member of abstract element {0} substitution group must be specified
91 Element {0} is declared with a type that is abstract. Use xsi:type to specify
a non-abstract type
1.6 +4 -0 xml-xerces/c/src/xercesc/framework/XMLContentModel.hpp
Index: XMLContentModel.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLContentModel.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XMLContentModel.hpp 8 Sep 2004 13:55:58 -0000 1.5
+++ XMLContentModel.hpp 16 Sep 2004 13:32:05 -0000 1.6
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.6 2004/09/16 13:32:05 amassari
+ * Updated error message for UPA to also state the complex type that is failing the
test
+ *
* Revision 1.5 2004/09/08 13:55:58 peiyongz
* Apache License Version 2.0
*
@@ -163,6 +166,7 @@
, XMLStringPool* const pStringPool
, XMLValidator* const pValidator
, unsigned int* const pContentSpecOrgURI
+ , const XMLCh* pComplexTypeName = 0
) =0;
virtual ContentLeafNameTypeVector* getContentLeafNameTypeVector()
1.47 +1 -1 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- XMLErrList_EN_US.Xml 3 Jun 2004 15:34:05 -0000 1.46
+++ XMLErrList_EN_US.Xml 16 Sep 2004 13:32:05 -0000 1.47
@@ -403,7 +403,7 @@
<Message Id="VC_EntityNotFound" Text="Entity '{0}' was not found"/>
<Message Id="PartialMarkupInPE" Text="Partial markup in parameter
entity replacement text."/>
<Message Id="DatatypeValidationFailure" Text="Failed to validate
'{0}'"/>
- <Message Id="UniqueParticleAttributionFail" Text="'{0}' and '{1}'
violate the Unique Particle Attribution rule"/>
+ <Message Id="UniqueParticleAttributionFail" Text="Complex type '{0}'
violates the Unique Particle Attribution rule in its components '{1}' and '{2}'"/>
<Message Id="NoAbstractInXsiType" Text="Abstract type '{0}' should not
be used in xsi:type"/>
<Message Id="NoDirectUseAbstractElement" Text="A member of abstract
element {0} substitution group must be specified"/>
<Message Id="NoUseAbstractType" Text="Element {0} is declared with a
type that is abstract. Use xsi:type to specify a non-abstract type"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
