dbertoni 2003/02/12 14:41:27
Modified: c/src/XSLT StylesheetRoot.cpp XSLTEngineImpl.cpp
XSLTResultTarget.cpp XSLTResultTarget.hpp
Log:
Removed support for XalanNode as the target of a transformation. Removed redundant
DocumentHandler-related calls from XSLTResultTarget.
Revision Changes Path
1.73 +4 -46 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- StylesheetRoot.cpp 12 Dec 2002 00:35:06 -0000 1.72
+++ StylesheetRoot.cpp 12 Feb 2003 22:41:26 -0000 1.73
@@ -300,11 +300,6 @@
{
FormatterListener* flistener = outputTarget.getFormatterListener();
- if(flistener == 0)
- {
- flistener = outputTarget.getDocumentHandler();
- }
-
if (flistener != 0)
{
// Do encoding stuff here...
@@ -438,49 +433,12 @@
executionContext.setFormatterListener(flistener);
}
- else if(outputTarget.hasDOMTarget() == true)
- {
- /*
- * Output target has a node
- */
- if (outputTarget.getDocument() != 0)
- {
- flistener =
executionContext.createFormatterToDOM(outputTarget.getDocument(), 0);
- }
- else if (outputTarget.getDocumentFragment() != 0)
- {
- XalanDocumentFragment* const theFragment =
- outputTarget.getDocumentFragment();
-
- flistener = executionContext.createFormatterToDOM(
-
theFragment->getOwnerDocument(),
- theFragment,
- 0);
- }
- else if (outputTarget.getElement() != 0)
- {
- XalanElement* const theElement =
- outputTarget.getElement();
-
- flistener = executionContext.createFormatterToDOM(
-
theElement->getOwnerDocument(),
- theElement);
- }
- else
- {
- assert(0);
- }
- }
else
{
- /*
- * Create an empty document and set the output target node to this
- */
- XalanDocument* const theDocument =
executionContext.createDocument();
-
- outputTarget.setDocument(theDocument);
-
- flistener = executionContext.createFormatterToDOM(theDocument, 0);
+ executionContext.error(
+ "There is no valid result target",
+ executionContext.getCurrentNode(),
+ 0);
}
executionContext.setFormatterListener(flistener);
1.169 +2 -2 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- XSLTEngineImpl.cpp 7 Feb 2003 02:02:36 -0000 1.168
+++ XSLTEngineImpl.cpp 12 Feb 2003 22:41:26 -0000 1.169
@@ -378,7 +378,7 @@
executionContext.setStylesheetRoot(m_stylesheetRoot);
FormatterListener* const theFormatter =
- outputTarget.getDocumentHandler();
+ outputTarget.getFormatterListener();
if (theFormatter != 0 && theFormatter->getPrefixResolver() == 0)
{
@@ -423,7 +423,7 @@
}
FormatterListener* const theFormatter =
- outputTarget.getDocumentHandler();
+ outputTarget.getFormatterListener();
if (theFormatter != 0 && theFormatter->getPrefixResolver() == 0)
{
1.14 +0 -69 xml-xalan/c/src/XSLT/XSLTResultTarget.cpp
Index: XSLTResultTarget.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTResultTarget.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLTResultTarget.cpp 26 Nov 2002 17:31:06 -0000 1.13
+++ XSLTResultTarget.cpp 12 Feb 2003 22:41:27 -0000 1.14
@@ -82,9 +82,6 @@
m_byteStream(0),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
}
@@ -96,9 +93,6 @@
m_byteStream(0),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
}
@@ -110,9 +104,6 @@
m_byteStream(0),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
}
@@ -124,9 +115,6 @@
m_byteStream(0),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
}
@@ -138,9 +126,6 @@
m_byteStream(theStream),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
assert(theStream != 0);
@@ -153,9 +138,6 @@
m_byteStream(&theStream),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
}
@@ -167,9 +149,6 @@
m_byteStream(0),
m_encoding(),
m_characterStream(characterStream),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(0)
{
assert(characterStream != 0);
@@ -177,59 +156,11 @@
-XSLTResultTarget::XSLTResultTarget(XalanDocument* document) :
- m_fileName(),
- m_byteStream(0),
- m_encoding(),
- m_characterStream(0),
- m_document(document),
- m_documentFragment(0),
- m_element(0),
- m_formatterListener(0)
-{
- assert(document != 0);
-}
-
-
-
-XSLTResultTarget::XSLTResultTarget(XalanDocumentFragment* documentFragment) :
- m_fileName(),
- m_byteStream(0),
- m_encoding(),
- m_characterStream(0),
- m_document(0),
- m_documentFragment(documentFragment),
- m_element(0),
- m_formatterListener(0)
-{
- assert(documentFragment != 0);
-}
-
-
-
-XSLTResultTarget::XSLTResultTarget(XalanElement* element) :
- m_fileName(),
- m_byteStream(0),
- m_encoding(),
- m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(element),
- m_formatterListener(0)
-{
- assert(element != 0);
-}
-
-
-
XSLTResultTarget::XSLTResultTarget(FormatterListener& flistener) :
m_fileName(),
m_byteStream(0),
m_encoding(),
m_characterStream(0),
- m_document(0),
- m_documentFragment(0),
- m_element(0),
m_formatterListener(&flistener)
{
}
1.22 +0 -133 xml-xalan/c/src/XSLT/XSLTResultTarget.hpp
Index: XSLTResultTarget.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTResultTarget.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XSLTResultTarget.hpp 11 Dec 2002 22:49:05 -0000 1.21
+++ XSLTResultTarget.hpp 12 Feb 2003 22:41:27 -0000 1.22
@@ -83,9 +83,6 @@
class FormatterListener;
-class XalanDocument;
-class XalanDocumentFragment;
-class XalanElement;
class Writer;
@@ -147,27 +144,6 @@
XSLTResultTarget(Writer* characterStream);
/**
- * Create a new output target with a DOM document.
- *
- * @param n root of DOM node tree that holds results
- */
- XSLTResultTarget(XalanDocument* document);
-
- /**
- * Create a new output target with a DOM document fragment.
- *
- * @param n root of DOM node tree that holds results
- */
- XSLTResultTarget(XalanDocumentFragment* documentFragment);
-
- /**
- * Create a new output target with a DOM element.
- *
- * @param n root of DOM node tree that holds results
- */
- XSLTResultTarget(XalanElement* element);
-
- /**
* Create a new output target with a FormatterListener.
*
* @param flistener A FormatterListener instance for result tree events.
@@ -284,109 +260,6 @@
return m_characterStream;
}
- bool
- hasDOMTarget() const
- {
- return m_document != 0 || m_documentFragment != 0 || m_element != 0;
- }
-
- /**
- * Set the document node that will contain the result nodes.
- *
- * @param node DOM node to contain results
- */
- void
- setDocument(XalanDocument* document)
- {
- m_document = document;
-
- m_documentFragment = 0;
- m_element = 0;
- }
-
- /**
- * Get the document node that will contain the result nodes.
- *
- * @return a pointer to the document node
- */
- XalanDocument*
- getDocument() const
- {
- return m_document;
- }
-
- /**
- * Set the document fragment node that will contain the result nodes.
- *
- * @param node DOM node to contain results
- */
- void
- setDocumentFragment(XalanDocumentFragment* documentFragment)
- {
- m_documentFragment = documentFragment;
-
- m_document = 0;
- m_element = 0;
- }
-
- /**
- * Get the document node that will contain the result nodes.
- *
- * @return a pointer to the document node
- */
- XalanDocumentFragment*
- getDocumentFragment() const
- {
- return m_documentFragment;
- }
-
- /**
- * Set the element node that will contain the result nodes.
- *
- * @param node DOM node to contain results
- */
- void
- setElement(XalanElement* element)
- {
- m_element = element;
-
- m_documentFragment = 0;
- m_document = 0;
- }
-
- /**
- * Get the document node that will contain the result nodes.
- *
- * @return a pointer to the document node
- */
- XalanElement*
- getElement() const
- {
- return m_element;
- }
-
- /**
- * Set a SAX DocumentHandler to process the result tree events.
- *
- * @param handler pointer to new handler
- */
- void
- setDocumentHandler(FormatterListener* handler)
- {
- m_formatterListener = handler;
- }
-
- /**
- * Get the SAX DocumentHandler that will process the result tree events.
- *
- * @return pointer to current handler
- */
- FormatterListener*
- getDocumentHandler() const
- {
- return m_formatterListener;
- }
-
/**
* Set a FormatterListener to process the result tree events.
*
@@ -418,12 +291,6 @@
XalanDOMString m_encoding;
Writer* m_characterStream;
-
- XalanDocument* m_document;
-
- XalanDocumentFragment* m_documentFragment;
-
- XalanElement* m_element;
FormatterListener* m_formatterListener;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
