dbertoni 00/07/13 10:53:55
Modified: c/src/XMLSupport XMLParserLiaison.hpp
XMLParserLiaisonDefault.cpp
XMLParserLiaisonDefault.hpp
Log:
Cleaned up obsolete code. XMLParserLiaison no longer inherits from Formatter.
Revision Changes Path
1.5 +14 -14 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLParserLiaison.hpp 2000/04/11 14:43:02 1.4
+++ XMLParserLiaison.hpp 2000/07/13 17:53:55 1.5
@@ -148,12 +148,12 @@
*/
virtual XalanDocument*
createDocument() = 0;
-
- /**
- * Get the factory object required to create DOM nodes in the result
tree.
- *
- * @return DOM document factory
- */
+
+ /**
+ * Get the factory object required to create DOM nodes in the result
tree.
+ *
+ * @return DOM document factory
+ */
virtual XalanDocument*
getDOMFactory() = 0;
@@ -176,20 +176,20 @@
getExpandedAttributeName(const XalanAttr& attr) const = 0;
/**
- * Set special characters for attributes that will be escaped.
+ * Get special characters for attributes that will be escaped.
*
- * @param str string containing characters
+ * @return string containing characters
*/
- virtual void
- setSpecialCharacters(const XalanDOMString& str) = 0;
+ virtual const XalanDOMString&
+ getSpecialCharacters() const = 0;
/**
- * Get special characters for attributes that will be escaped.
+ * Set special characters for attributes that will be escaped.
*
- * @return string containing characters
+ * @param str string containing characters
*/
- virtual XalanDOMString
- getSpecialCharacters() const = 0;
+ virtual void
+ setSpecialCharacters(const XalanDOMString& str) = 0;
/**
* Get the amount to indent when indent-result="yes".
1.7 +3 -183 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLParserLiaisonDefault.cpp 2000/05/18 18:37:23 1.6
+++ XMLParserLiaisonDefault.cpp 2000/07/13 17:53:55 1.7
@@ -59,51 +59,24 @@
-// Standard header files
-#include <cassert>
-#include <cstring>
-#include <memory>
+#include <DOMSupport/DOMSupport.hpp>
-// Xerces header files
-#include <XalanDOM/XalanAttr.hpp>
-#include <XalanDOM/XalanDocument.hpp>
-#include <XalanDOM/XalanElement.hpp>
-#include <XalanDOM/XalanNamedNodeMap.hpp>
-
-
-
-#include <PlatformSupport/DOMStringHelper.hpp>
-#include <PlatformSupport/PrintWriter.hpp>
-#include <DOMSupport/DOMServices.hpp>
-
-
-
-#include "FormatterToHTML.hpp"
-#include "FormatterToXML.hpp"
-#include "FormatterTreeWalker.hpp"
#include "XMLSupportException.hpp"
-static const XalanDOMString
theDefaultSpecialCharacters(XALAN_STATIC_UCODE_STRING("<>&\"\'\r\n"));
-
-
-
XMLParserLiaisonDefault::XMLParserLiaisonDefault(
DOMSupport& theDOMSupport,
const XalanDOMString& theParserDescription) :
XMLParserLiaison(),
- Formatter(),
m_DOMSupport(theDOMSupport),
- m_SpecialCharacters(theDefaultSpecialCharacters),
+ m_SpecialCharacters(),
m_Indent(-1),
m_fShouldExpandEntityRefs(false),
m_fUseValidation(false),
- m_ParserDescription(theParserDescription),
- m_FormatterListener(0),
- m_fOwnListener(false)
+ m_ParserDescription(theParserDescription)
{
}
@@ -111,10 +84,6 @@
XMLParserLiaisonDefault::~XMLParserLiaisonDefault()
{
- if (m_fOwnListener == true)
- {
- delete m_FormatterListener;
- }
}
@@ -122,15 +91,6 @@
void
XMLParserLiaisonDefault::reset()
{
- if (m_fOwnListener == true)
- {
- delete m_FormatterListener;
-
- m_fOwnListener = false;
- }
-
- m_FormatterListener = 0;
-
m_DOMSupport.reset();
}
@@ -203,144 +163,4 @@
XMLParserLiaisonDefault::getExpandedAttributeName(const XalanAttr& attr)
const
{
return m_DOMSupport.getExpandedAttributeName(attr);
-}
-
-
-
-void
-XMLParserLiaisonDefault::toMarkup(
- const XalanDocument& doc,
- PrintWriter& pw,
- const XalanDOMString& resultns,
- bool format)
-{
-#if !defined(XALAN_NO_NAMESPACES)
- using std::auto_ptr;
-#endif
-
- auto_ptr<FormatterListener> visitor;
-
- if(equals(trim(resultns),
-
XALAN_STATIC_UCODE_STRING("http://www.w3.org/TR/REC-html40";)) == true)
- {
- FormatterToHTML* const htmlFormatVisitor =
- new FormatterToHTML(
- pw,
- XalanDOMString(), //
encoding
- XalanDOMString(), //
media type
- XalanDOMString(), //
doctypeSystem
- XalanDOMString(), //
doctypePublic
- format,
- m_Indent,
- XalanDOMString(), //
version
- XalanDOMString(), //
standalone
- false); // xmlDecl
-
-
-#if defined(XALAN_OLD_AUTO_PTR)
- visitor = auto_ptr<FormatterListener>(htmlFormatVisitor);
-#else
- visitor.reset(htmlFormatVisitor);
-#endif
- }
- else
- {
- FormatterToXML* const fToXML =
- new FormatterToXML(pw,
- XalanDOMString(),
- format,
- m_Indent,
- XalanDOMString(), //
encoding
- XalanDOMString(), //
media type
- XalanDOMString(), //
doctypeSystem
- XalanDOMString(), //
doctypePublic
- true,
// xmlDecl
- XalanDOMString()); //
standalone,
-
-#if defined(XALAN_OLD_AUTO_PTR)
- visitor = auto_ptr<FormatterListener>(fToXML);
-#else
- visitor.reset(fToXML);
-#endif
- }
-
- if(visitor.get() != 0)
- {
- FormatterTreeWalker treeTraversal(*visitor);
-
- treeTraversal.traverse(&doc);
- }
-}
-
-
-
-void
-XMLParserLiaisonDefault::setFormatterListener(
- PrintWriter& pw,
- const XalanDOMString& resultns,
- bool format)
-{
- if(equals(trim(resultns),
-
XALAN_STATIC_UCODE_STRING("http://www.w3.org/TR/REC-html40";)) == true)
- {
- FormatterToHTML* const htmlFormatVisitor =
- new FormatterToHTML(
- pw,
- XalanDOMString(), //
encoding
- XalanDOMString(), //
media type
- XalanDOMString(), //
doctypeSystem
- XalanDOMString(), //
doctypePublic
- format,
- m_Indent,
- XalanDOMString(), //
version
- XalanDOMString(), //
standalone
- false); // xmlDecl
-
- if (m_fOwnListener == true)
- {
- delete m_FormatterListener;
- }
-
- m_FormatterListener = htmlFormatVisitor;
- m_fOwnListener = true;
- }
- else if(0 == m_FormatterListener)
- {
- FormatterToXML* const fToXML =
- new FormatterToXML(pw,
- XalanDOMString(),
- format,
- m_Indent,
- XalanDOMString(), // encoding
- XalanDOMString(), // media type
- XalanDOMString(), // doctypeSystem
- XalanDOMString(), // doctypePublic
- true, //
xmlDecl
- XalanDOMString()); // standalone
-
- m_FormatterListener = fToXML;
- m_fOwnListener = true;
- }
-}
-
-
-
-void
-XMLParserLiaisonDefault::setFormatterListener(FormatterListener* fl)
-{
- if (m_fOwnListener == true)
- {
- delete m_FormatterListener;
- }
-
- m_fOwnListener = false;
- m_FormatterListener = fl;
-}
-
-
-
-FormatterListener*
-XMLParserLiaisonDefault::getFormatterListener() const
-{
- return m_FormatterListener;
}
1.4 +7 -30 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLParserLiaisonDefault.hpp 2000/04/11 14:43:02 1.3
+++ XMLParserLiaisonDefault.hpp 2000/07/13 17:53:55 1.4
@@ -66,13 +66,15 @@
// Xalan header files.
#include <PlatformSupport/DOMStringHelper.hpp>
+
+
+
#include <DOMSupport/DOMSupportDefault.hpp>
#include <XMLSupport/XMLParserLiaison.hpp>
-#include <XMLSupport/Formatter.hpp>
-class XALAN_XMLSUPPORT_EXPORT XMLParserLiaisonDefault : public
XMLParserLiaison, public Formatter
+class XALAN_XMLSUPPORT_EXPORT XMLParserLiaisonDefault : public
XMLParserLiaison
{
public:
@@ -126,12 +128,12 @@
virtual XalanDOMString
getExpandedAttributeName(const XalanAttr& attr) const;
+ virtual const XalanDOMString&
+ getSpecialCharacters() const { return m_SpecialCharacters; }
+
virtual void
setSpecialCharacters(const XalanDOMString& str) {
m_SpecialCharacters = str; }
- virtual XalanDOMString
- getSpecialCharacters() const { return m_SpecialCharacters; }
-
virtual int
getIndent() const { return m_Indent; }
@@ -153,27 +155,6 @@
virtual const XalanDOMString&
getParserDescription() const { return m_ParserDescription; }
- // These interfaces are inherited from Formatter...
-
- virtual void
- toMarkup(
- const XalanDocument& doc,
- PrintWriter& pw,
- const XalanDOMString& resultns,
- bool format);
-
- virtual FormatterListener*
- getFormatterListener() const;
-
- virtual void
- setFormatterListener(
- PrintWriter& pw,
- const XalanDOMString& resultns,
- bool format);
-
- virtual void
- setFormatterListener(FormatterListener* fl);
-
protected:
// Data members...
@@ -196,10 +177,6 @@
bool m_fUseValidation;
const XalanDOMString m_ParserDescription;
-
- FormatterListener* m_FormatterListener;
-
- bool m_fOwnListener;
};
