Author: cargilld
Date: Thu Aug 11 06:54:22 2005
New Revision: 231458
URL: http://svn.apache.org/viewcvs?rev=231458&view=rev
Log:
Remove deprecated uppercase enums that were conflicting with other products and
the related methods that call them.
Modified:
xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
Modified:
xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp?rev=231458&r1=231457&r2=231458&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
Thu Aug 11 06:54:22 2005
@@ -41,7 +41,6 @@
,fMemberTypesInherited(false)
,fEnumeration(0)
,fMemberTypeValidators(0)
-,fValidatedDatatype(0)
{}
@@ -59,7 +58,6 @@
,fMemberTypesInherited(false)
,fEnumeration(0)
,fMemberTypeValidators(0)
-,fValidatedDatatype(0)
{
if ( !memberTypeValidators )
{
@@ -87,7 +85,6 @@
,fMemberTypesInherited(memberTypesInherited)
,fEnumeration(0)
,fMemberTypeValidators(memberTypeValidators)
-,fValidatedDatatype(0)
{
//
// baseValidator another UnionDTV from which,
@@ -260,8 +257,7 @@
memTypeValid = true;
//set the validator of the type actually used to validate the
content
- DatatypeValidator *dtv = fMemberTypeValidators->elementAt(i);
- fValidatedDatatype = dtv;
+ DatatypeValidator *dtv = fMemberTypeValidators->elementAt(i);
// context will be null during schema construction
if(context)
context->setValidatingMemberType(dtv);
@@ -447,9 +443,6 @@
***/
XTemplateSerializer::storeObject(fEnumeration, serEng);
XTemplateSerializer::storeObject(fMemberTypeValidators, serEng);
-
- DatatypeValidator::storeDV(serEng, fValidatedDatatype);
-
}
else
{
@@ -462,9 +455,6 @@
***/
XTemplateSerializer::loadObject(&fEnumeration, 8, true, serEng);
XTemplateSerializer::loadObject(&fMemberTypeValidators, 4, false,
serEng);
-
- fValidatedDatatype = DatatypeValidator::loadDV(serEng);
-
}
}
Modified:
xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp?rev=231458&r1=231457&r2=231458&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
(original)
+++ xerces/c/trunk/src/xercesc/validators/datatype/UnionDatatypeValidator.hpp
Thu Aug 11 06:54:22 2005
@@ -171,41 +171,6 @@
RefVectorOf<DatatypeValidator>* getMemberTypeValidators() const;
-
- /**
- * Returns the type name that was actually used to validate the last time
validate was called
- * note - this does not mean that it fully validated sucessfully
- * @deprecated
- **/
- const XMLCh* getMemberTypeName() const;
-
- /**
- * Returns the type uri that was actually used to validate the last time
validate was called
- * note - this does not mean that it fully validated sucessfully
- * @deprecated
- **/
- const XMLCh* getMemberTypeUri() const;
-
- /**
- * Returns true if the type that was actually used to validate the last
time validate was called
- * is anonymous
- * @deprecated
- */
- bool getMemberTypeAnonymous() const;
-
-
- /**
- * Returns the member DatatypeValidator used to validate the content the
last time validate
- * was called
- * @deprecated
- */
- const DatatypeValidator* getMemberTypeValidator() const;
-
- /**
- * Called inbetween uses of this validator to reset PSVI information
- */
- void reset();
-
private:
// -----------------------------------------------------------------------
// Unimplemented constructors and operators
@@ -239,16 +204,12 @@
// fMemberTypeValidators
// we own it (or not, depending on the state of
fMemberTypesInherited).
//
- // fValidatedDatatype
- // the dataTypeValidator that was actually used to validate the last
time validate was called
- //
// -----------------------------------------------------------------------
bool fEnumerationInherited;
bool fMemberTypesInherited;
RefArrayVectorOf<XMLCh>* fEnumeration;
- RefVectorOf<DatatypeValidator>* fMemberTypeValidators;
- DatatypeValidator* fValidatedDatatype;
+ RefVectorOf<DatatypeValidator>* fMemberTypeValidators;
};
inline DatatypeValidator* UnionDatatypeValidator::newInstance
@@ -343,36 +304,6 @@
}
}
return false;
-}
-
-inline const XMLCh* UnionDatatypeValidator::getMemberTypeName() const {
- if(fValidatedDatatype) {
- return fValidatedDatatype->getTypeLocalName();
- }
- return 0;
-}
-
-inline const XMLCh* UnionDatatypeValidator::getMemberTypeUri() const
-{
- if(fValidatedDatatype) {
- return fValidatedDatatype->getTypeUri();
- }
- return 0;
-}
-
-inline bool UnionDatatypeValidator::getMemberTypeAnonymous() const {
- if(fValidatedDatatype) {
- return fValidatedDatatype->getAnonymous();
- }
- return 0;
-}
-
-inline const DatatypeValidator*
UnionDatatypeValidator::getMemberTypeValidator() const {
- return fValidatedDatatype;
-}
-
-inline void UnionDatatypeValidator::reset() {
- fValidatedDatatype = 0;
}
XERCES_CPP_NAMESPACE_END
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
