dbertoni 01/02/12 15:55:30
Modified: c/src/XSLT ElemElement.cpp ElemElement.hpp
ElemLiteralResult.cpp ElemLiteralResult.hpp
ElemTemplateElement.cpp ElemTemplateElement.hpp
Log:
Moved NamespacesHandler into base class.
Revision Changes Path
1.20 +1 -22 xml-xalan/c/src/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemElement.cpp 2001/02/12 02:34:52 1.19
+++ ElemElement.cpp 2001/02/12 23:55:23 1.20
@@ -86,10 +86,7 @@
columnNumber,
Constants::ELEMNAME_ELEMENT),
m_nameAVT(0),
- m_namespaceAVT(0),
- m_namespacesHandler(stylesheetTree.getNamespacesHandler(),
- stylesheetTree.getNamespaces(),
-
stylesheetTree.getXSLTNamespaceURI())
+ m_namespaceAVT(0)
{
// Namespace aliases are not used for xsl:element, so
// turn them off...
@@ -146,24 +143,6 @@
ElemElement::getElementName() const
{
return Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
-}
-
-
-
-void
-ElemElement::postConstruction(const NamespacesHandler&
theParentHandler)
-{
- m_namespacesHandler.postConstruction(getElementName(),
&theParentHandler);
-
- ElemUse::postConstruction(m_namespacesHandler);
-}
-
-
-
-const NamespacesHandler&
-ElemElement::getNamespacesHandler() const
-{
- return m_namespacesHandler;
}
1.9 +3 -15 xml-xalan/c/src/XSLT/ElemElement.hpp
Index: ElemElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemElement.hpp 2001/02/12 02:34:52 1.8
+++ ElemElement.hpp 2001/02/12 23:55:24 1.9
@@ -58,7 +58,7 @@
#define XALAN_ELEMELEMENT_HEADER_GUARD
/**
- * $Id: ElemElement.hpp,v 1.8 2001/02/12 02:34:52 dbertoni Exp $
+ * $Id: ElemElement.hpp,v 1.9 2001/02/12 23:55:24 dbertoni Exp $
*
*
* $State: Exp $
@@ -76,10 +76,6 @@
-#include <XSLT/NamespacesHandler.hpp>
-
-
-
class AVT;
@@ -109,12 +105,6 @@
// These methods are inherited from ElemUse ...
- virtual const NamespacesHandler&
- getNamespacesHandler() const;
-
- virtual void
- postConstruction(const NamespacesHandler& theParentHandler);
-
virtual const XalanDOMString&
getElementName() const;
@@ -152,12 +142,10 @@
ElemElement&
operator=(const ElemElement &);
+ // Data members...
const AVT* m_nameAVT;
+
const AVT* m_namespaceAVT;
- /*
- * This object handles all result tree namespace processing.
- */
- NamespacesHandler m_namespacesHandler;
};
1.30 +1 -22 xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemLiteralResult.cpp 2001/02/12 02:34:52 1.29
+++ ElemLiteralResult.cpp 2001/02/12 23:55:24 1.30
@@ -99,10 +99,7 @@
columnNumber,
xslToken),
m_elementName(name),
- m_avts(),
- m_namespacesHandler(stylesheetTree.getNamespacesHandler(),
- stylesheetTree.getNamespaces(),
-
stylesheetTree.getXSLTNamespaceURI())
+ m_avts()
{
const unsigned int nAttrs = atts.getLength();
@@ -184,24 +181,6 @@
for_each(m_avts.begin(),
m_avts.end(),
DeleteFunctor<AVT>());
-}
-
-
-
-const NamespacesHandler&
-ElemLiteralResult::getNamespacesHandler() const
-{
- return m_namespacesHandler;
-}
-
-
-
-void
-ElemLiteralResult::postConstruction(const NamespacesHandler&
theParentHandler)
-{
- m_namespacesHandler.postConstruction(getElementName(),
&theParentHandler);
-
- ElemUse::postConstruction(m_namespacesHandler);
}
1.15 +0 -15 xml-xalan/c/src/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemLiteralResult.hpp 2001/02/12 02:34:52 1.14
+++ ElemLiteralResult.hpp 2001/02/12 23:55:24 1.15
@@ -69,10 +69,6 @@
-#include <XSLT/NamespacesHandler.hpp>
-
-
-
class AVT;
@@ -108,12 +104,6 @@
virtual const XalanDOMString&
getElementName() const;
- virtual const NamespacesHandler&
- getNamespacesHandler() const;
-
- virtual void
- postConstruction(const NamespacesHandler& theParentHandler);
-
virtual bool
isAttrOK(
int tok,
@@ -186,11 +176,6 @@
* A vector to keep track of the attribute elements.
*/
AVTVectorType m_avts;
-
- /*
- * This object handles all result tree namespace processing.
- */
- NamespacesHandler m_namespacesHandler;
};
1.45 +6 -16 xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ElemTemplateElement.cpp 2001/02/12 02:34:53 1.44
+++ ElemTemplateElement.cpp 2001/02/12 23:55:25 1.45
@@ -119,6 +119,9 @@
XalanElement(),
PrefixResolver(),
m_finishedConstruction(false),
+ m_namespacesHandler(stylesheetTree.getNamespacesHandler(),
+ stylesheetTree.getNamespaces(),
+
stylesheetTree.getXSLTNamespaceURI()),
m_stylesheet(stylesheetTree),
m_lineNumber(lineNumber),
m_columnNumber(columnNumber),
@@ -145,21 +148,6 @@
-const NamespacesHandler&
-ElemTemplateElement::getNamespacesHandler() const
-{
- if (m_parentNode != 0)
- {
- return m_parentNode->getNamespacesHandler();
- }
- else
- {
- return m_stylesheet.getNamespacesHandler();
- }
-}
-
-
-
bool
ElemTemplateElement::isAttrOK(
int tok,
@@ -1335,9 +1323,11 @@
void
ElemTemplateElement::postConstruction(const NamespacesHandler&
theParentHandler)
{
+ m_namespacesHandler.postConstruction(getElementName(),
&theParentHandler);
+
for (ElemTemplateElement* node = m_firstChild; node != 0; node =
node->m_nextSibling)
{
- node->postConstruction(theParentHandler);
+ node->postConstruction(m_namespacesHandler);
}
}
1.23 +11 -2 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElemTemplateElement.hpp 2001/02/12 02:34:53 1.22
+++ ElemTemplateElement.hpp 2001/02/12 23:55:26 1.23
@@ -84,6 +84,7 @@
+#include <XSLT/NamespacesHandler.hpp>
#include <XSLT/NodeSorter.hpp>
@@ -321,8 +322,11 @@
*
* @return The element's NamespacesHandler instance.
*/
- virtual const NamespacesHandler&
- getNamespacesHandler() const;
+ const NamespacesHandler&
+ getNamespacesHandler() const
+ {
+ return m_namespacesHandler;
+ }
/**
* Retrieve the stylesheet from which this element comes
@@ -798,6 +802,11 @@
protected:
bool m_finishedConstruction;
+
+ /*
+ * This object handles all result tree namespace processing.
+ */
+ NamespacesHandler m_namespacesHandler;
static const XalanDOMString s_emptyString;
