dbertoni 01/01/08 10:28:30
Modified: c/src/XPath ElementPrefixResolverProxy.cpp
ElementPrefixResolverProxy.hpp
FunctionNamespaceURI.cpp NodeRefListBase.hpp
QName.hpp QNameByValue.cpp QNameByValue.hpp
ResultTreeFrag.hpp XPath.cpp
XPathExecutionContext.hpp
XPathExecutionContextDefault.cpp
XPathExecutionContextDefault.hpp
XPathProcessorImpl.cpp XResultTreeFrag.cpp
XResultTreeFrag.hpp
Removed: c/src/XPath XPathSupport.cpp XPathSupport.hpp
XPathSupportDefault.cpp XPathSupportDefault.hpp
Log:
XPathSupport and XPathSupportDefault have been removed.
Revision Changes Path
1.5 +7 -4 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp
Index: ElementPrefixResolverProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElementPrefixResolverProxy.cpp 2000/11/02 01:45:56 1.4
+++ ElementPrefixResolverProxy.cpp 2001/01/08 18:28:21 1.5
@@ -67,8 +67,11 @@
+#include <DOMSupport/DOMSupport.hpp>
+
+
+
#include "XPathEnvSupport.hpp"
-#include "XPathSupport.hpp"
@@ -79,10 +82,10 @@
ElementPrefixResolverProxy::ElementPrefixResolverProxy(
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const XPathSupport& support) :
+ const DOMSupport& domSupport) :
m_namespaceContext(namespaceContext),
m_envSupport(envSupport),
- m_support(support),
+ m_domSupport(domSupport),
m_uri()
{
}
@@ -104,7 +107,7 @@
}
else
{
- return m_support.getNamespaceForPrefix(prefix,
*m_namespaceContext);
+ return m_domSupport.getNamespaceForPrefix(prefix,
*m_namespaceContext);
}
}
1.6 +6 -6 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp
Index: ElementPrefixResolverProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElementPrefixResolverProxy.hpp 2000/11/02 01:45:56 1.5
+++ ElementPrefixResolverProxy.hpp 2001/01/08 18:28:22 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,8 +73,8 @@
+class DOMSupport;
class XPathEnvSupport;
-class XPathSupport;
class XalanElement;
@@ -87,13 +87,13 @@
* Construct an instance of an element prefix resolver proxy
*
* @param namespaceContext context object for namespace resolution
- * @param EnvSupport XPath environment support class instance
- * @param support XPath support class instance
+ * @param envSupport XPath environment support class instance
+ * @param domSupport DOMSupport class instance
*/
ElementPrefixResolverProxy(
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const XPathSupport& support);
+ const DOMSupport& domSupport);
virtual
~ElementPrefixResolverProxy();
@@ -112,7 +112,7 @@
const XPathEnvSupport& m_envSupport;
- const XPathSupport& m_support;
+ const DOMSupport& m_domSupport;
mutable XalanDOMString m_uri;
1.9 +2 -2 xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp
Index: FunctionNamespaceURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionNamespaceURI.cpp 2001/01/03 19:32:38 1.8
+++ FunctionNamespaceURI.cpp 2001/01/08 18:28:22 1.9
@@ -95,7 +95,7 @@
// The XPath standard says that if there are no arguments,
// the argument defaults to a node set with the context node
// as the only member.
- return
executionContext.getXObjectFactory().createStringReference(executionContext.getNamespaceOfNode(*context));
+ return
executionContext.getXObjectFactory().createStringReference(context->getNamespaceURI());
}
}
@@ -119,7 +119,7 @@
{
assert(theList.item(0) != 0);
- return
executionContext.getXObjectFactory().createStringReference(executionContext.getNamespaceOfNode(*theList.item(0)));
+ return
executionContext.getXObjectFactory().createStringReference(theList.item(0)->getNamespaceURI());
}
}
1.9 +0 -1 xml-xalan/c/src/XPath/NodeRefListBase.hpp
Index: NodeRefListBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/NodeRefListBase.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NodeRefListBase.hpp 2000/12/04 20:46:17 1.8
+++ NodeRefListBase.hpp 2001/01/08 18:28:22 1.9
@@ -71,7 +71,6 @@
class XalanNode;
-class XPathSupport;
1.12 +0 -1 xml-xalan/c/src/XPath/QName.hpp
Index: QName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/QName.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QName.hpp 2000/11/27 19:46:23 1.11
+++ QName.hpp 2001/01/08 18:28:22 1.12
@@ -83,7 +83,6 @@
class XalanElement;
class PrefixResolver;
class XPathEnvSupport;
-class XPathSupport;
1.2 +3 -3 xml-xalan/c/src/XPath/QNameByValue.cpp
Index: QNameByValue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/QNameByValue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- QNameByValue.cpp 2000/11/27 19:46:27 1.1
+++ QNameByValue.cpp 2001/01/08 18:28:22 1.2
@@ -64,12 +64,12 @@
#include <DOMSupport/DOMServices.hpp>
+#include <DOMSupport/DOMSupport.hpp>
#include "ElementPrefixResolverProxy.hpp"
#include "PrefixResolver.hpp"
-#include "XPathSupport.hpp"
@@ -139,11 +139,11 @@
const XalanDOMString& qname,
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const XPathSupport& support) :
+ const DOMSupport& domSupport) :
m_namespace(),
m_localpart()
{
- ElementPrefixResolverProxy theProxy(namespaceContext, envSupport,
support);
+ ElementPrefixResolverProxy theProxy(namespaceContext, envSupport,
domSupport);
resolvePrefix(qname, theProxy);
}
1.3 +8 -4 xml-xalan/c/src/XPath/QNameByValue.hpp
Index: QNameByValue.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/QNameByValue.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QNameByValue.hpp 2000/12/21 04:42:44 1.2
+++ QNameByValue.hpp 2001/01/08 18:28:23 1.3
@@ -69,6 +69,10 @@
+class DOMSupport;
+
+
+
class XALAN_XPATH_EXPORT QNameByValue : public QName
{
public:
@@ -130,16 +134,16 @@
* Construct a QNameByValue from a string, resolving the prefix using
the given
* namespace context. The default namespace is not resolved.
*
- * @param qname QName string
+ * @param qname QName string
* @param namespaceContext context object for namespace resolution
- * @param envSupport XPath environment support class instance
- * @param support XPath support class instance
+ * @param envSupport XPathEnvSupport class instance
+ * @param domSupport DOMSupport class instance
*/
QNameByValue(
const XalanDOMString& qname,
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
- const XPathSupport& support);
+ const DOMSupport& domSupport);
/**
* Construct a QNameByValue from a string, resolving the prefix using
the given
1.11 +0 -4 xml-xalan/c/src/XPath/ResultTreeFrag.hpp
Index: ResultTreeFrag.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ResultTreeFrag.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ResultTreeFrag.hpp 2000/11/02 01:45:59 1.10
+++ ResultTreeFrag.hpp 2001/01/08 18:28:23 1.11
@@ -77,10 +77,6 @@
-class XPathSupport;
-
-
-
/**
* The holder of result tree fragments.
*/
1.39 +0 -1 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XPath.cpp 2001/01/03 19:32:40 1.38
+++ XPath.cpp 2001/01/08 18:28:24 1.39
@@ -82,7 +82,6 @@
#include "XObject.hpp"
#include "XObjectFactory.hpp"
#include "XPathEnvSupport.hpp"
-#include "XPathSupport.hpp"
1.33 +0 -27 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- XPathExecutionContext.hpp 2001/01/03 19:32:40 1.32
+++ XPathExecutionContext.hpp 2001/01/08 18:28:24 1.33
@@ -187,16 +187,6 @@
createNodeSet(XalanNode& theNode) = 0;
/**
- * Tell if the node is ignorable whitespace. This should be in the DOM.
- * Return false if the parser doesn't handle this.
- *
- * @param node text node queried
- * @return true if white space can be ignored
- */
- virtual bool
- isIgnorableWhitespace(const XalanText& node) const = 0;
-
- /**
* Determine if a node is after another node, in document order.
*
* @param node1 The first node
@@ -209,15 +199,6 @@
const XalanNode& node2) const = 0;
/**
- * Retrieve namespace corresponding to a DOM node
- *
- * @param theNode DOM node whose namespace is queried
- * @return namespace corresponding to 'theNode'
- */
- virtual const XalanDOMString&
- getNamespaceOfNode(const XalanNode& theNode) const = 0;
-
- /**
* Retrieve node list for current context.
*
* @return node list
@@ -504,14 +485,6 @@
*/
virtual MutableNodeRefList*
createMutableNodeRefList() const = 0;
-
- /**
- * Tells if namespaces should be supported. For optimization purposes.
- *
- * @return true if namespaces supported
- */
- virtual bool
- getProcessNamespaces() const = 0;
/**
* Given a valid element key, return the corresponding node list.
1.30 +9 -30 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XPathExecutionContextDefault.cpp 2001/01/03 19:32:41 1.29
+++ XPathExecutionContextDefault.cpp 2001/01/08 18:28:24 1.30
@@ -66,12 +66,15 @@
+#include <DOMSupport/DOMSupport.hpp>
+
+
+
#include "FoundIndex.hpp"
#include "XObjectFactory.hpp"
#include "PrefixResolver.hpp"
#include "QName.hpp"
#include "XPathEnvSupport.hpp"
-#include "XPathSupport.hpp"
@@ -81,14 +84,14 @@
XPathExecutionContextDefault::XPathExecutionContextDefault(
XPathEnvSupport& theXPathEnvSupport,
- XPathSupport& theXPathSupport,
+ DOMSupport& theDOMSupport,
XObjectFactory& theXObjectFactory,
XalanNode* theCurrentNode,
const NodeRefListBase* theContextNodeList,
const PrefixResolver* thePrefixResolver) :
XPathExecutionContext(),
m_xpathEnvSupport(theXPathEnvSupport),
- m_xpathSupport(theXPathSupport),
+ m_domSupport(theDOMSupport),
m_xobjectFactory(theXObjectFactory),
m_currentNode(theCurrentNode),
m_contextNodeList(theContextNodeList == 0 ? &s_dummyList :
theContextNodeList),
@@ -125,7 +128,7 @@
XPathExecutionContextDefault::reset()
{
m_xpathEnvSupport.reset();
- m_xpathSupport.reset();
+ m_domSupport.reset();
m_xobjectFactory.reset();
while (m_busyCachedNodeLists.size() != 0)
@@ -178,31 +181,15 @@
bool
-XPathExecutionContextDefault::isIgnorableWhitespace(const XalanText& node)
const
-{
- return m_xpathSupport.isIgnorableWhitespace(node);
-}
-
-
-
-bool
XPathExecutionContextDefault::isNodeAfter(
const XalanNode& node1,
const XalanNode& node2) const
{
- return m_xpathSupport.isNodeAfter(node1, node2);
+ return m_domSupport.isNodeAfter(node1, node2);
}
-const XalanDOMString&
-XPathExecutionContextDefault::getNamespaceOfNode(const XalanNode&
theNode) const
-{
- return m_xpathSupport.getNamespaceOfNode(theNode);
-}
-
-
-
const NodeRefListBase&
XPathExecutionContextDefault::getContextNodeList() const
{
@@ -383,14 +370,6 @@
-bool
-XPathExecutionContextDefault::getProcessNamespaces() const
-{
- return m_xpathSupport.getProcessNamespaces();
-}
-
-
-
void
XPathExecutionContextDefault::getNodeSetByKey(
XalanNode* /* doc */,
@@ -458,7 +437,7 @@
const XalanDOMString& theName,
const XalanDocument& theDocument) const
{
- return m_xpathSupport.getUnparsedEntityURI(theName, theDocument);
+ return m_domSupport.getUnparsedEntityURI(theName, theDocument);
}
1.30 +5 -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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XPathExecutionContextDefault.hpp 2001/01/03 19:32:41 1.29
+++ XPathExecutionContextDefault.hpp 2001/01/08 18:28:24 1.30
@@ -91,6 +91,7 @@
class XPathEnvSupport;
+class DOMSupport;
@@ -104,8 +105,8 @@
/**
* Construct an XPathExecutionContextDefault object
*
- * @param theXpathEnvSupport XPath environment support class instance
- * @param theXPathSupport XPath support class instance
+ * @param theXPathEnvSupport XPathEnvSupport class instance
+ * @param theDOMSupport DOMSupport class instance
* @param theXobjectFactory factory class instance for XObjects
* @param theCurrentNode current node in the source tree
* @param theContextNodeList node list for current context
@@ -113,7 +114,7 @@
*/
XPathExecutionContextDefault(
XPathEnvSupport& theXPathEnvSupport,
- XPathSupport& theXPathSupport,
+ DOMSupport& theDOMSupport,
XObjectFactory& theXObjectFactory,
XalanNode* theCurrentNode
= 0,
const NodeRefListBase* theContextNodeList = 0,
@@ -141,16 +142,10 @@
createNodeSet(XalanNode& theNode);
virtual bool
- isIgnorableWhitespace(const XalanText& node) const;
-
- virtual bool
isNodeAfter(
const XalanNode& node1,
const XalanNode& node2) const;
- virtual const XalanDOMString&
- getNamespaceOfNode(const XalanNode& theNode) const;
-
virtual const NodeRefListBase&
getContextNodeList() const;
@@ -208,9 +203,6 @@
virtual bool
releaseCachedString(XalanDOMString& theString);
- virtual bool
- getProcessNamespaces() const;
-
virtual void
getNodeSetByKey(
XalanNode* doc,
@@ -314,7 +306,7 @@
XPathEnvSupport& m_xpathEnvSupport;
- XPathSupport& m_xpathSupport;
+ DOMSupport& m_domSupport;
XObjectFactory& m_xobjectFactory;
1.28 +0 -1 xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
Index: XPathProcessorImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XPathProcessorImpl.cpp 2000/11/21 21:08:39 1.27
+++ XPathProcessorImpl.cpp 2001/01/08 18:28:25 1.28
@@ -76,7 +76,6 @@
#include "XPathEnvSupport.hpp"
#include "XPathExecutionContext.hpp"
#include "XPathParserException.hpp"
-#include "XPathSupport.hpp"
1.17 +0 -1 xml-xalan/c/src/XPath/XResultTreeFrag.cpp
Index: XResultTreeFrag.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XResultTreeFrag.cpp 2000/12/05 19:12:34 1.16
+++ XResultTreeFrag.cpp 2001/01/08 18:28:26 1.17
@@ -76,7 +76,6 @@
#include "NodeRefListBase.hpp"
#include "ResultTreeFragBase.hpp"
#include "XObjectTypeCallback.hpp"
-#include "XPathSupport.hpp"
1.17 +0 -1 xml-xalan/c/src/XPath/XResultTreeFrag.hpp
Index: XResultTreeFrag.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XResultTreeFrag.hpp 2000/12/05 19:12:35 1.16
+++ XResultTreeFrag.hpp 2001/01/08 18:28:26 1.17
@@ -85,7 +85,6 @@
class ResultTreeFragBase;
-class XPathSupport;
class XResultTreeFrag;
