dbertoni 01/10/29 19:59:44
Modified: c/src/XalanSourceTree FormatterToSourceTree.cpp
FormatterToSourceTree.hpp
XalanSourceTreeElement.cpp
XalanSourceTreeElement.hpp
Log:
Changes for new XalanSourceTreeDocumentFragment implementation.
Revision Changes Path
1.8 +8 -7 xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp
Index: FormatterToSourceTree.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FormatterToSourceTree.cpp 2001/09/25 21:13:04 1.7
+++ FormatterToSourceTree.cpp 2001/10/30 03:59:43 1.8
@@ -83,6 +83,7 @@
#include "XalanSourceTreeComment.hpp"
#include "XalanSourceTreeDocument.hpp"
+#include "XalanSourceTreeDocumentFragment.hpp"
#include "XalanSourceTreeElement.hpp"
#include "XalanSourceTreeProcessingInstruction.hpp"
#include "XalanSourceTreeText.hpp"
@@ -102,8 +103,8 @@
FormatterToSourceTree::FormatterToSourceTree(
- XalanSourceTreeDocument* theDocument,
- XalanDocumentFragment* theDocumentFragment) :
+ XalanSourceTreeDocument*
theDocument,
+ XalanSourceTreeDocumentFragment*
theDocumentFragment) :
FormatterListener(OUTPUT_METHOD_DOM),
m_document(theDocument),
m_documentFragment(theDocumentFragment),
@@ -161,7 +162,7 @@
}
else if(m_documentFragment != 0)
{
- m_documentFragment->appendChild(theNewElement);
+ m_documentFragment->appendChildNode(theNewElement);
}
else
{
@@ -275,7 +276,7 @@
XalanSourceTreeText* const theNewTextNode =
m_document->createTextIWSNode(chars, length,
m_currentElement);
- m_documentFragment->appendChild(theNewTextNode);
+ m_documentFragment->appendChildNode(theNewTextNode);
}
}
@@ -318,7 +319,7 @@
}
else if(m_documentFragment != 0)
{
- m_documentFragment->appendChild(theNewComment);
+ m_documentFragment->appendChildNode(theNewComment);
}
else
{
@@ -361,7 +362,7 @@
}
else if(m_documentFragment != 0)
{
-
m_documentFragment->appendChild(m_document->createTextNode(chars, length,
m_currentElement));
+
m_documentFragment->appendChildNode(m_document->createTextNode(chars, length,
m_currentElement));
}
else
{
@@ -403,7 +404,7 @@
}
else if(m_documentFragment != 0)
{
- m_documentFragment->appendChild(theNewPI);
+ m_documentFragment->appendChildNode(theNewPI);
}
else
{
1.9 +6 -9 xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp
Index: FormatterToSourceTree.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/FormatterToSourceTree.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterToSourceTree.hpp 2001/09/25 21:13:04 1.8
+++ FormatterToSourceTree.hpp 2001/10/30 03:59:43 1.9
@@ -78,11 +78,8 @@
class PrefixResolver;
-class XalanDocument;
-class XalanDocumentFragment;
-class XalanElement;
-class XalanNode;
class XalanSourceTreeDocument;
+class XalanSourceTreeDocumentFragment;
class XalanSourceTreeElement;
@@ -125,8 +122,8 @@
* @param theDocumentFragment The document fragment for nodes
*/
FormatterToSourceTree(
- XalanSourceTreeDocument* theDocument,
- XalanDocumentFragment* theDocumentFragment);
+ XalanSourceTreeDocument*
theDocument,
+ XalanSourceTreeDocumentFragment*
theDocumentFragment);
virtual
~FormatterToSourceTree();
@@ -144,14 +141,14 @@
m_document = theDocument;
}
- XalanDocumentFragment*
+ XalanSourceTreeDocumentFragment*
getDocumentFragment() const
{
return m_documentFragment;
}
void
- setDocumentFragment(XalanDocumentFragment* theDocumentFragment)
+ setDocumentFragment(XalanSourceTreeDocumentFragment*
theDocumentFragment)
{
m_documentFragment = theDocumentFragment;
}
@@ -247,7 +244,7 @@
// Data members...
XalanSourceTreeDocument*
m_document;
- XalanDocumentFragment*
m_documentFragment;
+ XalanSourceTreeDocumentFragment*
m_documentFragment;
XalanSourceTreeElement*
m_currentElement;
1.5 +3 -3
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.cpp
Index: XalanSourceTreeElement.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanSourceTreeElement.cpp 2001/01/18 22:34:30 1.4
+++ XalanSourceTreeElement.cpp 2001/10/30 03:59:43 1.5
@@ -111,14 +111,14 @@
XalanSourceTreeElement::XalanSourceTreeElement(
const XalanSourceTreeElement& theSource,
- bool
/* deep */) :
+ bool
deep) :
XalanElement(theSource),
m_tagName(theSource.m_tagName),
m_ownerDocument(theSource.m_ownerDocument),
m_parentElement(0),
m_previousSibling(0),
m_nextSibling(0),
- m_firstChild(0),
+ m_firstChild(theSource.m_firstChild == 0 ? 0 :
theSource.m_firstChild->cloneNode(deep)),
m_index(0),
m_attributes(theSource.m_attributes),
m_attributeCount(theSource.m_attributeCount)
@@ -232,7 +232,7 @@
#endif
XalanSourceTreeElement::cloneNode(bool deep) const
{
- return new XalanSourceTreeElement(*this, deep);
+ return clone(deep);
}
1.4 +17 -0
xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.hpp
Index: XalanSourceTreeElement.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanSourceTree/XalanSourceTreeElement.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanSourceTreeElement.hpp 2001/01/08 18:22:37 1.3
+++ XalanSourceTreeElement.hpp 2001/10/30 03:59:43 1.4
@@ -805,6 +805,23 @@
return index < m_attributeCount ? m_attributes[index] : 0;
}
+ /**
+ * Removes all of the children. Since the owner document controls the
+ * lifetime of all nodes in the document, this just sets the first
child
+ * to 0.
+ */
+ void
+ clearChildren()
+ {
+ m_firstChild = 0;
+ }
+
+ XalanSourceTreeElement*
+ clone(bool deep) const
+ {
+ return new XalanSourceTreeElement(*this, deep);
+ }
+
protected:
XalanSourceTreeElement(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
