Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDScanner.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDScanner.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/DTD/DTDScanner.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/DTD/DTDScanner.cpp Sat Jul 8 18:10:31 2006 @@ -231,7 +231,7 @@ fScanner->emitError(XMLErrs::EntityNotFound, bbName.getRawBuffer()); } else { - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::VC_EntityNotFound, bbName.getRawBuffer()); } @@ -243,7 +243,7 @@ // If we are a standalone document, then it has to have been declared // in the internal subset. Keep going though. // - if (fScanner->getDoValidation() && fScanner->getStandalone() && !decl->getDeclaredInIntSubset()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always && fScanner->getStandalone() && !decl->getDeclaredInIntSubset()) fScanner->getValidator()->emitError(XMLValid::VC_IllegalRefInStandalone, bbName.getRawBuffer()); // @@ -542,7 +542,7 @@ scanDefaultDecl(*decl); // If validating, then do a couple of validation constraints - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) { if (decl->getType() == XMLAttDef::ID) { @@ -705,7 +705,7 @@ // make sure that we have not seen an id attribute yet. Set // the flag to say that we've seen one now also. // - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) { if (attDef->getType() == XMLAttDef::ID) { @@ -1063,7 +1063,7 @@ if (!curNode) return 0; - if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation()) + if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); } else @@ -1257,7 +1257,7 @@ return 0; } - if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation()) + if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); // Else patch it in and make it the new current @@ -1543,7 +1543,7 @@ // If we are validating we have to check that there are no multiple // uses of any child elements. // - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) { if (((const MixedContentModel*)toFill.getContentModel())->hasDups()) fScanner->getValidator()->emitError(XMLValid::RepElemInMixed); @@ -1565,7 +1565,7 @@ } // Make sure we are on the same reader as where we started - if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getDoValidation()) + if (curReader != fReaderMgr->getCurrentReaderNum() && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); return status; @@ -1656,7 +1656,7 @@ { if (decl->isDeclared()) { - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::ElementAlreadyExists, bbName.getRawBuffer()); if (!fDumElemDecl) @@ -1956,7 +1956,7 @@ fScanner->emitError(XMLErrs::EntityNotFound, bbName.getRawBuffer()); } else { - if (fScanner->getDoValidation()) + if (fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::VC_EntityNotFound, bbName.getRawBuffer()); } @@ -2238,7 +2238,7 @@ // then we propogated some entity out of the literal, so issue an // error, but don't fail. // - if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getDoValidation()) + if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); return true; @@ -2517,7 +2517,7 @@ if (fReaderMgr->getCurrentReaderNum() != orgReader){ if (wasInPE) fScanner->emitError(XMLErrs::PEBetweenDecl); - else if (fScanner->getDoValidation()) + else if (fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); } @@ -2949,7 +2949,7 @@ if (fReaderMgr->getCurrentReaderNum() != orgReader) { if (wasInPE) fScanner->emitError(XMLErrs::PEBetweenDecl); - else if (fScanner->getDoValidation()) + else if (fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); } } @@ -3089,7 +3089,7 @@ // And see if we got back to the same level. If not, then its // a partial markup error. // - if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getDoValidation()) + if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); } @@ -3111,7 +3111,7 @@ // And see if we got back to the same level. If not, then its // a partial markup error. // - if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getDoValidation()) + if (fReaderMgr->getCurrentReaderNum() != orgReader && fScanner->getValidationScheme() == XMLScanner::Val_Always) fScanner->getValidator()->emitError(XMLValid::PartialMarkupInPE); }
Modified: xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -24,6 +24,7 @@ #include <xercesc/validators/datatype/ENTITYDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> #include <xercesc/framework/XMLEntityDecl.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -95,7 +96,7 @@ // // 3.3.11 check must: "NCName" // - if ( !XMLString::isValidNCName(content)) + if ( !XMLChar1_0::isValidNCName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr1(InvalidDatatypeValueException , XMLExcepts::VALUE_Invalid_NCName Modified: xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp Sat Jul 8 18:10:31 2006 @@ -107,17 +107,6 @@ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager ); -// ----------------------------------------------------------------------- -// Setter methods -// ----------------------------------------------------------------------- - /** @name Setter Functions */ - //@{ - - //deprecated - inline void setEntityDeclPool(NameIdPool<DTDEntityDecl>* const entityDeclPool); - - //@} - /*** * Support for Serialization/De-serialization ***/ @@ -144,13 +133,6 @@ ENTITYDatatypeValidator& operator = (const ENTITYDatatypeValidator&); }; - -// ----------------------------------------------------------------------- -// Setter methods -// ----------------------------------------------------------------------- -inline void ENTITYDatatypeValidator::setEntityDeclPool(NameIdPool<DTDEntityDecl>* const ) -{ -} XERCES_CPP_NAMESPACE_END Modified: xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -23,6 +23,7 @@ // --------------------------------------------------------------------------- #include <xercesc/validators/datatype/IDDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -93,7 +94,7 @@ // // 3.3.8 check must: "NCName" // - if ( !XMLString::isValidNCName(content)) + if ( !XMLChar1_0::isValidNCName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr1(InvalidDatatypeValueException , XMLExcepts::VALUE_Invalid_NCName Modified: xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.hpp Sat Jul 8 18:10:31 2006 @@ -87,9 +87,6 @@ //@} - //deprecated - inline void setIDRefList(RefHashTableOf<XMLRefInfo>* fIDRefList); - /*** * Support for Serialization/De-serialization ***/ @@ -124,10 +121,6 @@ // // ----------------------------------------------------------------------- }; - -inline void IDDatatypeValidator::setIDRefList(RefHashTableOf<XMLRefInfo>* ) -{ -} XERCES_CPP_NAMESPACE_END Modified: xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -23,6 +23,7 @@ // --------------------------------------------------------------------------- #include <xercesc/validators/datatype/IDREFDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -95,7 +96,7 @@ // // 3.3.9 check must: "NCName" // - if ( !XMLString::isValidNCName(content)) + if ( !XMLChar1_0::isValidNCName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr1(InvalidDatatypeValueException , XMLExcepts::VALUE_Invalid_NCName Modified: xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp Sat Jul 8 18:10:31 2006 @@ -88,9 +88,6 @@ , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager ); - //deprecated - inline void setIDRefList(RefHashTableOf<XMLRefInfo>* fIDRefList); - /*** * Support for Serialization/De-serialization ***/ @@ -127,13 +124,6 @@ // ----------------------------------------------------------------------- }; - -// ----------------------------------------------------------------------- -// Validation methods -// ----------------------------------------------------------------------- -inline void IDREFDatatypeValidator::setIDRefList(RefHashTableOf<XMLRefInfo>* ) -{ -} XERCES_CPP_NAMESPACE_END Modified: xerces/c/trunk/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -23,6 +23,7 @@ // --------------------------------------------------------------------------- #include <xercesc/validators/datatype/NCNameDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -98,7 +99,7 @@ // // 3.3.7 check must: "NCName" // - if ( !XMLString::isValidNCName(content)) + if ( !XMLChar1_0::isValidNCName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr1(InvalidDatatypeValueException , XMLExcepts::VALUE_Invalid_NCName Modified: xerces/c/trunk/src/xercesc/validators/datatype/NameDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/NameDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/NameDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/NameDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -23,6 +23,7 @@ // --------------------------------------------------------------------------- #include <xercesc/validators/datatype/NameDatatypeValidator.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -97,7 +98,7 @@ // // 3.3.6 check must: "Name" // - if ( !XMLString::isValidName(content)) + if ( !XMLChar1_0::isValidName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr2(InvalidDatatypeValueException , XMLExcepts::VALUE_Invalid_Name Modified: xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp Sat Jul 8 18:10:31 2006 @@ -25,6 +25,7 @@ #include <xercesc/validators/datatype/InvalidDatatypeFacetException.hpp> #include <xercesc/validators/datatype/InvalidDatatypeValueException.hpp> #include <xercesc/internal/ValidationContextImpl.hpp> +#include <xercesc/util/XMLChar.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -70,7 +71,7 @@ // // check 3.2.18.c0 must: QName // - if ( !XMLString::isValidQName(content)) + if ( !XMLChar1_0::isValidQName(content, XMLString::stringLen(content)) ) { ThrowXMLwithMemMgr1(InvalidDatatypeValueException , XMLExcepts::VALUE_QName_Invalid Modified: xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp Sat Jul 8 18:10:31 2006 @@ -231,9 +231,6 @@ } fContentSpec = toAdopt; - - //reset Content Model - setContentModel(0); } void ComplexTypeInfo::setLocator(XSDLocator* const aLocator) { @@ -277,55 +274,6 @@ // --------------------------------------------------------------------------- // ComplexTypeInfo: Helper methods // --------------------------------------------------------------------------- -XMLAttDef* ComplexTypeInfo::findAttr(const XMLCh* const - , const unsigned int uriId - , const XMLCh* const baseName - , const XMLCh* const prefix - , const XMLElementDecl::LookupOpts options - , bool& wasAdded) const -{ - SchemaAttDef* retVal = fAttDefs->get(baseName, uriId); - - // Fault it in if not found and ask to add it - if (!retVal && (options == XMLElementDecl::AddIfNotFound)) - { - // And add a default attribute for this name - retVal = new (fMemoryManager) SchemaAttDef - ( - prefix - , baseName - , uriId - , XMLAttDef::CData - , XMLAttDef::Implied - , fMemoryManager - ); - retVal->setElemId(getElementId()); - fAttDefs->put((void*)retVal->getAttName()->getLocalPart(), uriId, retVal); - - // update fAttList - fAttList->addAttDef(retVal); - wasAdded = true; - } - else - { - wasAdded = false; - } - return retVal; -} - -bool ComplexTypeInfo::resetDefs() { - - // Ok, run through them and clear the 'provided' flag on each of them. - // This lets the scanner use them to track which has been provided and - // which have not. - RefHash2KeysTableOfEnumerator<SchemaAttDef> enumDefs(fAttDefs, false, fMemoryManager); - while (enumDefs.hasMoreElements()) - enumDefs.nextElement().setProvided(false); - - return true; -} - - void ComplexTypeInfo::checkUniqueParticleAttribution (SchemaGrammar* const pGrammar, GrammarResolver* const pGrammarResolver, XMLStringPool* const pStringPool, Modified: xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp Sat Jul 8 18:10:31 2006 @@ -121,10 +121,6 @@ void setAttWildCard(SchemaAttDef* const toAdopt); void addAttDef(SchemaAttDef* const toAdd); void addElement(SchemaElementDecl* const toAdd); - /** - * @deprecated; not thread-safe (will not work with shared grammars) - */ - void setContentModel(XMLContentModel* const newModelToAdopt); void setLocator(XSDLocator* const aLocator); /** @@ -137,16 +133,6 @@ // ----------------------------------------------------------------------- bool hasAttDefs() const; bool contains(const XMLCh* const attName); - XMLAttDef* findAttr - ( - const XMLCh* const qName - , const unsigned int uriId - , const XMLCh* const baseName - , const XMLCh* const prefix - , const XMLElementDecl::LookupOpts options - , bool& wasAdded - ) const; - bool resetDefs(); void checkUniqueParticleAttribution ( SchemaGrammar* const pGrammar @@ -506,22 +492,6 @@ fAttWildCard = toAdopt; } - -inline void -ComplexTypeInfo::setContentModel(XMLContentModel* const newModelToAdopt) -{ - delete fContentModel; - fContentModel = newModelToAdopt; - - // reset formattedModel - if (fFormattedModel) - { - fMemoryManager->deallocate(fFormattedModel); - fFormattedModel = 0; - } -} - - inline void ComplexTypeInfo::setAnonymous() { fAnonymous = true; Modified: xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.hpp Sat Jul 8 18:10:31 2006 @@ -190,9 +190,6 @@ // Setter methods // ----------------------------------------------------------------------- - //deprecated - void setIDRefList(RefHashTableOf<XMLRefInfo>* const refList); - inline void setValidationContext(ValidationContext* const); // ----------------------------------------------------------------------- @@ -270,12 +267,6 @@ inline void GeneralAttributeCheck::setValidationContext(ValidationContext* const newValidationContext) { fValidationContext = newValidationContext; -} - -inline void -GeneralAttributeCheck::setIDRefList(RefHashTableOf<XMLRefInfo>* const refList) { - - fValidationContext->setIdRefList(refList); } XERCES_CPP_NAMESPACE_END Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.hpp Sat Jul 8 18:10:31 2006 @@ -87,11 +87,6 @@ SchemaAttDef* getBaseAttDecl(); PSVIDefs::PSVIScope getPSVIScope() const; - /* - * @deprecated - */ - ComplexTypeInfo* getEnclosingCT() const; - // ----------------------------------------------------------------------- // Setter methods // ----------------------------------------------------------------------- @@ -180,11 +175,6 @@ inline ValueVectorOf<unsigned int>* SchemaAttDef::getNamespaceList() const { return fNamespaceList; -} - -inline ComplexTypeInfo* SchemaAttDef::getEnclosingCT() const -{ - return 0; } inline SchemaAttDef* SchemaAttDef::getBaseAttDecl() Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp Sat Jul 8 18:10:31 2006 @@ -55,11 +55,6 @@ // --------------------------------------------------------------------------- // SchemaAttDefList: Implementation of the virtual interface // --------------------------------------------------------------------------- -bool SchemaAttDefList::hasMoreElements() const -{ - return fEnum->hasMoreElements(); -} - bool SchemaAttDefList::isEmpty() const { @@ -110,18 +105,6 @@ //need numeric URI id to locate the attribute, that's how it was stored ThrowXMLwithMemMgr(RuntimeException, XMLExcepts::Pool_InvalidId, getMemoryManager()); return 0; -} - - -XMLAttDef& SchemaAttDefList::nextElement() -{ - return fEnum->nextElement(); -} - - -void SchemaAttDefList::Reset() -{ - fEnum->Reset(); } /** Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.hpp Sat Jul 8 18:10:31 2006 @@ -59,11 +59,6 @@ // Implementation of the virtual interface // ----------------------------------------------------------------------- - /** - * @deprecated This method is not thread-safe. - */ - virtual bool hasMoreElements() const; - virtual bool isEmpty() const; virtual XMLAttDef* findAttDef ( @@ -97,16 +92,6 @@ const unsigned long uriID , const XMLCh* const attLocalPart ) const; - - /** - * @deprecated This method is not thread-safe. - */ - virtual XMLAttDef& nextElement(); - - /** - * @deprecated This method is not thread-safe. - */ - virtual void Reset(); /** * return total number of attributes in this list Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp Sat Jul 8 18:10:31 2006 @@ -112,61 +112,6 @@ // --------------------------------------------------------------------------- // SchemaElementDecl: XMLElementDecl virtual interface implementation // --------------------------------------------------------------------------- -XMLAttDef* SchemaElementDecl::findAttr(const XMLCh* const qName - , const unsigned int uriId - , const XMLCh* const baseName - , const XMLCh* const prefix - , const LookupOpts options - , bool& wasAdded) const -{ - if (fComplexTypeInfo) { - return fComplexTypeInfo->findAttr(qName, uriId, baseName, prefix, options, wasAdded); - } - else { - if (options == XMLElementDecl::AddIfNotFound) { - SchemaAttDef* retVal = 0; - - // If no att list exist yet, then create one - if (!fAttDefs) { - // Use a hash modulus of 29 and tell it owns its elements - ((SchemaElementDecl*)this)->fAttDefs = - new (getMemoryManager()) RefHash2KeysTableOf<SchemaAttDef>(29, true, getMemoryManager()); - } - - retVal = fAttDefs->get(baseName, uriId); - - // Fault it in if not found and ask to add it - if (!retVal) - { - // And add a default attribute for this name - retVal = new (getMemoryManager()) SchemaAttDef - ( - prefix - , baseName - , uriId - , XMLAttDef::CData - , XMLAttDef::Implied - , getMemoryManager() - ); - retVal->setElemId(getId()); - fAttDefs->put((void*)retVal->getAttName()->getLocalPart(), uriId, retVal); - - wasAdded = true; - } - else - { - wasAdded = false; - } - return retVal; - } - else { - wasAdded = false; - return 0; - } - } -} - - XMLAttDefList& SchemaElementDecl::getAttDefList() const { if (!fComplexTypeInfo) @@ -214,22 +159,6 @@ // If the collection hasn't been faulted in, then no att defs return false; -} - - -bool SchemaElementDecl::resetDefs() -{ - if (fComplexTypeInfo) { - return fComplexTypeInfo->resetDefs(); - } - else if (fAttDefs) { - //all the attdefs here are faulted-in, so just reset the fAttDefs - //but still return false to indicate there is no real att defs - // defined in this element - fAttDefs->removeAll(); - } - - return false; } const XMLCh* Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp Sat Jul 8 18:10:31 2006 @@ -89,20 +89,9 @@ // ----------------------------------------------------------------------- // The virtual element decl interface // ----------------------------------------------------------------------- - virtual XMLAttDef* findAttr - ( - const XMLCh* const qName - , const unsigned int uriId - , const XMLCh* const baseName - , const XMLCh* const prefix - , const LookupOpts options - , bool& wasAdded - ) const; virtual XMLAttDefList& getAttDefList() const; virtual CharDataOpts getCharDataOpts() const; virtual bool hasAttDefs() const; - // @deprecated; not thread-safe - virtual bool resetDefs(); virtual const ContentSpecNode* getContentSpec() const; virtual ContentSpecNode* getContentSpec(); virtual void setContentSpec(ContentSpecNode* toAdopt); @@ -133,10 +122,6 @@ // ----------------------------------------------------------------------- // Setter methods // ----------------------------------------------------------------------- - /** - * @deprecated; not actually used - */ - void setElemId(unsigned int elemId); void setModelType(const SchemaElementDecl::ModelTypes toSet); void setPSVIScope(const PSVIDefs::PSVIScope toSet); void setDatatypeValidator(DatatypeValidator* newDatatypeValidator); @@ -349,13 +334,6 @@ // --------------------------------------------------------------------------- // SchemaElementDecl: Setter methods // --------------------------------------------------------------------------- -inline void -SchemaElementDecl::setElemId(unsigned int) -{ - //there is not getElemId so this is not needed. mark deprecated. - //fElemId = elemId; -} - inline void SchemaElementDecl::setModelType(const SchemaElementDecl::ModelTypes toSet) { Modified: xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp Sat Jul 8 18:10:31 2006 @@ -173,9 +173,6 @@ NamespaceScope* getNamespaceScope() const; RefHash2KeysTableOf<ElemVector>* getValidSubstitutionGroups() const; - //deprecated - RefHashTableOf<XMLRefInfo>* getIDRefList() const; - ValidationContext* getValidationContext() const; // ----------------------------------------------------------------------- @@ -390,11 +387,6 @@ SchemaGrammar::getValidSubstitutionGroups() const { return fValidSubstitutionGroups; -} - -inline RefHashTableOf<XMLRefInfo>* SchemaGrammar::getIDRefList() const { - - return fValidationContext->getIdRefList(); } inline ValidationContext* SchemaGrammar::getValidationContext() const { Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Sat Jul 8 18:10:31 2006 @@ -1159,7 +1159,7 @@ if (nameEmpty) { // anonymous simpleType name = genAnonTypeName(fgAnonSNamePrefix); } - else if (!XMLString::isValidNCName(name)) { + else if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name)) ) { reportSchemaError(childElem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_SIMPLETYPE, name); @@ -1291,7 +1291,7 @@ } } - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name)) ) { //REVISIT - Should we return or continue and save type with wrong name? reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, @@ -1530,7 +1530,7 @@ } // name must be a valid NCName - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_GROUP, name); return 0; @@ -1737,7 +1737,7 @@ else { // name must be a valid NCName - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_ATTRIBUTEGROUP, name); return 0; @@ -2280,7 +2280,7 @@ } // processing 'name' - if (!XMLString::isValidNCName(name) + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name)) || XMLString::equals(name, XMLUni::fgXMLNSString)) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_ATTRIBUTE, name); @@ -2581,7 +2581,7 @@ } // make sure that name is a valid NCName - if (!XMLString::isValidNCName(name)) + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(elem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_ELEMENT, name); @@ -4163,7 +4163,7 @@ return; } - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(icElem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_KEY, name); return; @@ -4226,7 +4226,7 @@ return; } - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(icElem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_UNIQUE, name); return; @@ -4292,7 +4292,7 @@ return; } - if (!XMLString::isValidNCName(name)) { + if (!XMLChar1_0::isValidNCName(name, XMLString::stringLen(name))) { reportSchemaError(icElem, XMLUni::fgXMLErrDomain, XMLErrs::InvalidDeclarationName, SchemaSymbols::fgELT_KEYREF, name); return; Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.cpp Sat Jul 8 18:10:31 2006 @@ -95,12 +95,6 @@ // --------------------------------------------------------------------------- // IC_Field: Factory methods // --------------------------------------------------------------------------- -XPathMatcher* IC_Field::createMatcher(ValueStore* const, - MemoryManager* const) { - - return 0; -} - XPathMatcher* IC_Field::createMatcher(FieldActivator* const fieldActivator, ValueStore* const valueStore, MemoryManager* const manager) Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.hpp Sat Jul 8 18:10:31 2006 @@ -60,19 +60,6 @@ XercesXPath* getXPath() const { return fXPath; } IdentityConstraint* getIdentityConstraint() const { return fIdentityConstraint; } - /** - * @deprecated - */ - bool getMayMatch() const { return false; } - - // ----------------------------------------------------------------------- - // Setter methods - // ----------------------------------------------------------------------- - /** - * @deprecated - */ - void setMayMatch(const bool) {} - // ----------------------------------------------------------------------- // Factory methods // ----------------------------------------------------------------------- @@ -82,12 +69,6 @@ , ValueStore* const valueStore , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager ); - - /** - * @deprecated - */ - XPathMatcher* createMatcher(ValueStore* const valueStore, - MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager); /*** * Support for Serialization/De-serialization Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp Sat Jul 8 18:10:31 2006 @@ -47,7 +47,7 @@ , fScanner(scanner) , fMemoryManager(manager) { - fDoReportError = (scanner && scanner->getDoValidation()); + fDoReportError = (scanner && (scanner->getValidationScheme() == XMLScanner::Val_Always)); } @@ -59,12 +59,6 @@ // --------------------------------------------------------------------------- // ValueStore: Helper methods // --------------------------------------------------------------------------- -void ValueStore::addValue(IC_Field* const, - DatatypeValidator* const, - const XMLCh* const) { - -} - void ValueStore::addValue(FieldActivator* const fieldActivator, IC_Field* const field, DatatypeValidator* const dv, Modified: xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.hpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.hpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.hpp (original) +++ xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.hpp Sat Jul 8 18:10:31 2006 @@ -72,13 +72,6 @@ const XMLCh* const value); bool contains(const FieldValueMap* const other); - /** - * @deprecated - */ - void addValue(IC_Field* const field, DatatypeValidator* const dv, - const XMLCh* const value); - - // ----------------------------------------------------------------------- // Document handling methods // ----------------------------------------------------------------------- Modified: xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp?rev=420236&r1=420235&r2=420236&view=diff ============================================================================== --- xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp (original) +++ xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp Sat Jul 8 18:10:31 2006 @@ -121,7 +121,7 @@ ParseErrorHandler eh; if (!parser) parser = new XercesDOMParser; - parser->setDoValidation(false); + parser->setValidationScheme(AbstractDOMParser::Val_Never); parser->setErrorHandler(&eh); try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
