You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2002/02/06 23:30:50 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema SchemaElementDecl.hpp SchemaElementDecl.cpp
knoaman 02/02/06 14:30:50
Modified: c/src/xercesc/validators/schema SchemaElementDecl.hpp
SchemaElementDecl.cpp
Log:
Added a new attribute to store the wild card information for elements of type 'anyType'.
Revision Changes Path
1.2 +20 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp
Index: SchemaElementDecl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaElementDecl.hpp 1 Feb 2002 22:22:46 -0000 1.1
+++ SchemaElementDecl.hpp 6 Feb 2002 22:30:50 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: SchemaElementDecl.hpp,v $
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/06 22:30:50 knoaman
+ * Added a new attribute to store the wild card information for elements of type 'anyType'.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.16 2001/11/23 18:25:45 tng
* Eliminate Warning from AIX xlC 3.6: 1540-399: (W) "IdentityConstraint" is undefined. The delete operator will not call a destructor.
@@ -232,6 +235,7 @@
void setTypeFromAnotherSchemaURI(const XMLCh* const uriStr);
void setComplexTypeInfo(ComplexTypeInfo* const typeInfo);
void setXsiComplexTypeInfo(ComplexTypeInfo* const typeInfo);
+ void setAttWildCard(SchemaAttDef* const attWildCard);
// -----------------------------------------------------------------------
// IC methods
@@ -291,6 +295,10 @@
//
// fIdentityConstraints
// Store information about an element identity constraints.
+ //
+ // fAttWildCard
+ // Store wildcard attribute in the case of an element with a type of
+ // 'anyType'.
// -----------------------------------------------------------------------
ModelTypes fModelType;
DatatypeValidator* fDatatypeValidator;
@@ -306,6 +314,7 @@
RefHash2KeysTableOf<SchemaAttDef>* fAttDefs;
ComplexTypeInfo* fXsiComplexTypeInfo;
RefVectorOf<IdentityConstraint>* fIdentityConstraints;
+ SchemaAttDef* fAttWildCard;
};
// ---------------------------------------------------------------------------
@@ -438,7 +447,7 @@
return fComplexTypeInfo->getAttWildCard();
}
- return 0;
+ return fAttWildCard;
}
inline SchemaAttDef* SchemaElementDecl::getAttWildCard() {
@@ -450,7 +459,7 @@
return fComplexTypeInfo->getAttWildCard();
}
- return 0;
+ return fAttWildCard;
}
// ---------------------------------------------------------------------------
@@ -530,6 +539,15 @@
SchemaElementDecl::setXsiComplexTypeInfo(ComplexTypeInfo* const typeInfo)
{
fXsiComplexTypeInfo = typeInfo;
+}
+
+inline void
+SchemaElementDecl::setAttWildCard(SchemaAttDef* const attWildCard) {
+
+ if (fAttWildCard)
+ delete fAttWildCard;
+
+ fAttWildCard = attWildCard;
}
// ---------------------------------------------------------------------------
1.2 +7 -0 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp
Index: SchemaElementDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SchemaElementDecl.cpp 1 Feb 2002 22:22:46 -0000 1.1
+++ SchemaElementDecl.cpp 6 Feb 2002 22:30:50 -0000 1.2
@@ -56,8 +56,11 @@
/*
* $Log: SchemaElementDecl.cpp,v $
- * Revision 1.1 2002/02/01 22:22:46 peiyongz
- * Initial revision
+ * Revision 1.2 2002/02/06 22:30:50 knoaman
+ * Added a new attribute to store the wild card information for elements of type 'anyType'.
+ *
+ * Revision 1.1.1.1 2002/02/01 22:22:46 peiyongz
+ * sane_include
*
* Revision 1.18 2002/01/02 15:20:22 tng
* Schema Fix: should not store a temp value as the key in the element pool and the attribute pool.
@@ -144,6 +147,7 @@
, fXsiComplexTypeInfo(0)
, fAttDefs(0)
, fIdentityConstraints(0)
+ , fAttWildCard(0)
{
}
@@ -166,6 +170,7 @@
, fXsiComplexTypeInfo(0)
, fAttDefs(0)
, fIdentityConstraints(0)
+ , fAttWildCard(0)
{
setElementName(prefix, localPart, uriId);
}
@@ -187,6 +192,7 @@
, fXsiComplexTypeInfo(0)
, fAttDefs(0)
, fIdentityConstraints(0)
+ , fAttWildCard(0)
{
setElementName(elementName);
}
@@ -198,6 +204,7 @@
delete [] fTypeFromAnotherSchemaURI;
delete fAttDefs;
delete fIdentityConstraints;
+ delete fAttWildCard;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org