[prev in list] [next in list] [prev in thread] [next in thread]
List: xerces-cvs
Subject: cvs commit: xml-xerces/c/src/parsers DOMParser.cpp DOMParser.hpp SAX2XMLReaderImpl.cpp SAX2XMLReader
From: tng () apache ! org
Date: 2001-03-30 16:46:58
[Download RAW message or body]
tng 01/03/30 08:46:58
Modified: c/src/internal XMLScanner.cpp XMLScanner.hpp XMLScanner2.cpp
c/src/parsers DOMParser.cpp DOMParser.hpp
SAX2XMLReaderImpl.cpp SAX2XMLReaderImpl.hpp
SAXParser.cpp SAXParser.hpp
Log:
Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
Revision Changes Path
1.32 +3 -3 xml-xerces/c/src/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLScanner.cpp 2001/03/30 16:35:05 1.31
+++ XMLScanner.cpp 2001/03/30 16:46:56 1.32
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner.cpp,v 1.31 2001/03/30 16:35:05 tng Exp $
+ * $Id: XMLScanner.cpp,v 1.32 2001/03/30 16:46:56 tng Exp $
*/
@@ -169,7 +169,7 @@
, fValidator(valToAdopt)
, fValidatorFromUser(false)
, fValScheme(Val_Never)
- , fSchemaValidation(false)
+ , fDoSchema(false)
, fEmptyNamespaceId(0)
, fGlobalNamespaceId(0)
, fUnknownNamespaceId(0)
@@ -212,7 +212,7 @@
, fValidator(valToAdopt)
, fValidatorFromUser(false)
, fValScheme(Val_Never)
- , fSchemaValidation(false)
+ , fDoSchema(false)
, fEmptyNamespaceId(0)
, fGlobalNamespaceId(0)
, fUnknownNamespaceId(0)
1.13 +13 -10 xml-xerces/c/src/internal/XMLScanner.hpp
Index: XMLScanner.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLScanner.hpp 2001/03/30 16:35:06 1.12
+++ XMLScanner.hpp 2001/03/30 16:46:56 1.13
@@ -56,6 +56,9 @@
/*
* $Log: XMLScanner.hpp,v $
+ * Revision 1.13 2001/03/30 16:46:56 tng
+ * Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
+ *
* Revision 1.12 2001/03/30 16:35:06 tng
* Schema: Whitespace normalization.
*
@@ -253,7 +256,7 @@
DocTypeHandler* getDocTypeHandler();
bool getDoNamespaces() const;
ValSchemes getValidationScheme() const;
- bool getSchemaValidation() const;
+ bool getDoSchema() const;
const XMLEntityHandler* getEntityHandler() const;
XMLEntityHandler* getEntityHandler();
const XMLErrorReporter* getErrorReporter() const;
@@ -358,7 +361,7 @@
void setExitOnFirstFatal(const bool newValue);
void setValidationScheme(const ValSchemes newScheme);
void setValidator(XMLValidator* const valToAdopt);
- void setSchemaValidation(const bool doSchema);
+ void setDoSchema(const bool doSchema);
// -----------------------------------------------------------------------
// Deprecated methods as of 3.2.0. Use getValidationScheme() and
@@ -669,9 +672,9 @@
// This is the currently set validation scheme. It defaults to
// 'never', but can be set by the client.
//
- // fSchemaValidation
- // This flag indicates whether the client code wants Schema
- // support or not.
+ // fDoSchema
+ // This flag indicates whether the client code wants Schema to
+ // be processed or not.
//
// fAttName
// fAttValue
@@ -747,7 +750,7 @@
XMLValidator* fValidator;
bool fValidatorFromUser;
ValSchemes fValScheme;
- bool fSchemaValidation;
+ bool fDoSchema;
XMLBuffer fAttNameBuf;
XMLBuffer fAttValueBuf;
@@ -879,9 +882,9 @@
return fGrammar;
}
-inline bool XMLScanner::getSchemaValidation() const
+inline bool XMLScanner::getDoSchema() const
{
- return fSchemaValidation;
+ return fDoSchema;
}
// ---------------------------------------------------------------------------
@@ -980,9 +983,9 @@
fValidator = valToAdopt;
}
-inline void XMLScanner::setSchemaValidation(const bool doSchema)
+inline void XMLScanner::setDoSchema(const bool doSchema)
{
- fSchemaValidation = doSchema;
+ fDoSchema = doSchema;
}
1.24 +2 -2 xml-xerces/c/src/internal/XMLScanner2.cpp
Index: XMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLScanner2.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLScanner2.cpp 2001/03/30 16:35:06 1.23
+++ XMLScanner2.cpp 2001/03/30 16:46:56 1.24
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLScanner2.cpp,v 1.23 2001/03/30 16:35:06 tng Exp $
+ * $Id: XMLScanner2.cpp,v 1.24 2001/03/30 16:46:56 tng Exp $
*/
@@ -1132,7 +1132,7 @@
}
// walk through the list again to deal with "xsi:...."
- if (fSchemaValidation && seeXsi)
+ if (fDoSchema && seeXsi)
{
for (index = 0; index < attCount; index++)
{
1.42 +5 -5 xml-xerces/c/src/parsers/DOMParser.cpp
Index: DOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/DOMParser.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- DOMParser.cpp 2001/03/21 21:56:07 1.41
+++ DOMParser.cpp 2001/03/30 16:46:57 1.42
@@ -59,7 +59,7 @@
* handler with the scanner. In these handler methods, appropriate DOM nodes
* are created and added to the DOM tree.
*
-* $Id: DOMParser.cpp,v 1.41 2001/03/21 21:56:07 tng Exp $
+* $Id: DOMParser.cpp,v 1.42 2001/03/30 16:46:57 tng Exp $
*
*/
@@ -176,9 +176,9 @@
return Val_Auto;
}
-bool DOMParser::getSchemaValidation() const
+bool DOMParser::getDoSchema() const
{
- return fScanner->getSchemaValidation();
+ return fScanner->getDoSchema();
}
@@ -231,9 +231,9 @@
fScanner->setValidationScheme(XMLScanner::Val_Auto);
}
-void DOMParser::setSchemaValidation(const bool newState)
+void DOMParser::setDoSchema(const bool newState)
{
- fScanner->setSchemaValidation(newState);
+ fScanner->setDoSchema(newState);
}
1.19 +11 -14 xml-xerces/c/src/parsers/DOMParser.hpp
Index: DOMParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/DOMParser.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DOMParser.hpp 2001/03/30 16:35:09 1.18
+++ DOMParser.hpp 2001/03/30 16:46:57 1.19
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMParser.hpp,v 1.18 2001/03/30 16:35:09 tng Exp $
+ * $Id: DOMParser.hpp,v 1.19 2001/03/30 16:46:57 tng Exp $
*
*/
@@ -222,17 +222,17 @@
*/
ValSchemes getValidationScheme() const;
- /** Get the 'schema validation' flag
+ /** Get the 'do schema' flag
*
- * This method returns the state of the parser's schema support
+ * This method returns the state of the parser's schema processing
* flag.
*
* @return true, if the parser is currently configured to
- * support schema, false otherwise.
+ * understand schema, false otherwise.
*
- * @see #setSchemaValidation
+ * @see #setDoSchema
*/
- bool getSchemaValidation() const;
+ bool getDoSchema() const;
/** Get the 'do namespaces' flag
*
@@ -471,23 +471,20 @@
*/
void setValidationScheme(const ValSchemes newScheme);
- /** Set the 'schema support' flag
+ /** Set the 'do schema' flag
*
* This method allows users to enable or disable the parser's
- * schema support.
+ * schema processing. When set to false, parser will not process
+ * any schema found.
*
* The parser's default state is: true.
*
- * This flag is ignored by the underlying scanner if the validation
- * is disable.
- *
* @param newState The value specifying whether schema support should
* be enforced or not.
*
- * @see #getSchemaValidation
- * @see #getValidationScheme
+ * @see #getDoSchema
*/
- void setSchemaValidation(const bool newState);
+ void setDoSchema(const bool newState);
/**
* This method allows users to set the toCreateXMLDeclTypeNode flag
1.10 +10 -7 xml-xerces/c/src/parsers/SAX2XMLReaderImpl.cpp
Index: SAX2XMLReaderImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/SAX2XMLReaderImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SAX2XMLReaderImpl.cpp 2001/03/21 21:56:08 1.9
+++ SAX2XMLReaderImpl.cpp 2001/03/30 16:46:57 1.10
@@ -56,6 +56,9 @@
/*
* $Log: SAX2XMLReaderImpl.cpp,v $
+ * Revision 1.10 2001/03/30 16:46:57 tng
+ * Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
+ *
* Revision 1.9 2001/03/21 21:56:08 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into \
DTDValidator, DTDScanner, and DTDGrammar.
*
@@ -302,7 +305,7 @@
fReuseGrammar = false;
// default: schema is on
- setSchemaValidation(true);
+ setDoSchema(true);
fPrefixes = new RefStackOf<XMLBuffer> (10, false) ;
tempAttrVec = new RefVectorOf<XMLAttr> (10, false) ;
@@ -1105,7 +1108,7 @@
else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA) == \
0) {
- setSchemaValidation(value);
+ setDoSchema(value);
}
else
@@ -1127,7 +1130,7 @@
else if (XMLString::compareIString(name, \
SAX2XMLReaderImpl::SAX_XERCES_REUSEGRAMMAR) == 0) return fReuseGrammar;
else if (XMLString::compareIString(name, SAX2XMLReaderImpl::SAX_XERCES_SCHEMA) == \
0)
- return getSchemaValidation();
+ return getDoSchema();
else
throw SAXNotRecognizedException("Unknown Feature");
return false;
@@ -1175,12 +1178,12 @@
return fScanner->getDoNamespaces();
}
-void SAX2XMLReaderImpl::setSchemaValidation(const bool newState)
+void SAX2XMLReaderImpl::setDoSchema(const bool newState)
{
- fScanner->setSchemaValidation(newState);
+ fScanner->setDoSchema(newState);
}
-bool SAX2XMLReaderImpl::getSchemaValidation() const
+bool SAX2XMLReaderImpl::getDoSchema() const
{
- return fScanner->getSchemaValidation();
+ return fScanner->getDoSchema();
}
1.7 +5 -2 xml-xerces/c/src/parsers/SAX2XMLReaderImpl.hpp
Index: SAX2XMLReaderImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/SAX2XMLReaderImpl.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SAX2XMLReaderImpl.hpp 2001/03/21 21:56:08 1.6
+++ SAX2XMLReaderImpl.hpp 2001/03/30 16:46:57 1.7
@@ -56,6 +56,9 @@
/*
* $Log: SAX2XMLReaderImpl.hpp,v $
+ * Revision 1.7 2001/03/30 16:46:57 tng
+ * Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
+ *
* Revision 1.6 2001/03/21 21:56:08 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into \
DTDValidator, DTDScanner, and DTDGrammar.
*
@@ -1064,8 +1067,8 @@
void setValidationScheme(const ValSchemes newScheme);
void setDoNamespaces(const bool newState);
bool getDoNamespaces() const;
- void setSchemaValidation(const bool newState);
- bool getSchemaValidation() const;
+ void setDoSchema(const bool newState);
+ bool getDoSchema() const;
};
1.17 +7 -4 xml-xerces/c/src/parsers/SAXParser.cpp
Index: SAXParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/SAXParser.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SAXParser.cpp 2001/03/21 21:56:08 1.16
+++ SAXParser.cpp 2001/03/30 16:46:57 1.17
@@ -56,6 +56,9 @@
/*
* $Log: SAXParser.cpp,v $
+ * Revision 1.17 2001/03/30 16:46:57 tng
+ * Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
+ *
* Revision 1.16 2001/03/21 21:56:08 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into \
DTDValidator, DTDScanner, and DTDGrammar.
*
@@ -295,9 +298,9 @@
return Val_Auto;
}
-bool SAXParser::getSchemaValidation() const
+bool SAXParser::getDoSchema() const
{
- return fScanner->getSchemaValidation();
+ return fScanner->getDoSchema();
}
@@ -326,9 +329,9 @@
fScanner->setValidationScheme(XMLScanner::Val_Auto);
}
-void SAXParser::setSchemaValidation(const bool newState)
+void SAXParser::setDoSchema(const bool newState)
{
- fScanner->setSchemaValidation(newState);
+ fScanner->setDoSchema(newState);
}
1.13 +12 -12 xml-xerces/c/src/parsers/SAXParser.hpp
Index: SAXParser.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/SAXParser.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SAXParser.hpp 2001/03/21 21:56:09 1.12
+++ SAXParser.hpp 2001/03/30 16:46:57 1.13
@@ -56,6 +56,9 @@
/*
* $Log: SAXParser.hpp,v $
+ * Revision 1.13 2001/03/30 16:46:57 tng
+ * Schema: Use setDoSchema instead of setSchemaValidation which makes more sense.
+ *
* Revision 1.12 2001/03/21 21:56:09 tng
* Schema: Add Schema Grammar, Schema Validator, and split the DTDValidator into \
DTDValidator, DTDScanner, and DTDGrammar.
*
@@ -248,17 +251,17 @@
*/
ValSchemes getValidationScheme() const;
- /** Get the 'schema validation' flag
+ /** Get the 'do schema' flag
*
- * This method returns the state of the parser's schema support
+ * This method returns the state of the parser's schema processing
* flag.
*
* @return true, if the parser is currently configured to
- * support schema, false otherwise.
+ * understand schema, false otherwise.
*
- * @see #setSchemaValidation
+ * @see #setDoSchema
*/
- bool getSchemaValidation() const;
+ bool getDoSchema() const;
/**
* This method returns the state of the parser's namespace
@@ -330,20 +333,17 @@
/** Set the 'schema support' flag
*
* This method allows users to enable or disable the parser's
- * schema support.
+ * schema processing. When set to false, parser will not process
+ * any schema found.
*
* The parser's default state is: true.
*
- * This flag is ignored by the underlying scanner if the validation
- * is disable.
- *
* @param newState The value specifying whether schema support should
* be enforced or not.
*
- * @see #getSchemaValidation
- * @see #getValidationScheme
+ * @see #getDoSchema
*/
- void setSchemaValidation(const bool newState);
+ void setDoSchema(const bool newState);
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic