dbertoni 02/04/02 21:13:39
Modified: c/src/XSLT StylesheetExecutionContext.cpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
Log:
Moved XObjectFactory in XPathExecution context as a data member.
Revision Changes Path
1.11 +2 -2 xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp
Index: StylesheetExecutionContext.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- StylesheetExecutionContext.cpp 11 Sep 2001 21:03:15 -0000 1.10
+++ StylesheetExecutionContext.cpp 3 Apr 2002 05:13:38 -0000 1.11
@@ -67,8 +67,8 @@
-StylesheetExecutionContext::StylesheetExecutionContext() :
- XPathExecutionContext()
+StylesheetExecutionContext::StylesheetExecutionContext(XObjectFactory*
theXObjectFactory) :
+ XPathExecutionContext(theXObjectFactory)
{
}
1.71 +1 -4 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- StylesheetExecutionContext.hpp 26 Nov 2001 23:25:37 -0000 1.70
+++ StylesheetExecutionContext.hpp 3 Apr 2002 05:13:38 -0000 1.71
@@ -155,7 +155,7 @@
typedef size_t size_type;
explicit
- StylesheetExecutionContext();
+ StylesheetExecutionContext(XObjectFactory* theXObjectFactory = 0);
virtual
~StylesheetExecutionContext();
@@ -1559,9 +1559,6 @@
virtual void
setCurrentNode(XalanNode* theCurrentNode) = 0;
-
- virtual XObjectFactory&
- getXObjectFactory() const = 0;
virtual XObjectPtr
createNodeSet(XalanNode& theNode) = 0;
1.83 +1 -9
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- StylesheetExecutionContextDefault.cpp 14 Dec 2001 20:01:08 -0000
1.82
+++ StylesheetExecutionContextDefault.cpp 3 Apr 2002 05:13:38 -0000
1.83
@@ -127,7 +127,7 @@
XalanNode* theCurrentNode,
const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver) :
- StylesheetExecutionContext(),
+ StylesheetExecutionContext(&theXObjectFactory),
m_xpathExecutionContextDefault(theXPathEnvSupport,
theDOMSupport,
theXObjectFactory,
@@ -1533,14 +1533,6 @@
StylesheetExecutionContextDefault::setCurrentNode(XalanNode* theCurrentNode)
{
m_xpathExecutionContextDefault.setCurrentNode(theCurrentNode);
-}
-
-
-
-XObjectFactory&
-StylesheetExecutionContextDefault::getXObjectFactory() const
-{
- return m_xpathExecutionContextDefault.getXObjectFactory();
}
1.74 +10 -12
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- StylesheetExecutionContextDefault.hpp 26 Nov 2001 23:25:37 -0000
1.73
+++ StylesheetExecutionContextDefault.hpp 3 Apr 2002 05:13:38 -0000
1.74
@@ -107,7 +107,6 @@
class XalanSourceTreeDocument;
class XPathProcessor;
-class XObjectFactory;
class XSLTEngineImpl;
@@ -224,25 +223,27 @@
}
/**
- * 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_xpathExecutionContextDefault.setXObjectFactory(theFactory);
+ m_xpathExecutionContextDefault.setDOMSupport(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_xpathExecutionContextDefault.setDOMSupport(theDOMSupport);
+
m_xpathExecutionContextDefault.setXObjectFactory(theXObjectFactory);
+
+ m_xobjectFactory = theXObjectFactory;
}
@@ -753,9 +754,6 @@
virtual void
setCurrentNode(XalanNode* theCurrentNode);
-
- virtual XObjectFactory&
- getXObjectFactory() const;
virtual XObjectPtr
createNodeSet(XalanNode& theNode);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
