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:10 UTC
cvs commit: xml-xerces/c/src/xercesc/validators/schema GeneralAttributeCheck.cpp GeneralAttributeCheck.hpp
tng 02/05/21 12:30:10
Modified: c/src/xercesc/validators/schema GeneralAttributeCheck.cpp
GeneralAttributeCheck.hpp
Log:
DOM Reorganization: modify to use the new DOM interface.
Revision Changes Path
1.4 +9 -6 xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp
Index: GeneralAttributeCheck.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeneralAttributeCheck.cpp 21 Mar 2002 15:34:40 -0000 1.3
+++ GeneralAttributeCheck.cpp 21 May 2002 19:30:10 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log: GeneralAttributeCheck.cpp,v $
+ * Revision 1.4 2002/05/21 19:30:10 tng
+ * DOM Reorganization: modify to use the new DOM interface.
+ *
* Revision 1.3 2002/03/21 15:34:40 knoaman
* Add support for reporting line/column numbers of schema errors.
*
@@ -125,7 +128,7 @@
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/Janitor.hpp>
-#include <xercesc/idom/IDOM_NamedNodeMap.hpp>
+#include <xercesc/dom/DOMNamedNodeMap.hpp>
#include <xercesc/framework/XMLErrorCodes.hpp>
#include <xercesc/validators/schema/TraverseSchema.hpp>
#include <xercesc/util/PlatformUtils.hpp>
@@ -861,7 +864,7 @@
// GeneralAttributeCheck: Validation methods
// ---------------------------------------------------------------------------
void
-GeneralAttributeCheck::checkAttributes(const IDOM_Element* const elem,
+GeneralAttributeCheck::checkAttributes(const DOMElement* const elem,
const unsigned short elemContext,
TraverseSchema* const schema) {
@@ -917,7 +920,7 @@
XMLCh* attName = attInfo->getName();
const XMLCh* attValue = elem->getAttribute(attName);
- IDOM_Attr* attNode = elem->getAttributeNode(attName);
+ DOMAttr* attNode = elem->getAttributeNode(attName);
unsigned int attValueLen = XMLString::stringLen(attValue);
attNameList.put((void*) attName, 0);
@@ -937,12 +940,12 @@
// ------------------------------------------------------------------
// Check for disallowed attributes
// ------------------------------------------------------------------
- IDOM_NamedNodeMap* eltAttrs = elem->getAttributes();
+ DOMNamedNodeMap* eltAttrs = elem->getAttributes();
int attrCount = eltAttrs->getLength();
for (int j = 0; j < attrCount; j++) {
- IDOM_Node* attribute = eltAttrs->item(j);
+ DOMNode* attribute = eltAttrs->item(j);
if (!attribute) {
break;
@@ -1008,7 +1011,7 @@
}
-void GeneralAttributeCheck::validate(const IDOM_Element* const elem,
+void GeneralAttributeCheck::validate(const DOMElement* const elem,
const XMLCh* const attName,
const XMLCh* const attValue,
const short dvIndex,
1.4 +8 -8 xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
Index: GeneralAttributeCheck.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/GeneralAttributeCheck.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GeneralAttributeCheck.hpp 21 Mar 2002 15:34:40 -0000 1.3
+++ GeneralAttributeCheck.hpp 21 May 2002 19:30:10 -0000 1.4
@@ -55,14 +55,14 @@
*/
/*
- * $Id: GeneralAttributeCheck.hpp,v 1.3 2002/03/21 15:34:40 knoaman Exp $
+ * $Id: GeneralAttributeCheck.hpp,v 1.4 2002/05/21 19:30:10 tng Exp $
*/
#if !defined(GENERALATTRIBUTECHECK_HPP)
#define GENERALATTRIBUTECHECK_HPP
-/**
+/**
* A general purpose class to check for valid values of attributes, as well
* as check for proper association with corresponding schema elements.
*/
@@ -79,7 +79,7 @@
// Forward declaration
// ---------------------------------------------------------------------------
class TraverseSchema;
-class IDOM_Element;
+class DOMElement;
class AttributeInfo {
@@ -145,7 +145,7 @@
// -----------------------------------------------------------------------
// Validation methods
// -----------------------------------------------------------------------
- void checkAttributes(const IDOM_Element* const elem,
+ void checkAttributes(const DOMElement* const elem,
const unsigned short elemContext,
TraverseSchema* const schema);
@@ -171,13 +171,13 @@
// -----------------------------------------------------------------------
// Validation methods
// -----------------------------------------------------------------------
- void validate(const IDOM_Element* const elem, const XMLCh* const attName, const XMLCh* const attValue,
+ void validate(const DOMElement* const elem, const XMLCh* const attName, const XMLCh* const attValue,
const short dvIndex, TraverseSchema* const schema);
// -----------------------------------------------------------------------
// Private Constants
// -----------------------------------------------------------------------
- // attributes
+ // attributes
enum {
Att_Abstract_D, // starts with 0
Att_Attribute_FD_D,
@@ -268,8 +268,8 @@
localRefPrefix
};
- // optional vs. required attribute
- enum {
+ // optional vs. required attribute
+ enum {
Att_Required,
Att_Optional_Default,
Att_Optional_NoDefault
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org