You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2006/07/09 03:10:34 UTC
svn commit: r420236 [1/2] - in /xerces/c/trunk: samples/src/SCMPrint/
src/xercesc/framework/ src/xercesc/internal/ src/xercesc/parsers/
src/xercesc/sax2/ src/xercesc/util/ src/xercesc/validators/DTD/
src/xercesc/validators/datatype/ src/xercesc/validat...
Author: cargilld
Date: Sat Jul 8 18:10:31 2006
New Revision: 420236
URL: http://svn.apache.org/viewvc?rev=420236&view=rev
Log:
Remove deprecated methods
Modified:
xerces/c/trunk/samples/src/SCMPrint/SCMPrint.cpp
xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp
xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp
xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp
xerces/c/trunk/src/xercesc/framework/XMLAttr.cpp
xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp
xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp
xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp
xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp
xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp
xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp
xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp
xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
xerces/c/trunk/src/xercesc/sax2/SAX2XMLReader.hpp
xerces/c/trunk/src/xercesc/util/Base64.cpp
xerces/c/trunk/src/xercesc/util/Base64.hpp
xerces/c/trunk/src/xercesc/util/HexBin.cpp
xerces/c/trunk/src/xercesc/util/HexBin.hpp
xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.cpp
xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.hpp
xerces/c/trunk/src/xercesc/util/XMLBigDecimal.hpp
xerces/c/trunk/src/xercesc/util/XMLBigInteger.hpp
xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp
xerces/c/trunk/src/xercesc/util/XMLDateTime.hpp
xerces/c/trunk/src/xercesc/util/XMLMsgLoader.cpp
xerces/c/trunk/src/xercesc/util/XMLMsgLoader.hpp
xerces/c/trunk/src/xercesc/util/XMLNumber.hpp
xerces/c/trunk/src/xercesc/util/XMLString.cpp
xerces/c/trunk/src/xercesc/util/XMLString.hpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.hpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.cpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.hpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.cpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.hpp
xerces/c/trunk/src/xercesc/validators/DTD/DTDScanner.cpp
xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/ENTITYDatatypeValidator.hpp
xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/IDDatatypeValidator.hpp
xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/IDREFDatatypeValidator.hpp
xerces/c/trunk/src/xercesc/validators/datatype/NCNameDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/NameDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/datatype/QNameDatatypeValidator.cpp
xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.cpp
xerces/c/trunk/src/xercesc/validators/schema/ComplexTypeInfo.hpp
xerces/c/trunk/src/xercesc/validators/schema/GeneralAttributeCheck.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDef.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaAttDefList.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.cpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaElementDecl.hpp
xerces/c/trunk/src/xercesc/validators/schema/SchemaGrammar.hpp
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/IC_Field.hpp
xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.cpp
xerces/c/trunk/src/xercesc/validators/schema/identity/ValueStore.hpp
xerces/c/trunk/tests/src/EncodingTest/EncodingTest.cpp
Modified: xerces/c/trunk/samples/src/SCMPrint/SCMPrint.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/SCMPrint/SCMPrint.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/samples/src/SCMPrint/SCMPrint.cpp (original)
+++ xerces/c/trunk/samples/src/SCMPrint/SCMPrint.cpp Sat Jul 8 18:10:31 2006
@@ -333,8 +333,8 @@
if (parsedOneSchemaOkay)
{
XERCES_STD_QUALIFIER cout << "********** Printing out information from Schema **********" << "\n\n";
-
- XSModel *xsModel = grammarPool->getXSModel();
+ bool updatedXSModel;
+ XSModel *xsModel = grammarPool->getXSModel(updatedXSModel);
if (xsModel)
{
StringList *namespaces = xsModel->getNamespaces();
Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDef.cpp Sat Jul 8 18:10:31 2006
@@ -120,8 +120,7 @@
fDefaultType(defType)
, fType(type)
- , fCreateReason(XMLAttDef::NoReason)
- , fProvided(false)
+ , fCreateReason(XMLAttDef::NoReason)
, fExternalAttribute(false)
, fId(XMLAttDef::fgInvalidAttrId)
, fValue(0)
@@ -140,8 +139,7 @@
fDefaultType(defType)
, fType(type)
- , fCreateReason(XMLAttDef::NoReason)
- , fProvided(false)
+ , fCreateReason(XMLAttDef::NoReason)
, fExternalAttribute(false)
, fId(XMLAttDef::fgInvalidAttrId)
, fValue(0)
@@ -191,8 +189,7 @@
{
serEng<<(int)fDefaultType;
serEng<<(int)fType;
- serEng<<(int)fCreateReason;
- serEng<<fProvided;
+ serEng<<(int)fCreateReason;
serEng<<fExternalAttribute;
serEng<<fId;
@@ -210,8 +207,7 @@
serEng>>i;
fCreateReason = (CreateReasons)i;
-
- serEng>>fProvided;
+
serEng>>fExternalAttribute;
serEng>>fId;
Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDef.hpp Sat Jul 8 18:10:31 2006
@@ -234,22 +234,6 @@
*/
unsigned int getId() const;
- /** Query whether the attribute was explicitly provided.
- *
- * When the scanner scans a start tag, it will ask the element decl
- * object of the element type of that start tag to clear the 'provided'
- * flag on all its attributes. As the scanner sees explicitly provided
- * attributes, its turns on this flag to indicate that this attribute
- * has been provided. In this way, the scanner can catch duplicated
- * attributes and required attributes that aren't provided, and default
- * in fixed/default valued attributes that are not explicitly provided.
- *
- * @return Returns a boolean value that indicates whether this attribute
- * was explicitly provided.
- * @deprecated
- */
- bool getProvided() const;
-
/** Get the type of this attribute
*
* Gets the type of this attribute. This type is represented by an enum
@@ -330,17 +314,6 @@
*/
void setId(const unsigned int newId);
- /** Set or clear the 'provided' flag.
- *
- * This method will set or clear the 'provided' flag. This is called
- * by the scanner as it is scanning a start tag and marking off the
- * attributes that have been explicitly provided.
- *
- * @param newValue The new provided state to set
- * @deprecated
- */
- void setProvided(const bool newValue);
-
/** Set the type of this attribute type.
*
* This method will set the type of the attribute. The type of an attribute
@@ -446,12 +419,6 @@
// into the validator's attribute decl pool. It defaults to the
// special value XMLAttrDef::fgInvalidAttrId.
//
- // fProvided
- // This field is really for use by the scanner. It is used to track
- // which of the attributes of an element were provided. Any marked
- // as not provided (after scanning the start tag) and having a
- // default type of Required, is in error.
- //
// fType
// The type of attribute, which is one of the AttTypes values.
//
@@ -469,8 +436,7 @@
// -----------------------------------------------------------------------
DefAttTypes fDefaultType;
AttTypes fType;
- CreateReasons fCreateReason;
- bool fProvided;
+ CreateReasons fCreateReason;
bool fExternalAttribute;
unsigned int fId;
XMLCh* fValue;
@@ -497,11 +463,6 @@
return fId;
}
-inline bool XMLAttDef::getProvided() const
-{
- return fProvided;
-}
-
inline XMLAttDef::AttTypes XMLAttDef::getType() const
{
return fType;
@@ -546,11 +507,6 @@
inline void XMLAttDef::setId(const unsigned int newId)
{
fId = newId;
-}
-
-inline void XMLAttDef::setProvided(const bool newValue)
-{
- fProvided = newValue;
}
inline void XMLAttDef::setType(const XMLAttDef::AttTypes newValue)
Modified: xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttDefList.hpp Sat Jul 8 18:10:31 2006
@@ -63,10 +63,6 @@
// The virtual interface
// -----------------------------------------------------------------------
- /**
- * @deprecated This method is not thread-safe.
- */
- virtual bool hasMoreElements() const = 0;
virtual bool isEmpty() const = 0;
virtual XMLAttDef* findAttDef
(
@@ -88,16 +84,6 @@
const XMLCh* const attURI
, const XMLCh* const attName
) const = 0;
-
- /**
- * @deprecated This method is not thread-safe.
- */
- virtual XMLAttDef& nextElement() = 0;
-
- /**
- * @deprecated This method is not thread-safe.
- */
- virtual void Reset() = 0;
/**
* return total number of attributes in this list
Modified: xerces/c/trunk/src/xercesc/framework/XMLAttr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttr.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttr.cpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttr.cpp Sat Jul 8 18:10:31 2006
@@ -38,9 +38,7 @@
, fValueBufSz(0)
, fValue(0)
, fAttName(0)
- , fMemoryManager(manager)
- , fDatatypeValidator(0)
- , fIsSchemaValidated(false)
+ , fMemoryManager(manager)
{
fAttName = new (fMemoryManager) QName(fMemoryManager);
}
@@ -62,9 +60,7 @@
, fValueBufSz(0)
, fValue(0)
, fAttName(0)
- , fMemoryManager(manager)
- , fDatatypeValidator(datatypeValidator)
- , fIsSchemaValidated(isSchema)
+ , fMemoryManager(manager)
{
CleanupType cleanup(this, &XMLAttr::cleanUp);
@@ -101,9 +97,7 @@
, fValueBufSz(0)
, fValue(0)
, fAttName(0)
- , fMemoryManager(manager)
- , fDatatypeValidator(datatypeValidator)
- , fIsSchemaValidated(isSchema)
+ , fMemoryManager(manager)
{
CleanupType cleanup(this, &XMLAttr::cleanUp);
Modified: xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLAttr.hpp Sat Jul 8 18:10:31 2006
@@ -216,18 +216,6 @@
*/
unsigned int getURIId() const;
- /**
- * @return the uri part of DOM Level 3 TypeInfo
- * @deprecated
- */
- const XMLCh* getValidatingTypeURI() const;
-
- /**
- * @return the name part of DOM Level 3 TypeInfo
- * @deprecated
- */
- const XMLCh* getValidatingTypeName() const;
-
//@}
@@ -368,24 +356,6 @@
*/
void setURIId(const unsigned int uriId);
- /**
- * This method will update the datatype validator that was used
- * to assess the validity of the value of this attribute.
- * @param datatypeValidator DatatypeValidator used to assess the validity
- * of this attribute's value
- * @deprecated
- */
- void setDatatypeValidator(DatatypeValidator * datatypeValidator);
-
- /**
- * This method will define whether the attribute was
- * validated by an XML Schema
- * @param isSchema true indicates that this attribute was validated
- * by an XML Schema; false indicates otherwise
- * @deprecated
- */
- void setSchemaValidated(const bool isSchema);
-
//@}
@@ -425,22 +395,13 @@
//
// fMemoryManager
// The memory manager used for dynamic memory allocation/deallocation
- // fDatatypeValidator
- // The validator used to validate the value of this attribute.
- // The attribute does not own this object, and it is only
- // used in the calculation of DOMTypeInfo information.
- // fIsSchemaValidated
- // whether this attribute was validated by an XML Schema
- //
// -----------------------------------------------------------------------
bool fSpecified;
XMLAttDef::AttTypes fType;
unsigned int fValueBufSz;
XMLCh* fValue;
QName* fAttName;
- MemoryManager* fMemoryManager;
- DatatypeValidator * fDatatypeValidator;
- bool fIsSchemaValidated;
+ MemoryManager* fMemoryManager;
};
// ---------------------------------------------------------------------------
@@ -490,34 +451,6 @@
return fAttName->getURI();
}
-inline const XMLCh* XMLAttr::getValidatingTypeName() const
-{
- if(fIsSchemaValidated)
- {
- if(!fDatatypeValidator || fDatatypeValidator->getAnonymous())
- return 0;
- return fDatatypeValidator->getTypeLocalName();
- }
- else
- {
- return XMLAttDef::getAttTypeString(fType, fMemoryManager);
- }
-}
-
-inline const XMLCh* XMLAttr::getValidatingTypeURI() const
-{
- if(fIsSchemaValidated)
- {
- if(!fDatatypeValidator || fDatatypeValidator->getAnonymous())
- return 0;
- return fDatatypeValidator->getTypeUri();
- }
- else
- {
- return 0;
- }
-}
-
// ---------------------------------------------------------------------------
// XMLAttr: Setter methods
// ---------------------------------------------------------------------------
@@ -535,10 +468,6 @@
// And store the type
fType = type;
-
- // and set up info for DOM type info
- fIsSchemaValidated = isSchema;
- fDatatypeValidator = datatypeValidator;
}
inline void XMLAttr::set(const unsigned int uriId
@@ -554,10 +483,6 @@
// And store the type
fType = type;
-
- // and set up info for DOM type info
- fIsSchemaValidated = isSchema;
- fDatatypeValidator = datatypeValidator;
}
inline void XMLAttr::setType(const XMLAttDef::AttTypes newValue)
@@ -568,16 +493,6 @@
inline void XMLAttr::setSpecified(const bool newValue)
{
fSpecified = newValue;
-}
-
-inline void XMLAttr::setDatatypeValidator(DatatypeValidator *datatypeValidator)
-{
- fDatatypeValidator = datatypeValidator;
-}
-
-inline void XMLAttr::setSchemaValidated(const bool isSchema)
-{
- fIsSchemaValidated = isSchema;
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLDocumentHandler.hpp Sat Jul 8 18:10:31 2006
@@ -257,30 +257,6 @@
, const XMLCh* const autoEncodingStr
) = 0;
- /** Receive notification of the name and namespace of the type that validated
- * the element corresponding to the most recent endElement event.
- * This event will be fired immediately after the
- * endElement() event that signifies the end of the element
- * to which it applies; no other events will intervene.
- * This method is <em>EXPERIMENTAL</em> and may change, disappear
- * or become pure virtual at any time.
- *
- * This corresponds to a part of the information required by DOM Core
- * level 3's TypeInfo interface.
- *
- * @param typeName local name of the type that actually validated
- * the content of the element corresponding to the
- * most recent endElement() callback
- * @param typeURI namespace of the type that actually validated
- * the content of the element corresponding to the
- * most recent endElement() callback
- * @deprecated
- */
- virtual void elementTypeInfo
- (
- const XMLCh* const typeName
- , const XMLCh* const typeURI
- );
//@}
@@ -301,11 +277,6 @@
XMLDocumentHandler(const XMLDocumentHandler&);
XMLDocumentHandler& operator=(const XMLDocumentHandler&);
};
-
-inline void XMLDocumentHandler::elementTypeInfo(const XMLCh* const /*typeName*/, const XMLCh* const /*typeURI*/)
-{
- /* non pure virtual to permit backward compatibility of implementations. */
-}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLElementDecl.hpp Sat Jul 8 18:10:31 2006
@@ -75,16 +75,6 @@
, JustFaultIn
};
- /**
- * @deprecated Use of addIfNotFound couldl produce undefined
- * behaviour in multithreaded environments.
- */
- enum LookupOpts
- {
- AddIfNotFound
- , FailIfNotFound
- };
-
enum CharDataOpts
{
NoCharData
@@ -129,46 +119,6 @@
/** @name Virual ElementDecl interface */
//@{
- /** Find an attribute by name or optionally fault it in.
- *
- * The derived class should look up the passed attribute in the list of
- * of attributes for this element. If namespaces are enabled, then it
- * should use the uriId/baseName pair, else it should use the qName. The
- * options allow the caller to indicate whether the attribute should be
- * defaulted in if not found. If it is defaulted in, then wasAdded should
- * be set, else it should be cleared. If its not found and the caller does
- * not want defaulting, then return a null pointer.
- * Note that, in a multithreaded environment, it is dangerous for a
- * caller to invoke this method with options set to AddIfNotFound.
- *
- * @param qName This is the qName of the attribute, i.e. the actual
- * lexical name found.
- *
- * @param uriId This is the id of the URI of the namespace to which
- * this attribute mapped. Only valid if namespaces are
- * enabled.
- *
- * @param baseName This is the base part of the name, i.e. after any
- * prefix.
- *
- * @param prefix The prefix, if any, of this attribute's name. If
- * this is empty, then uriID is meaningless as well.
- *
- * @param options Indicates the lookup options.
- *
- * @param wasAdded Should be set if the attribute is faulted in, else
- * cleared.
- */
- 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 = 0;
-
/** Get a list of attributes defined for this element.
*
* The derived class should return a reference to some member object which
@@ -198,15 +148,6 @@
* that allows the scanner to skip some work if no attributes exist.
*/
virtual bool hasAttDefs() const = 0;
-
- /** Reset the flags on the attribute definitions.
- *
- * This method is called by the scanner at the beginning of each scan
- * of a start tag, asking this element decl to reset the 'declared' flag
- * of each of its attribute defs. This allows the scanner to mark each
- * one as declared yet or not.
- */
- virtual bool resetDefs() = 0;
/** Get a pointer to the content spec node
*
Modified: xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLGrammarPool.hpp Sat Jul 8 18:10:31 2006
@@ -173,21 +173,6 @@
/***
* Return an XSModel derived from the components of all SchemaGrammars
* in the grammar pool. If the pool is locked, this should
- * be a thread-safe operation. It should return null if and only if
- * the pool is empty.
- *
- * Calling getXSModel() on an unlocked grammar pool may result in the
- * creation of a new XSModel with the old XSModel being deleted. The
- * function will return a different address for the XSModel if it has
- * changed.
- *
- * @deprecated (shouldn't use address to determine if XSModel changed)
- */
- virtual XSModel *getXSModel() = 0;
-
- /***
- * Return an XSModel derived from the components of all SchemaGrammars
- * in the grammar pool. If the pool is locked, this should
* be a thread-safe operation.
*
* NOTE: The function should NEVER return NULL. If there are no grammars in
@@ -197,14 +182,8 @@
* creation of a new XSModel with the old XSModel being deleted.
* The bool parameter will indicate if the XSModel was changed.
*
- * For source code compatibility, default implementation is to say
- * XSModelWasChanged.
*/
- virtual XSModel *getXSModel(bool& XSModelWasChanged)
- {
- XSModelWasChanged = true;
- return getXSModel();
- }
+ virtual XSModel *getXSModel(bool& XSModelWasChanged) = 0;
// @}
Modified: xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLValidator.hpp Sat Jul 8 18:10:31 2006
@@ -319,21 +319,6 @@
//@}
// -----------------------------------------------------------------------
- // Deprecated XMLValidator interface
- // -----------------------------------------------------------------------
- /**
- *
- * DEPRECATED.
- * For those validators that contrain the possible root elements of a
- * document to only particular elements, they should use this call to
- * validate that the passed root element id is a legal root element.
- */
- bool checkRootElement
- (
- const unsigned int
- ) { return true;};
-
- // -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
static void reinitMsgMutex();
Modified: xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/DGXMLScanner.cpp Sat Jul 8 18:10:31 2006
@@ -811,10 +811,7 @@
rootDecl->setExternalElemDeclaration(true);
if(!fUseCachedGrammar)
{
- // this will break getRootElemId on DTDGrammar when
- // cached grammars are in use, but
- // why would one use this anyway???
- ((DTDGrammar*)fGrammar)->setRootElemId(fGrammar->putElemDecl(rootDecl));
+ fGrammar->putElemDecl(rootDecl);
rootDeclJanitor.release();
} else
{
@@ -1165,11 +1162,6 @@
{
// If a DocType exists, then check if it matches the root name there.
if (fRootElemName && !XMLString::equals(qnameRawBuf, fRootElemName))
- fValidator->emitError(XMLValid::RootElemNotLikeDocType);
-
- // Some validators may also want to check the root, call the
- // XMLValidator::checkRootElement
- if (fValidatorFromUser && !fValidator->checkRootElement(elemDecl->getId()))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
}
}
Modified: xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/IGXMLScanner.cpp Sat Jul 8 18:10:31 2006
@@ -1293,11 +1293,8 @@
rootDecl->setCreateReason(DTDElementDecl::AsRootElem);
rootDecl->setExternalElemDeclaration(true);
if(!fUseCachedGrammar)
- {
- // this will break getRootElemId on DTDGrammar when
- // cached grammars are in use, but
- // why would one use this anyway???
- ((DTDGrammar*)fGrammar)->setRootElemId(fGrammar->putElemDecl(rootDecl));
+ {
+ fGrammar->putElemDecl(rootDecl);
rootDeclJanitor.release();
} else
{
@@ -1653,11 +1650,6 @@
// If a DocType exists, then check if it matches the root name there.
if (fRootElemName && !XMLString::equals(fQNameBuf.getRawBuffer(), fRootElemName))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
-
- // Some validators may also want to check the root, call the
- // XMLValidator::checkRootElement
- if (fValidatorFromUser && !fValidator->checkRootElement(elemDecl->getId()))
- fValidator->emitError(XMLValid::RootElemNotLikeDocType);
}
}
else
@@ -2559,11 +2551,6 @@
{
// If a DocType exists, then check if it matches the root name there.
if (fRootElemName && !XMLString::equals(qnameRawBuf, fRootElemName))
- fValidator->emitError(XMLValid::RootElemNotLikeDocType);
-
- // Some validators may also want to check the root, call the
- // XMLValidator::checkRootElement
- if (fValidatorFromUser && !fValidator->checkRootElement(elemDecl->getId()))
fValidator->emitError(XMLValid::RootElemNotLikeDocType);
}
}
Modified: xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/SGXMLScanner.cpp Sat Jul 8 18:10:31 2006
@@ -1551,18 +1551,7 @@
// If this is the first element and we are validating, check the root
// element.
- if (isRoot)
- {
- if (fValidate)
- {
- // Some validators may also want to check the root, call the
- // XMLValidator::checkRootElement
- if (fValidatorFromUser && !fValidator->checkRootElement(elemDecl->getId())) {
- fValidator->emitError(XMLValid::RootElemNotLikeDocType);
- }
- }
- }
- else if (parentValidation)
+ if (!isRoot && parentValidation)
{
// If the element stack is not empty, then add this element as a
// child of the previous top element. If its empty, this is the root
Modified: xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.cpp Sat Jul 8 18:10:31 2006
@@ -203,18 +203,6 @@
return new (getMemoryManager()) XMLSchemaDescriptionImpl(targetNamespace, getMemoryManager());
}
-XSModel *XMLGrammarPoolImpl::getXSModel()
-{
- if (fLocked)
- return fXSModel;
-
- if (fXSModelIsValid)
- return fXSModel;
-
- createXSModel();
- return fXSModel;
-}
-
XSModel *XMLGrammarPoolImpl::getXSModel(bool& XSModelWasChanged)
{
XSModelWasChanged = false;
Modified: xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLGrammarPoolImpl.hpp Sat Jul 8 18:10:31 2006
@@ -154,30 +154,6 @@
/***
* Return an XSModel derived from the components of all SchemaGrammars
* in the grammar pool. If the pool is locked, this should
- * be a thread-safe operation. It should return null if and only if
- * the pool is empty.
- *
- * Calling getXSModel() on an unlocked grammar pool may result in the
- * creation of a new XSModel with the old XSModel being deleted. The
- * function will return a different address for the XSModel if it has
- * changed.
- *
- * In this implementation, when the pool is not locked a new XSModel will be
- * computed each this time the pool is called if the pool has changed (and the
- * previous one will be destroyed at that time). When the lockPool()
- * method is called, an XSModel will be generated and returned whenever this method is called
- * while the pool is in the locked state. This will be destroyed if the unlockPool()
- * operation is called. The XSModel will not be serialized,
- * but will be recreated if a deserialized pool is in the
- * locked state.
- *
- * @deprecated (shouldn't use address to determine if XSModel changed)
- */
- virtual XSModel *getXSModel();
-
- /***
- * Return an XSModel derived from the components of all SchemaGrammars
- * in the grammar pool. If the pool is locked, this should
* be a thread-safe operation.
*
* NOTE: The function should NEVER return NULL. If there are no grammars in
Modified: xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLScanner.hpp Sat Jul 8 18:10:31 2006
@@ -391,13 +391,6 @@
void incrementErrorCount(void); // For use by XMLValidator
// -----------------------------------------------------------------------
- // Deprecated methods as of 3.2.0. Use getValidationScheme() and
- // setValidationScheme() instead.
- // -----------------------------------------------------------------------
- bool getDoValidation() const;
- void setDoValidation(const bool validate);
-
- // -----------------------------------------------------------------------
// Document scanning methods
//
// scanDocument() does the entire source document. scanFirst(),
@@ -1328,23 +1321,6 @@
inline void XMLScanner::incrementErrorCount()
{
++fErrorCount;
-}
-
-// ---------------------------------------------------------------------------
-// XMLScanner: Deprecated methods
-// ---------------------------------------------------------------------------
-inline bool XMLScanner::getDoValidation() const
-{
- return fValidate;
-}
-
-inline void XMLScanner::setDoValidation(const bool validate)
-{
- fValidate = validate;
- if (fValidate)
- fValScheme = Val_Always;
- else
- fValScheme = Val_Never;
}
inline void XMLScanner::resetValidationContext()
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.cpp Sat Jul 8 18:10:31 2006
@@ -142,57 +142,6 @@
}
-// ---------------------------------------------------------------------------
-// Deprecated Constructor
-// ---------------------------------------------------------------------------
-XSerializeEngine::XSerializeEngine(BinInputStream* inStream
- , MemoryManager* const manager
- , unsigned long bufSize)
-:fStoreLoad(mode_Load)
-,fStorerLevel(0)
-,fGrammarPool(0)
-,fInputStream(inStream)
-,fOutputStream(0)
-,fBufCount(0)
-,fBufSize(bufSize)
-,fBufStart( (XMLByte*) manager->allocate(bufSize))
-,fBufEnd(0)
-,fBufCur(fBufStart)
-,fBufLoadMax(fBufStart)
-,fStorePool(0)
-,fLoadPool( new (manager) ValueVectorOf<void*>(29, manager, false))
-,fObjectCount(0)
-{
- /***
- * initialize buffer from the inStream
- ***/
- fillBuffer();
-
-}
-
-XSerializeEngine::XSerializeEngine(BinOutputStream* outStream
- , MemoryManager* const manager
- , unsigned long bufSize)
-:fStoreLoad(mode_Store)
-,fStorerLevel(0)
-,fGrammarPool(0)
-,fInputStream(0)
-,fOutputStream(outStream)
-,fBufCount(0)
-,fBufSize(bufSize)
-,fBufStart((XMLByte*) manager->allocate(bufSize))
-,fBufEnd(fBufStart+bufSize)
-,fBufCur(fBufStart)
-,fBufLoadMax(0)
-,fStorePool( new (manager) RefHashTableOf<XSerializedObjectId>(29, true, new (manager) HashPtr(), manager) )
-,fLoadPool(0)
-,fObjectCount(0)
-{
- //initialize store pool
- fStorePool->put(0, new (manager) XSerializedObjectId(fgNullObjectTag));
-
-}
-
void XSerializeEngine::flush()
{
if (isStoring())
Modified: xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XSerializeEngine.hpp Sat Jul 8 18:10:31 2006
@@ -94,49 +94,7 @@
***/
XSerializeEngine(BinOutputStream* outStream
, XMLGrammarPool* const gramPool
- , unsigned long bufSize = 8192 );
-
-
- /***
- *
- * Deprecated
- *
- * Constructor for de-serialization(loading)
- *
- * Application needs to make sure that the instance of
- * BinInputStream, persists beyond the life of this
- * SerializeEngine.
- *
- * Param
- * inStream input stream
- * manager MemoryManager
- * bufSize the size of the internal buffer
- *
- ***/
- XSerializeEngine(BinInputStream* inStream
- , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , unsigned long bufSize = 8192 );
-
-
- /***
- *
- * Deprecated
- *
- * Constructor for serialization(storing)
- *
- * Application needs to make sure that the instance of
- * BinOutputStream, persists beyond the life of this
- * SerializeEngine.
- *
- * Param
- * outStream output stream
- * manager MemoryManager
- * bufSize the size of the internal buffer
- *
- ***/
- XSerializeEngine(BinOutputStream* outStream
- , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- , unsigned long bufSize = 8192 );
+ , unsigned long bufSize = 8192 );
/***
*
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.cpp Sat Jul 8 18:10:31 2006
@@ -827,11 +827,6 @@
fWithinElement = false;
}
-void AbstractDOMParser::elementTypeInfo( const XMLCh * const /*typeName*/
- , const XMLCh * const /*typeURI*/)
-{
-}
-
void AbstractDOMParser::ignorableWhitespace( const XMLCh* const chars
, const unsigned int length
@@ -1161,30 +1156,7 @@
{
return fDocument->createElementNS(namespaceURI, qualifiedName);
}
-// ---------------------------------------------------------------------------
-// AbstractDOMParser: Deprecated methods
-// ---------------------------------------------------------------------------
-bool AbstractDOMParser::getDoValidation() const
-{
- //
- // We don't want to tie the public parser classes to the enum used
- // by the scanner, so we use a separate one and map.
- //
- // DON'T mix the new and old methods!!
- //
- const XMLScanner::ValSchemes scheme = fScanner->getValidationScheme();
- if (scheme == XMLScanner::Val_Always)
- return true;
- return false;
-}
-void AbstractDOMParser::setDoValidation(const bool newState)
-{
- fScanner->setDoValidation
- (
- newState ? XMLScanner::Val_Always : XMLScanner::Val_Never
- );
-}
//doctypehandler interfaces
void AbstractDOMParser::attDef
Modified: xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/AbstractDOMParser.hpp Sat Jul 8 18:10:31 2006
@@ -1344,30 +1344,6 @@
, const XMLCh* const actualEncStr
);
- /** Receive notification of the name and namespace of the type that validated
- * the element corresponding to the most recent endElement event.
- * This event will be fired immediately after the
- * endElement() event that signifies the end of the element
- * to which it applies; no other events will intervene.
- * This method is <em>EXPERIMENTAL</em> and may change, disappear
- * or become pure virtual at any time.
- *
- * This corresponds to a part of the information required by DOM Core
- * level 3's TypeInfo interface.
- *
- * @param typeName local name of the type that actually validated
- * the content of the element corresponding to the
- * most recent endElement() callback
- * @param typeURI namespace of the type that actually validated
- * the content of the element corresponding to the
- * most recent endElement() callback
- * @deprecated
- */
- virtual void elementTypeInfo
- (
- const XMLCh* const typeName
- , const XMLCh* const typeURI
- );
//@}
@@ -1454,75 +1430,6 @@
, const XMLCh* const encodingStr
);
-
- //@}
-
-
- // -----------------------------------------------------------------------
- // Deprecated Methods
- // -----------------------------------------------------------------------
- /** @name Deprecated Methods */
- //@{
- /**
- * This method returns the state of the parser's validation
- * handling flag which controls whether validation checks
- * are enforced or not.
- *
- * @return true, if the parser is currently configured to
- * do validation, false otherwise.
- *
- * @see #setDoValidation
- */
- bool getDoValidation() const;
-
- /**
- * This method allows users to enable or disable the parser's validation
- * checks.
- *
- * <p>By default, the parser does not to any validation. The default
- * value is false.</p>
- *
- * @param newState The value specifying whether the parser should
- * do validity checks or not against the DTD in the
- * input XML document.
- *
- * @see #getDoValidation
- */
- void setDoValidation(const bool newState);
-
- /** Get the 'expand entity references' flag.
- * DEPRECATED Use getCreateEntityReferenceNodes() instead.
- *
- * This method returns the state of the parser's expand entity
- * references flag.
- *
- * @return 'true' if the expand entity reference flag is set on
- * the parser, 'false' otherwise.
- *
- * @see #setExpandEntityReferences
- * @see #setCreateEntityReferenceNodes
- * @see #getCreateEntityReferenceNodes
- */
- bool getExpandEntityReferences() const;
-
- /** Set the 'expand entity references' flag
- *
- * DEPRECATED. USE setCreateEntityReferenceNodes instead.
- * This method allows the user to specify whether the parser should
- * expand all entity reference nodes. When the 'do expansion' flag is
- * true, the DOM tree does not have any entity reference nodes. It is
- * replaced by the sub-tree representing the replacement text of the
- * entity. When the 'do expansion' flag is false, the DOM tree
- * contains an extra entity reference node, whose children is the
- * sub tree of the replacement text.
- * <p>The default value is 'false'.
- *
- * @param expand The new state of the expand entity reference
- * flag.
- * @see #setCreateEntityReferenceNodes
- */
- void setExpandEntityReferences(const bool expand);
-
//@}
protected :
@@ -1761,10 +1668,6 @@
// ---------------------------------------------------------------------------
// AbstractDOMParser: Getter methods
// ---------------------------------------------------------------------------
-inline bool AbstractDOMParser::getExpandEntityReferences() const
-{
- return !fCreateEntityReferenceNodes;
-}
inline bool AbstractDOMParser::getCreateEntityReferenceNodes() const
{
return fCreateEntityReferenceNodes;
@@ -1812,11 +1715,6 @@
// ---------------------------------------------------------------------------
// AbstractDOMParser: Setter methods
// ---------------------------------------------------------------------------
-inline void AbstractDOMParser::setExpandEntityReferences(const bool expand)
-{
- fCreateEntityReferenceNodes = !expand;
-}
-
inline void AbstractDOMParser::setCreateEntityReferenceNodes(const bool create)
{
fCreateEntityReferenceNodes = create;
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLFilterImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLFilterImpl.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLFilterImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLFilterImpl.hpp Sat Jul 8 18:10:31 2006
@@ -209,8 +209,7 @@
* <br>http://apache.org/xml/features/validation/schema-full-checking (default: false)
* <br>http://apache.org/xml/features/nonvalidating/load-external-dtd (default: true)
* <br>http://apache.org/xml/features/continue-after-fatal-error (default: false)
- * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
- * <br>http://apache.org/xml/features/validation/reuse-validator (Deprecated) (default: false)
+ * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
*
* @param name The unique identifier (URI) of the feature.
* @param value The requested state of the feature (true or false).
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Sat Jul 8 18:10:31 2006
@@ -279,8 +279,7 @@
* <br>http://apache.org/xml/features/validation/schema-full-checking (default: false)
* <br>http://apache.org/xml/features/nonvalidating/load-external-dtd (default: true)
* <br>http://apache.org/xml/features/continue-after-fatal-error (default: false)
- * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
- * <br>http://apache.org/xml/features/validation/reuse-validator (Deprecated) (default: false)
+ * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
*
* @param name The unique identifier (URI) of the feature.
* @param value The requested state of the feature (true or false).
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Sat Jul 8 18:10:31 2006
@@ -1226,33 +1226,6 @@
}
-
-// ---------------------------------------------------------------------------
-// SAXParser: Deprecated methods
-// ---------------------------------------------------------------------------
-bool SAXParser::getDoValidation() const
-{
- //
- // We don't want to tie the public parser classes to the enum used
- // by the scanner, so we use a separate one and map.
- //
- // DON'T mix the new and old methods!!
- //
- const XMLScanner::ValSchemes scheme = fScanner->getValidationScheme();
- if (scheme == XMLScanner::Val_Always)
- return true;
- return false;
-}
-
-void SAXParser::setDoValidation(const bool newState)
-{
- fScanner->setDoValidation
- (
- newState ? XMLScanner::Val_Always : XMLScanner::Val_Never
- );
-}
-
-
// ---------------------------------------------------------------------------
// SAXParser: Grammar preparsing methods
// ---------------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp Sat Jul 8 18:10:31 2006
@@ -1947,41 +1947,6 @@
);
//@}
-
- // -----------------------------------------------------------------------
- // Deprecated Methods
- // -----------------------------------------------------------------------
- /** @name Deprecated Methods */
- //@{
- /**
- * This method returns the state of the parser's validation
- * handling flag which controls whether validation checks
- * are enforced or not.
- *
- * @return true, if the parser is currently configured to
- * do validation, false otherwise.
- *
- * @see #setDoValidation
- */
- bool getDoValidation() const;
-
- /**
- * This method allows users to enable or disable the parser's validation
- * checks.
- *
- * <p>By default, the parser does not to any validation. The default
- * value is false.</p>
- *
- * @param newState The value specifying whether the parser should
- * do validity checks or not against the DTD in the
- * input XML document.
- *
- * @see #getDoValidation
- */
- void setDoValidation(const bool newState);
- //@}
-
-
protected :
// -----------------------------------------------------------------------
// Protected Methods
Modified: xerces/c/trunk/src/xercesc/sax2/SAX2XMLReader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/sax2/SAX2XMLReader.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/sax2/SAX2XMLReader.hpp (original)
+++ xerces/c/trunk/src/xercesc/sax2/SAX2XMLReader.hpp Sat Jul 8 18:10:31 2006
@@ -240,8 +240,7 @@
* <br>http://apache.org/xml/features/validation/schema-full-checking (default: false)
* <br>http://apache.org/xml/features/nonvalidating/load-external-dtd (default: true)
* <br>http://apache.org/xml/features/continue-after-fatal-error (default: false)
- * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
- * <br>http://apache.org/xml/features/validation/reuse-validator (Deprecated) (default: false)
+ * <br>http://apache.org/xml/features/validation-error-as-fatal (default: false)
*
* @param name The unique identifier (URI) of the feature.
* @param value The requested state of the feature (true or false).
Modified: xerces/c/trunk/src/xercesc/util/Base64.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Base64.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Base64.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/Base64.cpp Sat Jul 8 18:10:31 2006
@@ -282,52 +282,6 @@
return retStr;
}
-XMLCh* Base64::decode(const XMLCh* const inputData
- , unsigned int* decodedLen
- , MemoryManager* const memMgr
- , Conformance conform )
-{
- if (!inputData)
- return 0;
-
- /***
- * Move input data to a XMLByte buffer
- */
- unsigned int srcLen = XMLString::stringLen(inputData);
- XMLByte *dataInByte = (XMLByte*) getExternalMemory(memMgr, (srcLen+1) * sizeof(XMLByte));
- ArrayJanitor<XMLByte> janFill(dataInByte, memMgr ? memMgr : XMLPlatformUtils::fgMemoryManager);
-
- for (unsigned int i = 0; i < srcLen; i++)
- dataInByte[i] = (XMLByte)inputData[i];
-
- dataInByte[srcLen] = 0;
-
- /***
- * Forward to the actual decoding method to do the decoding
- */
- *decodedLen = 0;
- XMLByte *DecodedBuf = decode(dataInByte, decodedLen, memMgr, conform);
-
- if (!DecodedBuf)
- return 0;
-
- /***
- * Move decoded data to a XMLCh buffer to return
- */
- XMLCh *toRet = (XMLCh*) getExternalMemory(memMgr, (*decodedLen+1) * sizeof(XMLCh));
-
- for (unsigned int j = 0; j < *decodedLen; j++)
- toRet[j] = (XMLCh)DecodedBuf[j];
-
- toRet[*decodedLen] = 0;
-
- /***
- * Release the memory allocated in the actual decoding method
- */
- returnExternalMemory(memMgr, DecodedBuf);
-
- return toRet;
-}
XMLByte* Base64::decodeToXMLByte(const XMLCh* const inputData
, unsigned int* decodedLen
Modified: xerces/c/trunk/src/xercesc/util/Base64.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Base64.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Base64.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/Base64.hpp Sat Jul 8 18:10:31 2006
@@ -95,38 +95,7 @@
, MemoryManager* const memMgr = 0
, Conformance conform = Conf_RFC2045
);
-
- /**
- * Decodes Base64 data into XMLCh
- *
- * NOTE: The returned buffer is dynamically allocated and is the
- * responsibility of the caller to delete it when not longer needed.
- * You can call XMLString::release to release this returned buffer.
- *
- * If a memory manager is provided, ask the memory manager to de-allocate
- * the returned buffer.
- *
- * @param inputData Base64 data in XMLCh stream.
- * @param decodedLength Length of decoded XMLCh stream
- * @param memMgr client provided memory manager
- * @param conform conformance specified: if the input data conforms to the
- * RFC 2045 it is allowed to have any number of whitespace
- * characters inside; if it conforms to the XMLSchema specs,
- * it is allowed to have at most one whitespace character
- * between the quartets
- * @return Decoded binary data in XMLCh stream,
- * or NULL if input data can not be decoded.
- * @see XMLString::release(XMLCh**)
- * @deprecated use decodeToXMLByte instead.
- */
-
- static XMLCh* decode(
- const XMLCh* const inputData
- , unsigned int* decodedLength
- , MemoryManager* const memMgr = 0
- , Conformance conform = Conf_RFC2045
- );
-
+
/**
* Decodes Base64 data into octets
*
Modified: xerces/c/trunk/src/xercesc/util/HexBin.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HexBin.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HexBin.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/HexBin.cpp Sat Jul 8 18:10:31 2006
@@ -90,37 +90,6 @@
return retStr;
}
-XMLCh* HexBin::decode(const XMLCh* const hexData
- , MemoryManager* const manager)
-{
- if (( hexData == 0 ) || ( *hexData == 0 )) // zero length
- return 0;
-
- int strLen = XMLString::stringLen(hexData);
- if ( strLen%2 != 0 )
- return 0;
-
- //prepare the return string
- int decodeLength = strLen/2;
- XMLCh *retVal = (XMLCh*) manager->allocate( (decodeLength + 1) * sizeof(XMLCh));
- ArrayJanitor<XMLCh> janFill(retVal, manager);
-
- XMLByte temp1, temp2;
- for( int i = 0; i<decodeLength; i++ ) {
- temp1 = hexNumberTable[hexData[i*2]];
- if (temp1 == (XMLByte) -1)
- return 0;
- temp2 = hexNumberTable[hexData[i*2+1]];
- if (temp2 == (XMLByte) -1)
- return 0;
- retVal[i] = (XMLCh)((temp1 << 4) | temp2);
- }
-
- janFill.release();
- retVal[decodeLength] = 0;
- return retVal;
-}
-
XMLByte* HexBin::decodeToXMLByte(const XMLCh* const hexData
, MemoryManager* const manager)
{
Modified: xerces/c/trunk/src/xercesc/util/HexBin.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/HexBin.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/HexBin.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/HexBin.hpp Sat Jul 8 18:10:31 2006
@@ -68,29 +68,6 @@
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
);
- /**
- * Decodes HexBinary data into XMLCh
- *
- * NOTE: The returned buffer is dynamically allocated and is the
- * responsibility of the caller to delete it when not longer needed.
- * You can call XMLString::release to release this returned buffer.
- *
- * If a memory manager is provided, ask the memory manager to de-allocate
- * the returned buffer.
- *
- * @param hexData HexBinary data in XMLCh stream.
- * @param manager client provided memory manager
- * @return Decoded binary data in XMLCh stream,
- * or NULL if input data can not be decoded.
- * @see XMLString::release(XMLCh**)
- * @deprecated use decodeToXMLByte instead.
- */
-
- static XMLCh* decode(
- const XMLCh* const hexData
- , MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager
- );
-
/**
* Decodes HexBinary data into XMLByte
*
Modified: xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.cpp Sat Jul 8 18:10:31 2006
@@ -171,15 +171,6 @@
}
-//
-//
-//
-XMLCh* XMLAbstractDoubleFloat::toString() const
-{
- // Return data using global operator new
- return XMLString::replicate(fRawData);
-}
-
XMLCh* XMLAbstractDoubleFloat::getRawData() const
{
return fRawData;
Modified: xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLAbstractDoubleFloat.hpp Sat Jul 8 18:10:31 2006
@@ -76,13 +76,6 @@
const XMLCh* const rawData
, MemoryManager* const memMgr = XMLPlatformUtils::fgMemoryManager
);
-
- /**
- *
- * Deprecated: please use getRawData
- *
- */
- virtual XMLCh* toString() const;
virtual XMLCh* getRawData() const;
Modified: xerces/c/trunk/src/xercesc/util/XMLBigDecimal.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLBigDecimal.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLBigDecimal.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLBigDecimal.hpp Sat Jul 8 18:10:31 2006
@@ -77,13 +77,6 @@
, MemoryManager* const manager
);
- /**
- *
- * Deprecated: please use getRawData
- *
- */
- virtual XMLCh* toString() const;
-
virtual XMLCh* getRawData() const;
virtual const XMLCh* getFormattedString() const;
@@ -205,15 +198,6 @@
inline XMLCh* XMLBigDecimal::getIntVal() const
{
return fIntVal;
-}
-
-//
-// The caller needs to de-allocate the memory allocated by this function
-//
-inline XMLCh* XMLBigDecimal::toString() const
-{
- // Return data using global operator new
- return XMLString::replicate(fRawData);
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/util/XMLBigInteger.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLBigInteger.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLBigInteger.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLBigInteger.hpp Sat Jul 8 18:10:31 2006
@@ -80,17 +80,7 @@
void divide(const unsigned int byteToShift);
int getTotalDigit() const;
-
- /**
- *
- * Deprecated: please use getRawData
- *
- * Return a copy of the fMagnitue.
- * A leading sign is ALWAYS in place and the caller of this method
- * is responsible for the de-allocation of the memory.
- */
- inline XMLCh* toString() const;
-
+
/**
* Return a copy of the fMagnitue.
* This is similar to toString, except the internal buffer is returned directly
@@ -177,15 +167,6 @@
inline XMLCh* XMLBigInteger::getRawData() const
{
return fRawData;
-}
-
-//
-// The caller needs to de-allocate the memory allocated by this function
-//
-inline XMLCh* XMLBigInteger::toString() const
-{
- // Return data using global operator new
- return XMLString::replicate(fRawData, fMemoryManager);
}
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLDateTime.cpp Sat Jul 8 18:10:31 2006
@@ -477,21 +477,6 @@
// -----------------------------------------------------------------------
//
-// We may simply return the handle to fBuffer, but
-// for the sake of consistency, we return a duplicated copy
-// and the caller is responsible for the release of the buffer
-// just like any other things in the XMLNumber family.
-//
-XMLCh* XMLDateTime::toString() const
-{
- assertBuffer();
-
- // Return data using global operator new
- XMLCh* retBuf = XMLString::replicate(fBuffer);
- return retBuf;
-}
-
-//
// We may simply return the handle to fBuffer
//
XMLCh* XMLDateTime::getRawData() const
@@ -499,7 +484,6 @@
assertBuffer();
return fBuffer;
}
-
const XMLCh* XMLDateTime::getFormattedString() const
{
Modified: xerces/c/trunk/src/xercesc/util/XMLDateTime.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLDateTime.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLDateTime.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLDateTime.hpp Sat Jul 8 18:10:31 2006
@@ -78,13 +78,6 @@
// -----------------------------------------------------------------------
// Implementation of Abstract Interface
// -----------------------------------------------------------------------
-
- /**
- *
- * Deprecated: please use getRawData
- *
- */
- virtual XMLCh* toString() const;
virtual XMLCh* getRawData() const;
Modified: xerces/c/trunk/src/xercesc/util/XMLMsgLoader.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLMsgLoader.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLMsgLoader.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLMsgLoader.cpp Sat Jul 8 18:10:31 2006
@@ -109,22 +109,4 @@
return fPath;
}
-// ---------------------------------------------------------------------------
-// Deprecated
-//
-// These two methods are deprecated.
-//
-// The default implementations for these two methods are provided as is,
-// any specific derivative may change this as and when necessary.
-//
-// ---------------------------------------------------------------------------
-const XMLCh* XMLMsgLoader::getLanguageName() const
-{
- return fLanguage;
-}
-
-void XMLMsgLoader::setLanguageName(XMLCh* const)
-{
-}
-
XERCES_CPP_NAMESPACE_END
Modified: xerces/c/trunk/src/xercesc/util/XMLMsgLoader.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLMsgLoader.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLMsgLoader.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLMsgLoader.hpp Sat Jul 8 18:10:31 2006
@@ -131,22 +131,11 @@
//@}
- // -----------------------------------------------------------------------
- // Deprecated: Getter methods
- // -----------------------------------------------------------------------
- virtual const XMLCh* getLanguageName() const;
-
-
protected :
// -----------------------------------------------------------------------
// Hidden Constructors
// -----------------------------------------------------------------------
XMLMsgLoader();
-
- // -----------------------------------------------------------------------
- // Deprecated: Protected helper methods
- // -----------------------------------------------------------------------
- void setLanguageName(XMLCh* const nameToAdopt);
private :
// -----------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/util/XMLNumber.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLNumber.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLNumber.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLNumber.hpp Sat Jul 8 18:10:31 2006
@@ -47,16 +47,6 @@
};
virtual ~XMLNumber();
-
- /**
- * Deprecated: please use getRawData
- *
- * Return string representation of the decimal value.
- * A decimal point will be included as necessary,
- * the caller of this method is responsible for the
- * de-allocation of the memory.
- */
- virtual XMLCh* toString() const = 0;
/**
* Return string representation of the decimal value.
Modified: xerces/c/trunk/src/xercesc/util/XMLString.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLString.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLString.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLString.cpp Sat Jul 8 18:10:31 2006
@@ -616,7 +616,7 @@
// Examine localpart
- if (!XMLString::isValidNCName(&name[colPos+1]))
+ if (!XMLChar1_0::isValidNCName(&name[colPos+1], nameLen - colPos -1))
{
return false;
}
@@ -647,25 +647,6 @@
}
}
-
-/**
- * Deprecated: isValidNCName
- * Check first char, and then the rest of the name char.
- * But colon should be excluded
- */
-bool XMLString::isValidNCName(const XMLCh* const name) {
- return XMLChar1_0::isValidNCName(name, XMLString::stringLen(name));
-}
-
-/**
- * Deprecated: isValidName
- * Check first char, and then the rest of the name char
- *
- */
-bool XMLString::isValidName(const XMLCh* const name) {
- return XMLChar1_0::isValidName(name, XMLString::stringLen(name));
-}
-
/**
* isValidEncName
*
@@ -699,15 +680,6 @@
return true;
}
-/**
- * Deprecated: isValidQName
- *
- */
-bool XMLString::isValidQName(const XMLCh* const name)
-{
- return XMLChar1_0::isValidQName(name, XMLString::stringLen(name));
-}
-
bool XMLString::isAlpha(XMLCh const theChar)
{
if ((( theChar >= chLatin_a ) && ( theChar <= chLatin_z )) ||
@@ -735,12 +707,6 @@
return (isDigit(theChar) ||
(theChar >= chLatin_a && theChar <= chLatin_f) ||
(theChar >= chLatin_A && theChar <= chLatin_F));
-}
-
-// Deprecated
-bool XMLString::isAllWhiteSpace(const XMLCh* const toCheck)
-{
- return XMLChar1_0::isAllSpaces(toCheck, XMLString::stringLen(toCheck));
}
// ---------------------------------------------------------------------------
Modified: xerces/c/trunk/src/xercesc/util/XMLString.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLString.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLString.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLString.hpp Sat Jul 8 18:10:31 2006
@@ -826,24 +826,6 @@
, MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
/**
- * Deprecated: please use XMLChar1_0::isValidNCName
- *
- * Checks whether an name is a valid NCName according to XML 1.0
- * @param name The string to check its NCName validity
- * @return Returns true if name is NCName valid, otherwise false
- */
- static bool isValidNCName(const XMLCh* const name);
-
- /**
- * Deprecated: please use XMLChar1_0::isValidName
- *
- * Checks whether an name is a valid Name according to XML 1.0
- * @param name The string to check its Name validity
- * @return Returns true if name is Name valid, otherwise false
- */
- static bool isValidName(const XMLCh* const name);
-
- /**
* Checks whether an name is a valid EncName.
* @param name The string to check its EncName validity
* @return Returns true if name is EncName valid, otherwise false
@@ -851,15 +833,6 @@
static bool isValidEncName(const XMLCh* const name);
/**
- * Deprecated: please use XMLChar1_0::isValidQName
- *
- * Checks whether an name is a valid QName according to XML 1.0
- * @param name The string to check its QName validity
- * @return Returns true if name is QName valid, otherwise false
- */
- static bool isValidQName(const XMLCh* const name);
-
- /**
* Checks whether a character is within [a-zA-Z].
* @param theChar the character to check
* @return Returns true if within the range, otherwise false
@@ -887,15 +860,6 @@
* @return Returns true if within the range, otherwise false
*/
static bool isHex(XMLCh const theChar);
-
- /**
- * Deprecated: please use XMLChar1_0::isAllWhiteSpace
- *
- * Checks whether aa string contains only whitespace according to XML 1.0
- * @param toCheck the string to check
- * @return Returns true if it is, otherwise false
- */
- static bool isAllWhiteSpace(const XMLCh* const toCheck);
/** Find is the string appears in the enum list
* @param toFind the string to be found
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.cpp Sat Jul 8 18:10:31 2006
@@ -54,11 +54,6 @@
// ---------------------------------------------------------------------------
// DTDAttDefList: Implementation of the virtual interface
// ---------------------------------------------------------------------------
-bool DTDAttDefList::hasMoreElements() const
-{
- return fEnum->hasMoreElements();
-}
-
bool DTDAttDefList::isEmpty() const
{
@@ -97,18 +92,6 @@
{
// We don't use the URI, so we just look up the name
return fList->get(attName);
-}
-
-
-XMLAttDef& DTDAttDefList::nextElement()
-{
- return fEnum->nextElement();
-}
-
-
-void DTDAttDefList::Reset()
-{
- fEnum->Reset();
}
/**
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDAttDefList.hpp Sat Jul 8 18:10:31 2006
@@ -63,10 +63,6 @@
// Implementation of the virtual interface
// -----------------------------------------------------------------------
- /**
- * @deprecated This method is not thread-safe.
- */
- virtual bool hasMoreElements() const;
virtual bool isEmpty() const;
virtual XMLAttDef* findAttDef
(
@@ -88,16 +84,6 @@
const XMLCh* const attURI
, const XMLCh* const attName
) 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/DTD/DTDElementDecl.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.cpp Sat Jul 8 18:10:31 2006
@@ -95,51 +95,6 @@
// ---------------------------------------------------------------------------
// The virtual element decl interface
// ---------------------------------------------------------------------------
-XMLAttDef* DTDElementDecl::findAttr(const XMLCh* const qName
- , const unsigned int
- , const XMLCh* const
- , const XMLCh* const
- , const LookupOpts options
- , bool& wasAdded) const
-{
- DTDAttDef* retVal = 0;
-
- // If no att list faulted in yet, then it cannot exist
- if (fAttDefs)
- retVal = fAttDefs->get(qName);
-
- // Fault it in if not found and ask to add it
- if (!retVal && (options == XMLElementDecl::AddIfNotFound))
- {
- // Fault in the list itself if not already
- if (!fAttDefs)
- faultInAttDefList();
-
- // And add a default attribute for this name
- retVal = new (getMemoryManager()) DTDAttDef
- (
- qName
- , XMLAttDef::CData
- , XMLAttDef::Implied
- , getMemoryManager()
- );
- retVal->setElemId(getId());
- fAttDefs->put((void*)retVal->getFullName(), retVal);
- // update and/or create fAttList
- if(!fAttList)
- ((DTDElementDecl*)this)->fAttList = new (getMemoryManager()) DTDAttDefList(fAttDefs,getMemoryManager());
- fAttList->addAttDef(retVal);
-
- wasAdded = true;
- }
- else
- {
- wasAdded = false;
- }
- return retVal;
-}
-
-
XMLAttDefList& DTDElementDecl::getAttDefList() const
{
if (!fAttList)
@@ -151,8 +106,6 @@
((DTDElementDecl*)this)->fAttList = new (getMemoryManager()) DTDAttDefList(fAttDefs,getMemoryManager());
}
- // Reset it before we return it
- fAttList->Reset();
return *fAttList;
}
@@ -185,24 +138,6 @@
return false;
return !fAttDefs->isEmpty();
-}
-
-
-bool DTDElementDecl::resetDefs()
-{
- // If the collection hasn't been faulted in, then no att defs
- if (!fAttDefs)
- return false;
-
- //
- // 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.
- //
- RefHashTableOfEnumerator<DTDAttDef> enumDefs(fAttDefs, false, getMemoryManager());
- while (enumDefs.hasMoreElements())
- enumDefs.nextElement().setProvided(false);
- return true;
}
void
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDElementDecl.hpp Sat Jul 8 18:10:31 2006
@@ -87,19 +87,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;
- virtual bool resetDefs();
+ virtual bool hasAttDefs() const;
virtual const ContentSpecNode* getContentSpec() const;
virtual ContentSpecNode* getContentSpec();
virtual void setContentSpec(ContentSpecNode* toAdopt);
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.cpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.cpp Sat Jul 8 18:10:31 2006
@@ -81,8 +81,7 @@
, fElemNonDeclPool(0)
, fEntityDeclPool(0)
, fNotationDeclPool(0)
- , fGramDesc(0)
- , fRootElemId(0)
+ , fGramDesc(0)
, fValidated(false)
{
//
@@ -300,8 +299,7 @@
* which has been created in ctor
***/
fGramDesc->serialize(serEng);
-
- serEng<<fRootElemId;
+
serEng<<fValidated;
}
else
@@ -323,8 +321,7 @@
* which has been created in ctor
***/
fGramDesc->serialize(serEng);
-
- serEng>>fRootElemId;
+
serEng>>fValidated;
}
Modified: xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.hpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.hpp?rev=420236&r1=420235&r2=420236&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/DTD/DTDGrammar.hpp Sat Jul 8 18:10:31 2006
@@ -146,9 +146,6 @@
// Getter methods
// -----------------------------------------------------------------------
- // deprecated. returns the ID of the root element; not
- // useable in multithreaded environments!
- unsigned int getRootElemId() const;
const DTDEntityDecl* getEntityDecl(const XMLCh* const entName) const;
DTDEntityDecl* getEntityDecl(const XMLCh* const entName);
NameIdPool<DTDEntityDecl>* getEntityDeclPool();
@@ -161,9 +158,6 @@
// Setter methods
// -----------------------------------------------------------------------
- // deprecated. Not usable in multithreaded environments
- void setRootElemId(unsigned int rootElemId);
-
virtual void setGrammarDescription( XMLGrammarDescription*);
virtual XMLGrammarDescription* getGrammarDescription() const;
@@ -216,11 +210,6 @@
// This is a pool of NotationDecl objects, which contains all of the
// notations declared in the DTD subsets.
//
- // fRootElemId
- // The id of the root element that we found in the DOCTYPE statement.
- // Its initialized to ContentModel::fgInvalidElemId, so that its
- // invalid unless we have a DOCTYPE.
- //
// fValidated
// Indicates if the content of the Grammar has been pre-validated
// or not. When using a cached grammar, no need for pre content
@@ -236,22 +225,12 @@
NameIdPool<DTDEntityDecl>* fEntityDeclPool;
NameIdPool<XMLNotationDecl>* fNotationDeclPool;
XMLDTDDescription* fGramDesc;
-
- unsigned int fRootElemId;
+
bool fValidated;
friend class XMLInitializer;
};
-
-// ---------------------------------------------------------------------------
-// DTDGrammar: Getter methods
-// ---------------------------------------------------------------------------
-inline unsigned int DTDGrammar::getRootElemId() const
-{
- return fRootElemId;
-}
-
// ---------------------------------------------------------------------------
// DTDGrammar: Getter methods
// ---------------------------------------------------------------------------
@@ -308,10 +287,6 @@
// -----------------------------------------------------------------------
// Setter methods
// -----------------------------------------------------------------------
-inline void DTDGrammar::setRootElemId(unsigned int rootElemId) {
- fRootElemId = rootElemId;
-}
-
inline unsigned int DTDGrammar::putEntityDecl(DTDEntityDecl* const entityDecl) const
{
return fEntityDeclPool->put(entityDecl);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org