From 16e7412dbe87deb20ad8785a2acfea76fdfc524a Mon Sep 17 00:00:00 2001
From: "Unknown (aruna1)" <dev-null@apache.org>
Date: Tue, 8 Aug 2000 01:00:37 +0000
Subject: [PATCH] detach functionality removed from TreeWalker
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172327 13f79535-47bb-0310-9956-ffa450edef68
---
src/dom/DOM_TreeWalker.cpp | 6 ++---
src/dom/DOM_TreeWalker.hpp | 18 +++----------
src/dom/TreeWalkerImpl.cpp | 53 +++++++-------------------------------
src/dom/TreeWalkerImpl.hpp | 8 +++---
4 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/src/dom/DOM_TreeWalker.cpp b/src/dom/DOM_TreeWalker.cpp
index bd728b6c9..2ce5f04b9 100644
--- a/src/dom/DOM_TreeWalker.cpp
+++ b/src/dom/DOM_TreeWalker.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2000/08/08 01:00:36 aruna1
+ * detach functionality removed from TreeWalker
+ *
* Revision 1.4 2000/03/02 19:53:58 roddey
* This checkin includes many changes done while waiting for the
* 1.1.0 code to be finished. I can't list them all here, but a list is
@@ -213,6 +216,3 @@ DOM_Node DOM_TreeWalker::nextNode() {
}
-void DOM_TreeWalker::detach () {
- fImpl->detach();
-}
diff --git a/src/dom/DOM_TreeWalker.hpp b/src/dom/DOM_TreeWalker.hpp
index 03a725dbb..0dc2bebba 100644
--- a/src/dom/DOM_TreeWalker.hpp
+++ b/src/dom/DOM_TreeWalker.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.9 2000/08/08 01:00:36 aruna1
+ * detach functionality removed from TreeWalker
+ *
* Revision 1.8 2000/02/24 20:11:29 abagchi
* Swat for removing Log from API docs
*
@@ -310,20 +313,7 @@ class CDOM_EXPORT DOM_TreeWalker {
void setCurrentNode(DOM_Node currentNode);
//@}
- /** @name Detaching functions. */
- //@{
- /**
- * Detaches the iterator from the set which it iterated over, releasing any
- * computational resources and placing the iterator in the INVALID state. After
- * <code>detach</code> has been invoked, calls to <code>nextNode</code> or
- * <code>previousNode</code> will raise the exception INVALID_STATE_ERR.
- *
- * <p><b>"Experimental - subject to change"</b></p>
- *
- */
- void detach();
- //@}
-
+
protected:
DOM_TreeWalker(TreeWalkerImpl* impl);
diff --git a/src/dom/TreeWalkerImpl.cpp b/src/dom/TreeWalkerImpl.cpp
index 83f30a754..53650c3a3 100644
--- a/src/dom/TreeWalkerImpl.cpp
+++ b/src/dom/TreeWalkerImpl.cpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.8 2000/08/08 01:00:36 aruna1
+ * detach functionality removed from TreeWalker
+ *
* Revision 1.7 2000/03/28 23:22:17 aruna1
* Modified return statements in functions to avoid warnings on HP.
*
@@ -102,7 +105,6 @@ TreeWalkerImpl::TreeWalkerImpl (
fRoot(root),
fWhatToShow(whatToShow),
fNodeFilter(nodeFilter),
- fDetached(false),
fExpandEntityReferences(expandEntityRef)
{
@@ -114,7 +116,6 @@ TreeWalkerImpl::TreeWalkerImpl (const TreeWalkerImpl& twi)
fRoot(twi.fRoot),
fWhatToShow(twi.fWhatToShow),
fNodeFilter(twi.fNodeFilter),
- fDetached(false),
fExpandEntityReferences(twi.fExpandEntityReferences)
{
}
@@ -127,19 +128,13 @@ TreeWalkerImpl& TreeWalkerImpl::operator= (const TreeWalkerImpl& twi) {
fRoot = twi.fRoot;
fWhatToShow = twi.fWhatToShow;
fNodeFilter = twi.fNodeFilter;
- fDetached = twi.fDetached;
- fExpandEntityReferences = twi.fExpandEntityReferences;
+ fExpandEntityReferences = twi.fExpandEntityReferences;
}
return *this;
}
-void TreeWalkerImpl::detach ()
-{
- fDetached = true;
-}
-
void TreeWalkerImpl::unreferenced()
{
@@ -186,8 +181,6 @@ bool TreeWalkerImpl::getExpandEntityReferences() {
/** Return the current Node. */
DOM_Node TreeWalkerImpl::getCurrentNode () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
return fCurrentNode;
}
@@ -195,8 +188,6 @@ DOM_Node TreeWalkerImpl::getCurrentNode () {
/** Return the current Node. */
void TreeWalkerImpl::setCurrentNode (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
fCurrentNode = node;
}
@@ -207,8 +198,6 @@ void TreeWalkerImpl::setCurrentNode (DOM_Node node) {
* If result is not null, set the current Node.
*/
DOM_Node TreeWalkerImpl::parentNode () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -228,8 +217,6 @@ DOM_Node TreeWalkerImpl::parentNode () {
* If result is not null, set the current Node.
*/
DOM_Node TreeWalkerImpl::firstChild () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -248,10 +235,8 @@ DOM_Node TreeWalkerImpl::firstChild () {
* If result is not null, set the current Node.
*/
DOM_Node TreeWalkerImpl::lastChild () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
-
- DOM_Node result;
+
+ DOM_Node result;
if (fCurrentNode.isNull()) return result;
@@ -269,8 +254,6 @@ DOM_Node TreeWalkerImpl::lastChild () {
*/
DOM_Node TreeWalkerImpl::previousSibling () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -290,8 +273,6 @@ DOM_Node TreeWalkerImpl::previousSibling () {
*/
DOM_Node TreeWalkerImpl::nextSibling () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -311,9 +292,7 @@ DOM_Node TreeWalkerImpl::nextSibling () {
*/
DOM_Node TreeWalkerImpl::previousNode () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
-
+
DOM_Node result;
if (fCurrentNode.isNull()) return result;
@@ -355,8 +334,6 @@ DOM_Node TreeWalkerImpl::previousNode () {
*/
DOM_Node TreeWalkerImpl::nextNode () {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -400,8 +377,6 @@ DOM_Node TreeWalkerImpl::nextNode () {
*/
DOM_Node TreeWalkerImpl::getParentNode (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -427,8 +402,6 @@ DOM_Node TreeWalkerImpl::getParentNode (DOM_Node node) {
*/
DOM_Node TreeWalkerImpl::getNextSibling (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -474,8 +447,6 @@ DOM_Node TreeWalkerImpl::getNextSibling (DOM_Node node) {
*/
DOM_Node TreeWalkerImpl::getPreviousSibling (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -520,8 +491,6 @@ DOM_Node TreeWalkerImpl::getPreviousSibling (DOM_Node node) {
*/
DOM_Node TreeWalkerImpl::getFirstChild (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
DOM_Node result;
@@ -551,9 +520,7 @@ DOM_Node TreeWalkerImpl::getFirstChild (DOM_Node node) {
*/
DOM_Node TreeWalkerImpl::getLastChild (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
-
+
DOM_Node result;
if (node.isNull()) return result;
@@ -580,9 +547,7 @@ DOM_Node TreeWalkerImpl::getLastChild (DOM_Node node) {
/** The node is accepted if it passes the whatToShow and the filter. */
short TreeWalkerImpl::acceptNode (DOM_Node node) {
- if (fDetached)
- throw DOM_DOMException(DOM_DOMException::INVALID_STATE_ERR, null);
-
+
if (fNodeFilter == 0) {
if ( ( fWhatToShow & (1 << (node.getNodeType() - 1))) != 0)
{
diff --git a/src/dom/TreeWalkerImpl.hpp b/src/dom/TreeWalkerImpl.hpp
index 8aa661cdd..ff8d43c35 100644
--- a/src/dom/TreeWalkerImpl.hpp
+++ b/src/dom/TreeWalkerImpl.hpp
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2000/08/08 01:00:37 aruna1
+ * detach functionality removed from TreeWalker
+ *
* Revision 1.5 2000/02/24 20:11:31 abagchi
* Swat for removing Log from API docs
*
@@ -109,8 +112,7 @@ class CDOM_EXPORT TreeWalkerImpl : public RefCountedImpl {
// Return the NodeFilter.
DOM_NodeFilter* getFilter ();
- void detach ();
-
+
// Return the current DOM_Node.
DOM_Node getCurrentNode ();
@@ -208,8 +210,6 @@ private:
// The expandEntity reference flag.
bool fExpandEntityReferences;
-
- bool fDetached;
};
#endif
--
GitLab