You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/12/16 18:27:40 UTC
svn commit: r357189 - in /xerces/c/trunk/src/xercesc: dom/deprecated/
framework/ parsers/ validators/schema/
Author: amassari
Date: Fri Dec 16 09:27:16 2005
New Revision: 357189
URL: http://svn.apache.org/viewcvs?rev=357189&view=rev
Log:
Removed deprecated (and unused) method resolveEntity(publicId, systemId, baseUri) from advanced handler XMLEntityHandler
Modified:
xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.cpp
xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.hpp
xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
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/parsers/XercesDOMParser.cpp
xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
Modified: xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.cpp Fri Dec 16 09:27:16 2005
@@ -594,20 +594,6 @@
// ---------------------------------------------------------------------------
// DOMParser: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
-InputSource*
-DOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const /*baseURI*/)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
InputSource* DOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
//
Modified: xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/dom/deprecated/DOMParser.hpp Fri Dec 16 09:27:16 2005
@@ -1262,36 +1262,6 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
* implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
Modified: xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp (original)
+++ xerces/c/trunk/src/xercesc/framework/XMLEntityHandler.hpp Fri Dec 16 09:27:16 2005
@@ -99,33 +99,6 @@
/**
* This method allows the entity handler to provide customized
- * application specific entity resolution. This method is defined
- * by SAX 1.0 API.
- *
- * <i>Only one resolveEntity method will be used. If both setEntityResolver and
- * setXMLEntityResolver are called, then the last one is used.</i>
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- ) = 0;
-
- /**
- * This method allows the entity handler to provide customized
* application specific entity resolution.
*
* <i>Only one resolveEntity method will be used. If both setEntityResolver and
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.cpp Fri Dec 16 09:27:16 2005
@@ -792,26 +792,6 @@
// DOMLSParserImpl: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
InputSource*
-DOMLSParserImpl::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const baseURI)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver) {
-
- DOMLSInput* is = fEntityResolver->resolveResource(0, 0, publicId, systemId, baseURI);
-
- if (is)
- return new (getMemoryManager()) Wrapper4DOMLSInput(is, true, getMemoryManager());
- }
-
- return 0;
-}
-
-InputSource*
DOMLSParserImpl::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
{
//
Modified: xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/DOMLSParserImpl.hpp Fri Dec 16 09:27:16 2005
@@ -504,36 +504,6 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the DOMLSParser which is
- * responsible to clean up the memory.
- * @see DOMLSResourceResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
* implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.cpp Fri Dec 16 09:27:16 2005
@@ -1125,17 +1125,6 @@
// Nothing to do for this one
}
-
-InputSource* SAX2XMLReaderImpl::resolveEntity( const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const)
-{
- // Just map to the SAX entity resolver handler
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
InputSource* SAX2XMLReaderImpl::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
//
Modified: xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAX2XMLReaderImpl.hpp Fri Dec 16 09:27:16 2005
@@ -1256,35 +1256,6 @@
*/
virtual void resetEntities();
- /**
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications
- * can implement 'redirection' via this callback. The driver
- * should call the SAX EntityHandler 'resolveEntity' method.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.cpp Fri Dec 16 09:27:16 2005
@@ -1207,19 +1207,6 @@
// Nothing to do for this one
}
-
-InputSource*
-SAXParser::resolveEntity( const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const)
-{
- // Just map to the SAX entity resolver handler
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
-
InputSource*
SAXParser::resolveEntity( XMLResourceIdentifier* resourceIdentifier )
{
Modified: xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/SAXParser.hpp Fri Dec 16 09:27:16 2005
@@ -1664,35 +1664,6 @@
*/
virtual void resetEntities();
- /**
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications
- * can implement 'redirection' via this callback. The driver
- * should call the SAX EntityHandler 'resolveEntity' method.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the SAX resolveEntity method or
- * NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see EntityResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
/** Resolve a public/system id
*
* This method allows a user installed entity handler to further
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.cpp Fri Dec 16 09:27:16 2005
@@ -222,20 +222,6 @@
// XercesDOMParser: Implementation of XMLEntityHandler interface
// ---------------------------------------------------------------------------
InputSource*
-XercesDOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const)
-{
- //
- // Just map it to the SAX entity resolver. If there is not one installed,
- // return a null pointer to cause the default resolution.
- //
- if (fEntityResolver)
- return fEntityResolver->resolveEntity(publicId, systemId);
- return 0;
-}
-
-InputSource*
XercesDOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
//
Modified: xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/parsers/XercesDOMParser.hpp Fri Dec 16 09:27:16 2005
@@ -473,36 +473,6 @@
*
* This method allows a user installed entity handler to further
* process any pointers to external entities. The applications can
- * implement 'redirection' via this callback. This method is also
- * borrowed from the SAX specification.
- *
- * @deprecated This method is no longer called (the other resolveEntity one is).
- *
- * @param publicId A const pointer to a Unicode string representing the
- * public id of the entity just parsed.
- * @param systemId A const pointer to a Unicode string representing the
- * system id of the entity just parsed.
- * @param baseURI A const pointer to a Unicode string representing the
- * base URI of the entity just parsed,
- * or <code>null</code> if there is no base URI.
- * @return The value returned by the user installed resolveEntity
- * method or NULL otherwise to indicate no processing was done.
- * The returned InputSource is owned by the parser which is
- * responsible to clean up the memory.
- * @see DOMLSResourceResolver
- * @see XMLEntityHandler
- */
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
- /** Resolve a public/system id
- *
- * This method allows a user installed entity handler to further
- * process any pointers to external entities. The applications can
* implement 'redirection' via this callback.
*
* @param resourceIdentifier An object containing the type of
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.cpp Fri Dec 16 09:27:16 2005
@@ -509,16 +509,6 @@
systemId, publicId, lineNum, colNum);
}
-InputSource* XSDDOMParser::resolveEntity(const XMLCh* const publicId,
- const XMLCh* const systemId,
- const XMLCh* const baseURI)
-{
- if (fUserEntityHandler)
- return fUserEntityHandler->resolveEntity(publicId, systemId, baseURI);
-
- return 0;
-}
-
InputSource*
XSDDOMParser::resolveEntity(XMLResourceIdentifier* resourceIdentifier)
{
Modified: xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp?rev=357189&r1=357188&r2=357189&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/XSDDOMParser.hpp Fri Dec 16 09:27:16 2005
@@ -259,13 +259,6 @@
// -----------------------------------------------------------------------
// XMLEntityHandler interface
// -----------------------------------------------------------------------
- virtual InputSource* resolveEntity
- (
- const XMLCh* const publicId
- , const XMLCh* const systemId
- , const XMLCh* const baseURI = 0
- );
-
virtual InputSource* resolveEntity(XMLResourceIdentifier* resourceIdentifier);
protected :
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org