You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/05/21 21:30:48 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema SchemaInfo.cpp SchemaInfo.hpp
tng 02/05/21 12:30:48
Modified: c/src/xercesc/validators/schema SchemaInfo.cpp
SchemaInfo.hpp
Log:
DOM Reorganization: modify to use the new DOM interface.
Revision Changes Path
1.5 +9 -6 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp
Index: SchemaInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaInfo.cpp 19 Mar 2002 21:22:39 -0000 1.4
+++ SchemaInfo.cpp 21 May 2002 19:30:47 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log: SchemaInfo.cpp,v $
+ * Revision 1.5 2002/05/21 19:30:47 tng
+ * DOM Reorganization: modify to use the new DOM interface.
+ *
* Revision 1.4 2002/03/19 21:22:39 knoaman
* Fix for declarations referenced from a different NS in the case of a circular import.
*
@@ -108,7 +111,7 @@
XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
XMLStringPool* const stringPool,
- const IDOM_Element* const root)
+ const DOMElement* const root)
: fAdoptInclude(false)
, fElemAttrDefaultQualified(elemAttrDefaultQualified)
, fBlockDefault(blockDefault)
@@ -160,13 +163,13 @@
// ---------------------------------------------------------------------------
// SchemaInfo:
// ---------------------------------------------------------------------------
-IDOM_Element*
+DOMElement*
SchemaInfo::getTopLevelComponent(const XMLCh* const compCategory,
const XMLCh* const name,
SchemaInfo** enclosingSchema) {
SchemaInfo* currentInfo = this;
- IDOM_Element* child = getTopLevelComponent(compCategory, name);
+ DOMElement* child = getTopLevelComponent(compCategory, name);
if (child == 0) {
@@ -193,11 +196,11 @@
}
-IDOM_Element*
+DOMElement*
SchemaInfo::getTopLevelComponent(const XMLCh* const compCategory,
const XMLCh* const name) {
- IDOM_Element* child = XUtil::getFirstChildElement(fSchemaRootElement);
+ DOMElement* child = XUtil::getFirstChildElement(fSchemaRootElement);
while (child != 0) {
@@ -209,7 +212,7 @@
else if (!XMLString::compareString(child->getLocalName(),SchemaSymbols::fgELT_REDEFINE)
&& (!fFailedRedefineList || !fFailedRedefineList->containsElement(child))) { // if redefine
- IDOM_Element* redefineChild = XUtil::getFirstChildElement(child);
+ DOMElement* redefineChild = XUtil::getFirstChildElement(child);
while (redefineChild != 0) {
1.6 +22 -22 xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp
Index: SchemaInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaInfo.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SchemaInfo.hpp 21 Mar 2002 15:34:40 -0000 1.5
+++ SchemaInfo.hpp 21 May 2002 19:30:47 -0000 1.6
@@ -55,7 +55,7 @@
*/
/*
- * $Id: SchemaInfo.hpp,v 1.5 2002/03/21 15:34:40 knoaman Exp $
+ * $Id: SchemaInfo.hpp,v 1.6 2002/05/21 19:30:47 tng Exp $
*/
#if !defined(SCHEMAINFO_HPP)
@@ -77,7 +77,7 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/idom/IDOM_Element.hpp>
+#include <xercesc/dom/DOMElement.hpp>
#include <xercesc/util/RefVectorOf.hpp>
#include <xercesc/util/ValueVectorOf.hpp>
#include <xercesc/util/StringPool.hpp>
@@ -104,7 +104,7 @@
XMLCh* const schemaURL,
const XMLCh* const targetNSURIString,
XMLStringPool* const stringPool,
- const IDOM_Element* const root);
+ const DOMElement* const root);
~SchemaInfo();
@@ -113,7 +113,7 @@
// -----------------------------------------------------------------------
XMLCh* getCurrentSchemaURL() const;
const XMLCh* const getTargetNSURIString() const;
- const IDOM_Element* getRoot() const;
+ const DOMElement* getRoot() const;
int getBlockDefault() const;
int getFinalDefault() const;
int getTargetNSURI() const;
@@ -121,7 +121,7 @@
unsigned int getNamespaceScopeLevel() const;
unsigned short getElemAttrDefaultQualified() const;
RefVectorEnumerator<SchemaInfo> getImportingListEnumerator() const;
- ValueVectorOf<const IDOM_Element*>* getRecursingAnonTypes() const;
+ ValueVectorOf<const DOMElement*>* getRecursingAnonTypes() const;
ValueVectorOf<const XMLCh*>* getRecursingTypeNames() const;
// -----------------------------------------------------------------------
@@ -131,25 +131,25 @@
void setBlockDefault(const int aValue);
void setFinalDefault(const int aValue);
void setElemAttrDefaultQualified(const unsigned short aValue);
-
+
// -----------------------------------------------------------------------
// Access methods
// -----------------------------------------------------------------------
void addSchemaInfo(SchemaInfo* const toAdd, const ListType aListType);
bool containsInfo(const SchemaInfo* const toCheck, const ListType aListType) const;
SchemaInfo* getImportInfo(const unsigned int namespaceURI) const;
- IDOM_Element* getTopLevelComponent(const XMLCh* const compCategory,
+ DOMElement* getTopLevelComponent(const XMLCh* const compCategory,
const XMLCh* const name);
- IDOM_Element* getTopLevelComponent(const XMLCh* const compCategory,
+ DOMElement* getTopLevelComponent(const XMLCh* const compCategory,
const XMLCh* const name,
SchemaInfo** enclosingSchema);
void updateImportingInfo(SchemaInfo* const importingInfo);
bool circularImportExist(const unsigned int nameSpaceURI);
- bool isFailedRedefine(const IDOM_Element* const anElem);
- void addFailedRedefine(const IDOM_Element* const anElem);
+ bool isFailedRedefine(const DOMElement* const anElem);
+ void addFailedRedefine(const DOMElement* const anElem);
bool isImportingNS(const int namespaceURI);
void addImportedNS(const int namespaceURI);
- void addRecursingType(const IDOM_Element* const elem, const XMLCh* const name);
+ void addRecursingType(const DOMElement* const elem, const XMLCh* const name);
private:
// -----------------------------------------------------------------------
@@ -165,13 +165,13 @@
XMLCh* fCurrentSchemaURL;
const XMLCh* fTargetNSURIString;
XMLStringPool* fStringPool;
- const IDOM_Element* fSchemaRootElement;
+ const DOMElement* fSchemaRootElement;
RefVectorOf<SchemaInfo>* fIncludeInfoList;
RefVectorOf<SchemaInfo>* fImportedInfoList;
RefVectorOf<SchemaInfo>* fImportingInfoList;
- ValueVectorOf<const IDOM_Element*>* fFailedRedefineList;
+ ValueVectorOf<const DOMElement*>* fFailedRedefineList;
ValueVectorOf<int>* fImportedNSList;
- ValueVectorOf<const IDOM_Element*>* fRecursingAnonTypes;
+ ValueVectorOf<const DOMElement*>* fRecursingAnonTypes;
ValueVectorOf<const XMLCh*>* fRecursingTypeNames;
};
@@ -207,7 +207,7 @@
return fTargetNSURIString;
}
-inline const IDOM_Element* SchemaInfo::getRoot() const {
+inline const DOMElement* SchemaInfo::getRoot() const {
return fSchemaRootElement;
}
@@ -228,7 +228,7 @@
return RefVectorEnumerator<SchemaInfo>(fImportingInfoList);
}
-inline ValueVectorOf<const IDOM_Element*>*
+inline ValueVectorOf<const DOMElement*>*
SchemaInfo::getRecursingAnonTypes() const {
return fRecursingAnonTypes;
@@ -319,7 +319,7 @@
const ListType aListType) const {
if ((aListType == INCLUDE) && fIncludeInfoList) {
- return fIncludeInfoList->containsElement(toCheck);
+ return fIncludeInfoList->containsElement(toCheck);
}
else if ((aListType == IMPORT) && fImportedInfoList) {
return fImportedInfoList->containsElement(toCheck);
@@ -341,7 +341,7 @@
return false;
}
-inline bool SchemaInfo::isFailedRedefine(const IDOM_Element* const anElem) {
+inline bool SchemaInfo::isFailedRedefine(const DOMElement* const anElem) {
if (fFailedRedefineList)
return (fFailedRedefineList->containsElement(anElem));
@@ -349,10 +349,10 @@
return false;
}
-inline void SchemaInfo::addFailedRedefine(const IDOM_Element* const anElem) {
+inline void SchemaInfo::addFailedRedefine(const DOMElement* const anElem) {
if (!fFailedRedefineList) {
- fFailedRedefineList = new ValueVectorOf<const IDOM_Element*>(4);
+ fFailedRedefineList = new ValueVectorOf<const DOMElement*>(4);
}
fFailedRedefineList->addElement(anElem);
@@ -376,11 +376,11 @@
return (fImportedNSList->containsElement(namespaceURI));
}
-inline void SchemaInfo::addRecursingType(const IDOM_Element* const elem,
+inline void SchemaInfo::addRecursingType(const DOMElement* const elem,
const XMLCh* const name) {
if (!fRecursingAnonTypes) {
- fRecursingAnonTypes = new ValueVectorOf<const IDOM_Element*>(8);
+ fRecursingAnonTypes = new ValueVectorOf<const DOMElement*>(8);
fRecursingTypeNames = new ValueVectorOf<const XMLCh*>(8);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org