dbertoni 02/04/02 21:08:34
Modified: c/src/XPath XPathExecutionContext.cpp
XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
Log:
Moved XObjectFactory in XPathExecution context as a data member.
Revision Changes Path
1.2 +2 -1 xml-xalan/c/src/XPath/XPathExecutionContext.cpp
Index: XPathExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XPathExecutionContext.cpp 18 Dec 1999 19:47:55 -0000 1.1
+++ XPathExecutionContext.cpp 3 Apr 2002 05:08:34 -0000 1.2
@@ -59,7 +59,8 @@
-XPathExecutionContext::XPathExecutionContext()
+XPathExecutionContext::XPathExecutionContext(XObjectFactory*
theXObjectFactory) :
+ m_xobjectFactory(theXObjectFactory)
{
}
1.48 +12 -3 xml-xalan/c/src/XPath/XPathExecutionContext.hpp
Index: XPathExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContext.hpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- XPathExecutionContext.hpp 26 Nov 2001 23:14:15 -0000 1.47
+++ XPathExecutionContext.hpp 3 Apr 2002 05:08:34 -0000 1.48
@@ -118,7 +118,7 @@
typedef NodeRefListBase::size_type size_type;
explicit
- XPathExecutionContext();
+ XPathExecutionContext(XObjectFactory* theXObjectFactory = 0);
virtual
~XPathExecutionContext();
@@ -175,8 +175,13 @@
*
* @return factory object instance
*/
- virtual XObjectFactory&
- getXObjectFactory() const = 0;
+ XObjectFactory&
+ getXObjectFactory() const
+ {
+ assert(m_xobjectFactory != 0);
+
+ return *m_xobjectFactory;
+ }
/**
* Convenience function for creating a node set with
@@ -737,6 +742,10 @@
const char* msg,
const XalanNode* sourceNode,
const Locator* locator) const = 0;
+
+protected:
+
+ XObjectFactory* m_xobjectFactory;
};
1.50 +1 -13 xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp
Index: XPathExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- XPathExecutionContextDefault.cpp 23 Feb 2002 04:22:09 -0000 1.49
+++ XPathExecutionContextDefault.cpp 3 Apr 2002 05:08:34 -0000 1.50
@@ -96,10 +96,9 @@
XalanNode* theCurrentNode,
const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver) :
- XPathExecutionContext(),
+ XPathExecutionContext(&theXObjectFactory),
m_xpathEnvSupport(&theXPathEnvSupport),
m_domSupport(&theDOMSupport),
- m_xobjectFactory(&theXObjectFactory),
m_currentNode(theCurrentNode),
m_contextNodeList(theContextNodeList == 0 ? &s_dummyList :
theContextNodeList),
m_prefixResolver(thePrefixResolver),
@@ -118,7 +117,6 @@
XPathExecutionContext(),
m_xpathEnvSupport(0),
m_domSupport(0),
- m_xobjectFactory(0),
m_currentNode(theCurrentNode),
m_contextNodeList(theContextNodeList == 0 ? &s_dummyList :
theContextNodeList),
m_prefixResolver(thePrefixResolver),
@@ -180,16 +178,6 @@
XPathExecutionContextDefault::setCurrentNode(XalanNode*
theCurrentNode)
{
m_currentNode = theCurrentNode;
-}
-
-
-
-XObjectFactory&
-XPathExecutionContextDefault::getXObjectFactory() const
-{
- assert(m_xobjectFactory != 0);
-
- return *m_xobjectFactory;
}
1.43 +8 -13 xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp
Index: XPathExecutionContextDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathExecutionContextDefault.hpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- XPathExecutionContextDefault.hpp 26 Nov 2001 23:14:15 -0000 1.42
+++ XPathExecutionContextDefault.hpp 3 Apr 2002 05:08:34 -0000 1.43
@@ -156,25 +156,25 @@
}
/**
- * Set the XObjectFactory instance.
+ * Set the DOMSupport instance.
*
- * @param theFactory a reference to the instance to use.
+ * @param theDOMSupport a reference to the instance to use.
*/
void
- setXObjectFactory(XObjectFactory* theFactory)
+ setDOMSupport(DOMSupport* theDOMSupport)
{
- m_xobjectFactory = theFactory;
+ m_domSupport = theDOMSupport;
}
/**
- * Set the DOMSupport instance.
+ * Set the XObjectFactory instance.
*
- * @param theDOMSupport a reference to the instance to use.
+ * @param theFactory a reference to the instance to use.
*/
void
- setDOMSupport(DOMSupport* theDOMSupport)
+ setXObjectFactory(XObjectFactory* theXObjectFactory)
{
- m_domSupport = theDOMSupport;
+ m_xobjectFactory = theXObjectFactory;
}
@@ -189,9 +189,6 @@
virtual void
setCurrentNode(XalanNode* theCurrentNode);
- virtual XObjectFactory&
- getXObjectFactory() const;
-
virtual XObjectPtr
createNodeSet(XalanNode& theNode);
@@ -384,8 +381,6 @@
XPathEnvSupport* m_xpathEnvSupport;
DOMSupport* m_domSupport;
-
- XObjectFactory* m_xobjectFactory;
XalanNode* m_currentNode;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
