knoaman 2005/03/07 12:11:23
Modified: c/samples/EnumVal EnumVal.cpp
c/samples/SEnumVal SEnumVal.cpp
c/src/xercesc/validators/schema TraverseSchema.cpp
XSDDOMParser.cpp
Log:
Use index to access attributes instead of enumerator.
Revision Changes Path
1.25 +5 -2 xml-xerces/c/samples/EnumVal/EnumVal.cpp
Index: EnumVal.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/EnumVal/EnumVal.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- EnumVal.cpp 12 Jan 2005 20:43:22 -0000 1.24
+++ EnumVal.cpp 7 Mar 2005 20:11:21 -0000 1.25
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.25 2005/03/07 20:11:21 knoaman
+ * Use index to access attributes instead of enumerator.
+ *
* Revision 1.24 2005/01/12 20:43:22 cargilld
* Remove warning messages.
*
@@ -283,9 +286,9 @@
{
XERCES_STD_QUALIFIER cout << " Attributes:\n";
XMLAttDefList& attList = curElem.getAttDefList();
- while (attList.hasMoreElements())
+ for (unsigned int i=0; i<attList.getAttDefCount(); i++)
{
- const XMLAttDef& curAttDef = attList.nextElement();
+ const XMLAttDef& curAttDef = attList.getAttDef(i);
XERCES_STD_QUALIFIER cout << " Name:" <<
StrX(curAttDef.getFullName())
<< ", Type: ";
1.20 +6 -3 xml-xerces/c/samples/SEnumVal/SEnumVal.cpp
Index: SEnumVal.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/SEnumVal/SEnumVal.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SEnumVal.cpp 8 Sep 2004 13:55:34 -0000 1.19
+++ SEnumVal.cpp 7 Mar 2005 20:11:21 -0000 1.20
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.20 2005/03/07 20:11:21 knoaman
+ * Use index to access attributes instead of enumerator.
+ *
* Revision 1.19 2004/09/08 13:55:34 peiyongz
* Apache License Version 2.0
*
@@ -395,10 +398,10 @@
}
XERCES_STD_QUALIFIER cout << "Attributes:\n";
- while( attList.hasMoreElements() )
+ for (unsigned int i=0; i<attList.getAttDefCount(); i++)
{
// Name
- SchemaAttDef& curAttDef = (SchemaAttDef&)attList.nextElement();
+ SchemaAttDef& curAttDef = (SchemaAttDef&)attList.getAttDef(i);
XERCES_STD_QUALIFIER cout << "\tName:\t\t\t" <<
StrX(curAttDef.getFullName()) << "\n";
// Type
1.131 +5 -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.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- TraverseSchema.cpp 21 Feb 2005 18:19:45 -0000 1.130
+++ TraverseSchema.cpp 7 Mar 2005 20:11:21 -0000 1.131
@@ -6549,9 +6549,9 @@
SchemaAttDefList& baseAttList = (SchemaAttDefList&)
baseTypeInfo->getAttDefList();
- while (baseAttList.hasMoreElements()) {
+ for (unsigned int i=0; i<baseAttList.getAttDefCount(); i++) {
- SchemaAttDef& attDef = (SchemaAttDef&) baseAttList.nextElement();
+ SchemaAttDef& attDef = (SchemaAttDef&) baseAttList.getAttDef(i);
QName* attName = attDef.getAttName();
const XMLCh* localPart = attName->getLocalPart();
@@ -7602,9 +7602,9 @@
SchemaAttDefList& childAttList = (SchemaAttDefList&)
childTypeInfo->getAttDefList();
const SchemaAttDef* baseAttWildCard = baseTypeInfo->getAttWildCard();
- while (childAttList.hasMoreElements()) {
+ for (unsigned int i=0; i<childAttList.getAttDefCount(); i++) {
- SchemaAttDef& childAttDef = (SchemaAttDef&)
childAttList.nextElement();
+ SchemaAttDef& childAttDef = (SchemaAttDef&)
childAttList.getAttDef(i);
QName* childAttName = childAttDef.getAttName();
const XMLCh* childLocalPart = childAttName->getLocalPart();
const SchemaAttDef* baseAttDef =
baseTypeInfo->getAttDef(childLocalPart, childAttName->getURI());
1.15 +3 -3
xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp
Index: XSDDOMParser.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/XSDDOMParser.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDDOMParser.cpp 8 Sep 2004 13:56:57 -0000 1.14
+++ XSDDOMParser.cpp 7 Mar 2005 20:11:23 -0000 1.15
@@ -314,9 +314,9 @@
XMLAttDef* attr = 0;
DOMAttrImpl * insertAttr = 0;
- while (defAttrs->hasMoreElements())
+ for (unsigned int i=0; i<defAttrs->getAttDefCount(); i++)
{
- attr = &defAttrs->nextElement();
+ attr = &defAttrs->getAttDef(i);
const XMLAttDef::DefAttTypes defType = attr->getDefaultType();
if ((defType == XMLAttDef::Default)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
