Author: cargilld
Date: Sun Feb 5 18:18:26 2006
New Revision: 375156
URL: http://svn.apache.org/viewcvs?rev=375156&view=rev
Log:
Put annotations for duplicate elements on the first element.
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
Modified:
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp?rev=375156&r1=375155&r2=375156&view=diff
==============================================================================
---
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
(original)
+++
xerces/c/branches/xerces-2.7/src/xercesc/validators/schema/TraverseSchema.cpp
Sun Feb 5 18:18:26 2006
@@ -2631,6 +2631,17 @@
elemDecl->setPSVIScope(PSVIDefs::SCP_ABSENT);
}
}
+ else {
+ if (fAnnotation) {
+ XSAnnotation* xsAnnot = fSchemaGrammar->getAnnotation(elemDecl);
+ if (!xsAnnot) {
+ fSchemaGrammar->putAnnotation(elemDecl, janAnnot.release());
+ }
+ else {
+ xsAnnot->setNext(janAnnot.release());
+ }
+ }
+ }
// Process children
bool anonymousType = false;
@@ -4806,7 +4817,7 @@
if (!isEmpty) {
reportSchemaError(contentElem, XMLUni::fgXMLErrDomain,
XMLErrs::ContentError, name);
}
-
+ fAnnotation = janAnnot.release();
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
