dbertoni 01/05/10 10:54:27
Modified: c/src/XMLSupport XMLParserLiaison.hpp
XMLParserLiaisonDefault.cpp
XMLParserLiaisonDefault.hpp
Log:
Moved getEntityResolver() into XMLParserLiaison.
Revision Changes Path
1.11 +22 -2 xml-xalan/c/src/XMLSupport/XMLParserLiaison.hpp
Index: XMLParserLiaison.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/XMLParserLiaison.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XMLParserLiaison.hpp 2001/02/03 00:07:40 1.10
+++ XMLParserLiaison.hpp 2001/05/10 17:54:20 1.11
@@ -73,10 +73,10 @@
class DocumentHandler;
+class EntityResolver;
class ExecutionContext;
class FormatterListener;
class InputSource;
-class URLInputSource;
class XalanAttr;
class XalanDocument;
class XalanElement;
@@ -135,7 +135,7 @@
* you pass in some sort of recognizable name, such as the filename or
URI,
* with which the reader can be recognized if the parse fails.
*
- * @param urlInputSource input source that should hold valid XML
+ * @param inputSource input source that should hold valid XML
* @param handler instance of a DocumentHandler
* @param identifier used for diagnostic purposes only, some sort of
* identification for error reporting, default an
@@ -248,6 +248,26 @@
*/
virtual const XalanDOMString
getParserDescription() const = 0;
+
+ /**
+ * This method returns the installed entity resolver.
+ *
+ * @return The pointer to the installed entity resolver object.
+ */
+ virtual EntityResolver*
+ getEntityResolver() = 0;
+
+ /**
+ * This method installs the user specified entity resolver on the
+ * parser. It allows applications to trap and redirect calls to
+ * external entities.
+ *
+ * @param handler A pointer to the entity resolver to be called
+ * when the parser comes across references to
+ * entities in the XML file.
+ */
+ virtual void
+ setEntityResolver(EntityResolver* resolver) = 0;
private:
1.13 +2 -1 xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.cpp
Index: XMLParserLiaisonDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLParserLiaisonDefault.cpp 2001/02/03 00:07:40 1.12
+++ XMLParserLiaisonDefault.cpp 2001/05/10 17:54:21 1.13
@@ -73,7 +73,8 @@
m_SpecialCharacters(),
m_Indent(-1),
m_fShouldExpandEntityRefs(false),
- m_fUseValidation(false)
+ m_fUseValidation(false),
+ m_entityResolver(0)
{
}
1.10 +12 -4 xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.hpp
Index: XMLParserLiaisonDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/XMLParserLiaisonDefault.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XMLParserLiaisonDefault.hpp 2001/02/03 00:07:40 1.9
+++ XMLParserLiaisonDefault.hpp 2001/05/10 17:54:22 1.10
@@ -154,6 +154,12 @@
virtual const XalanDOMString
getParserDescription() const;
+ virtual EntityResolver*
+ getEntityResolver() { return m_entityResolver; }
+
+ virtual void
+ setEntityResolver(EntityResolver* resolver) { m_entityResolver =
resolver; }
+
protected:
// Data members...
@@ -168,12 +174,14 @@
operator=(const XMLParserLiaisonDefault&);
// Data members...
- XalanDOMString m_SpecialCharacters;
+ XalanDOMString m_SpecialCharacters;
+
+ int m_Indent;
- int m_Indent;
+ bool m_fShouldExpandEntityRefs;
+ bool m_fUseValidation;
- bool m_fShouldExpandEntityRefs;
- bool m_fUseValidation;
+ EntityResolver* m_entityResolver;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
