You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/08/18 00:47:18 UTC
cvs commit: xml-xerces/c/src/parsers DOMParser.cpp
lehors 00/08/17 15:47:18
Modified: c/src/dom AttrImpl.cpp AttrNSImpl.cpp CharacterDataImpl.cpp
ChildNode.cpp CommonParentNode.cpp
CommonParentNode.hpp DocumentImpl.cpp
ElementImpl.cpp ElementNSImpl.cpp EntityImpl.cpp
EntityReferenceImpl.cpp NamedNodeMapImpl.cpp
NodeImpl.cpp NodeImpl.hpp NotationImpl.cpp
ProcessingInstructionImpl.cpp RangeImpl.cpp
TextImpl.cpp
c/src/parsers DOMParser.cpp
Log:
small cleanup: renamed a set of boolean flag methods
yes, I know, I also wish I got them right in the first place...
Revision Changes Path
1.21 +15 -15 xml-xerces/c/src/dom/AttrImpl.cpp
Index: AttrImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/AttrImpl.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AttrImpl.cpp 2000/07/05 23:06:51 1.20
+++ AttrImpl.cpp 2000/08/17 22:47:07 1.21
@@ -55,7 +55,7 @@
*/
/*
- * $Id: AttrImpl.cpp,v 1.20 2000/07/05 23:06:51 jpolast Exp $
+ * $Id: AttrImpl.cpp,v 1.21 2000/08/17 22:47:07 lehors Exp $
*/
#include "AttrImpl.hpp"
@@ -71,7 +71,7 @@
: ParentNode (ownerDoc)
{
name = aName.clone();
- specified(true);
+ isSpecified(true);
};
AttrImpl::AttrImpl(const AttrImpl &other, bool deep)
@@ -79,14 +79,14 @@
{
name = other.name.clone();
- if (other.specified())
- specified(true);
+ if (other.isSpecified())
+ isSpecified(true);
else
- specified(false);
+ isSpecified(false);
- if (other.idAttr())
+ if (other.isIdAttr())
{
- idAttr(true);
+ isIdAttr(true);
this->getOwnerDocument()->getNodeIDMap()->add(this);
}
@@ -128,7 +128,7 @@
bool AttrImpl::getSpecified()
{
- return specified();
+ return isSpecified();
};
@@ -173,14 +173,14 @@
void AttrImpl::setSpecified(bool arg)
{
- specified(arg);
+ isSpecified(arg);
};
void AttrImpl::setValue(const DOMString &val)
{
- if (readOnly())
+ if (isReadOnly())
{
throw DOM_DOMException
(
@@ -192,7 +192,7 @@
// then put it back in with the new name. For now, we don't worry
// about what happens if the new name conflicts
//
- if (idAttr())
+ if (isIdAttr())
this->getOwnerDocument()->getNodeIDMap()->remove(this);
NodeImpl *kid;
@@ -205,10 +205,10 @@
if (val != null) // Create and add the new one
appendChild(ownerDocument->createTextNode(val));
- specified(true);
+ isSpecified(true);
changed();
- if (idAttr())
+ if (isIdAttr())
this->getOwnerDocument()->getNodeIDMap()->add(this);
};
@@ -233,7 +233,7 @@
{
// if we have an owner, ownerNode is our ownerElement, otherwise it's
// our ownerDocument and we don't have an ownerElement
- return (ElementImpl *) (owned() ? ownerNode : null);
+ return (ElementImpl *) (isOwned() ? ownerNode : null);
}
@@ -241,5 +241,5 @@
void AttrImpl::setOwnerElement(ElementImpl *ownerElem)
{
ownerNode = ownerElem;
- owned(false);
+ isOwned(false);
}
1.7 +2 -2 xml-xerces/c/src/dom/AttrNSImpl.cpp
Index: AttrNSImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/AttrNSImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AttrNSImpl.cpp 2000/07/25 22:33:59 1.6
+++ AttrNSImpl.cpp 2000/08/17 22:47:07 1.7
@@ -55,7 +55,7 @@
*/
/*
- * $Id: AttrNSImpl.cpp,v 1.6 2000/07/25 22:33:59 aruna1 Exp $
+ * $Id: AttrNSImpl.cpp,v 1.7 2000/08/17 22:47:07 lehors Exp $
*/
#include <util/XMLUniDefs.hpp>
@@ -143,7 +143,7 @@
DOMString xmlns = NodeImpl::getXmlnsString();
DOMString xmlnsURI = NodeImpl::getXmlnsURIString();
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
if (namespaceURI == null || localName.equals(xmlns))
1.15 +7 -7 xml-xerces/c/src/dom/CharacterDataImpl.cpp
Index: CharacterDataImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/CharacterDataImpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CharacterDataImpl.cpp 2000/07/28 01:33:30 1.14
+++ CharacterDataImpl.cpp 2000/08/17 22:47:08 1.15
@@ -55,7 +55,7 @@
*/
/*
- * $Id: CharacterDataImpl.cpp,v 1.14 2000/07/28 01:33:30 aruna1 Exp $
+ * $Id: CharacterDataImpl.cpp,v 1.15 2000/08/17 22:47:08 lehors Exp $
*/
#include "CharacterDataImpl.hpp"
@@ -90,7 +90,7 @@
void CharacterDataImpl::setNodeValue(const DOMString &value)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
data = value.clone();
@@ -112,7 +112,7 @@
void CharacterDataImpl::appendData(const DOMString &dat)
{
- if(readOnly())
+ if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -122,7 +122,7 @@
void CharacterDataImpl::deleteData(unsigned int offset, unsigned int count)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -173,7 +173,7 @@
void CharacterDataImpl::insertData(unsigned int offset, const DOMString &dat)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -188,7 +188,7 @@
void CharacterDataImpl::replaceData(unsigned int offset, unsigned int count,
const DOMString &dat)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
deleteData(offset, count);
@@ -200,7 +200,7 @@
void CharacterDataImpl::setData(const DOMString &arg)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
data = arg.clone();
1.2 +4 -4 xml-xerces/c/src/dom/ChildNode.cpp
Index: ChildNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/ChildNode.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChildNode.cpp 2000/04/27 02:52:42 1.1
+++ ChildNode.cpp 2000/08/17 22:47:08 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ChildNode.cpp,v 1.1 2000/04/27 02:52:42 lehors Exp $
+ * $Id: ChildNode.cpp,v 1.2 2000/08/17 22:47:08 lehors Exp $
*/
// This class only adds the ability to have siblings
@@ -77,7 +77,7 @@
// Need to break the association w/ original siblings and parent
this->previousSibling = null;
this->nextSibling = null;
- firstChild(false);
+ isFirstChild(false);
};
ChildNode::~ChildNode() {
@@ -100,11 +100,11 @@
{
// if we have an owner, ownerNode is our parent, otherwise it's
// our ownerDocument and we don't have a parent
- return owned() ? ownerNode : null;
+ return isOwned() ? ownerNode : null;
};
NodeImpl * ChildNode::getPreviousSibling() {
// if we are the firstChild, previousSibling actually refers to our
// parent's lastChild, but we hide that
- return firstChild() ? null : previousSibling;
+ return isFirstChild() ? null : previousSibling;
};
1.4 +9 -9 xml-xerces/c/src/dom/CommonParentNode.cpp
Index: CommonParentNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/CommonParentNode.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CommonParentNode.cpp 2000/07/28 01:33:30 1.3
+++ CommonParentNode.cpp 2000/08/17 22:47:08 1.4
@@ -55,7 +55,7 @@
*/
/*
- * $Id: CommonParentNode.cpp,v 1.3 2000/07/28 01:33:30 aruna1 Exp $
+ * $Id: CommonParentNode.cpp,v 1.4 2000/08/17 22:47:08 lehors Exp $
*/
@@ -174,7 +174,7 @@
NodeImpl *THIS_CLASS::insertBefore(NodeImpl *newChild, NodeImpl *refChild) {
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -247,15 +247,15 @@
// Attach up
newInternal->ownerNode = this;
- newInternal->owned(true);
+ newInternal->isOwned(true);
// Attach after
newInternal->previousSibling=prev;
if (refInternal == firstChild) {
firstChild = newInternal;
if (refInternal != null)
- refInternal->firstChild(false);
- newInternal->firstChild(true);
+ refInternal->isFirstChild(false);
+ newInternal->isFirstChild(true);
} else {
prev->nextSibling = newInternal;
}
@@ -298,7 +298,7 @@
NodeImpl *THIS_CLASS::removeChild(NodeImpl *oldChild)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -329,10 +329,10 @@
if (oldInternal != firstChild)
prev->nextSibling = next;
else {
- oldInternal->firstChild(false);
+ oldInternal->isFirstChild(false);
firstChild = next;
if (next != null) {
- next->firstChild(true);
+ next->isFirstChild(true);
}
}
@@ -347,7 +347,7 @@
// Remove oldChild's references to tree
oldInternal->ownerNode = ownerDocument;
- oldInternal->owned(false);
+ oldInternal->isOwned(false);
oldInternal->nextSibling = null;
oldInternal->previousSibling = null;
1.2 +2 -2 xml-xerces/c/src/dom/CommonParentNode.hpp
Index: CommonParentNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/CommonParentNode.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CommonParentNode.hpp 2000/06/22 22:20:12 1.1
+++ CommonParentNode.hpp 2000/08/17 22:47:08 1.2
@@ -64,7 +64,7 @@
//
/*
- * $Id: CommonParentNode.hpp,v 1.1 2000/06/22 22:20:12 aruna1 Exp $
+ * $Id: CommonParentNode.hpp,v 1.2 2000/08/17 22:47:08 lehors Exp $
*/
/**
@@ -106,7 +106,7 @@
virtual NodeImpl *item(unsigned int index);
virtual NodeImpl * removeChild(NodeImpl *oldChild);
virtual NodeImpl *replaceChild(NodeImpl *newChild, NodeImpl *oldChild);
- virtual void setReadOnly(bool readOnly, bool deep);
+ virtual void setReadOnly(bool isReadOnly, bool deep);
//Introduced in DOM Level 2
virtual void normalize();
1.31 +7 -7 xml-xerces/c/src/dom/DocumentImpl.cpp
Index: DocumentImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentImpl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DocumentImpl.cpp 2000/07/28 01:33:31 1.30
+++ DocumentImpl.cpp 2000/08/17 22:47:09 1.31
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DocumentImpl.cpp,v 1.30 2000/07/28 01:33:31 aruna1 Exp $
+ * $Id: DocumentImpl.cpp,v 1.31 2000/08/17 22:47:09 lehors Exp $
*/
//
@@ -555,7 +555,7 @@
break;
case DOM_Node::ENTITY_REFERENCE_NODE :
newnode = createEntityReference(source->getNodeName());
- newnode -> readOnly(false); //allow deep import temporarily
+ newnode -> isReadOnly(false); //allow deep import temporarily
break;
case DOM_Node::ENTITY_NODE :
{
@@ -566,7 +566,7 @@
newentity->setNotationName(srcentity->getNotationName());
// Kids carry additional value
newnode=newentity;
- newentity->readOnly(false);// allow deep import temporarily
+ newentity->isReadOnly(false);// allow deep import temporarily
}
break;
case DOM_Node::PROCESSING_INSTRUCTION_NODE :
@@ -636,7 +636,7 @@
}
if (newnode->getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE
|| newnode->getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE)
- newnode->readOnly(true);
+ newnode->isReadOnly(true);
return newnode;
};
@@ -805,14 +805,14 @@
void* DocumentImpl::getUserData()
{
- return (userdata()) ? getUserData(this) : null;
+ return (hasUserData()) ? getUserData(this) : null;
}
void DocumentImpl::setUserData(void* val)
{
setUserData(this, val);
if (val)
- userdata(true);
+ hasUserData(true);
else
- userdata(false);
+ hasUserData(false);
};
1.26 +8 -8 xml-xerces/c/src/dom/ElementImpl.cpp
Index: ElementImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/ElementImpl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElementImpl.cpp 2000/07/05 23:16:10 1.25
+++ ElementImpl.cpp 2000/08/17 22:47:09 1.26
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ElementImpl.cpp,v 1.25 2000/07/05 23:16:10 jpolast Exp $
+ * $Id: ElementImpl.cpp,v 1.26 2000/08/17 22:47:09 lehors Exp $
*/
#include "DeepNodeListImpl.hpp"
@@ -174,7 +174,7 @@
void ElementImpl::removeAttribute(const DOMString &nam)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -195,7 +195,7 @@
AttrImpl *ElementImpl::removeAttributeNode(AttrImpl *oldAttr)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -220,7 +220,7 @@
AttrImpl *ElementImpl::setAttribute(const DOMString &nam, const DOMString &val)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -243,7 +243,7 @@
AttrImpl * ElementImpl::setAttributeNode(AttrImpl *newAttr)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -296,7 +296,7 @@
AttrImpl *ElementImpl::setAttributeNS(const DOMString &fNamespaceURI,
const DOMString &qualifiedName, const DOMString &fValue)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -319,7 +319,7 @@
void ElementImpl::removeAttributeNS(const DOMString &fNamespaceURI,
const DOMString &fLocalName)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
@@ -346,7 +346,7 @@
AttrImpl *ElementImpl::setAttributeNodeNS(AttrImpl *newAttr)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
1.7 +2 -2 xml-xerces/c/src/dom/ElementNSImpl.cpp
Index: ElementNSImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/ElementNSImpl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElementNSImpl.cpp 2000/07/25 22:34:00 1.6
+++ ElementNSImpl.cpp 2000/08/17 22:47:09 1.7
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ElementNSImpl.cpp,v 1.6 2000/07/25 22:34:00 aruna1 Exp $
+ * $Id: ElementNSImpl.cpp,v 1.7 2000/08/17 22:47:09 lehors Exp $
*/
#include <util/XMLUniDefs.hpp>
@@ -137,7 +137,7 @@
DOMString xmlns = NodeImpl::getXmlnsString();
DOMString xmlnsURI = NodeImpl::getXmlnsURIString();
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
if(prefix != null && !DocumentImpl::isXMLName(prefix))
1.13 +3 -3 xml-xerces/c/src/dom/EntityImpl.cpp
Index: EntityImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/EntityImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EntityImpl.cpp 2000/04/27 02:52:43 1.12
+++ EntityImpl.cpp 2000/08/17 22:47:10 1.13
@@ -55,7 +55,7 @@
*/
/*
- * $Id: EntityImpl.cpp,v 1.12 2000/04/27 02:52:43 lehors Exp $
+ * $Id: EntityImpl.cpp,v 1.13 2000/08/17 22:47:10 lehors Exp $
*/
#include "DOM_DOMException.hpp"
@@ -69,7 +69,7 @@
{
name = eName.clone();
- readOnly(true);
+ isReadOnly(true);
};
@@ -83,7 +83,7 @@
systemId = other.systemId.clone();
notationName = other.notationName.clone();
refEntity = other.refEntity;
- readOnly(true);
+ isReadOnly(true);
};
1.14 +3 -3 xml-xerces/c/src/dom/EntityReferenceImpl.cpp
Index: EntityReferenceImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/EntityReferenceImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EntityReferenceImpl.cpp 2000/04/27 02:52:44 1.13
+++ EntityReferenceImpl.cpp 2000/08/17 22:47:10 1.14
@@ -55,7 +55,7 @@
*/
/*
- * $Id: EntityReferenceImpl.cpp,v 1.13 2000/04/27 02:52:44 lehors Exp $
+ * $Id: EntityReferenceImpl.cpp,v 1.14 2000/08/17 22:47:10 lehors Exp $
*/
/**
@@ -127,7 +127,7 @@
name = entityName.clone();
// EntityReference behaves as a read-only node, since its contents
// reflect the Entity it refers to -- but see setNodeName().
- readOnly(true);
+ isReadOnly(true);
entityChanges=-1;
}
@@ -141,7 +141,7 @@
if (deep)
cloneChildren(other);
entityChanges = other.entityChanges;
- readOnly(true);
+ isReadOnly(true);
}
1.18 +14 -14 xml-xerces/c/src/dom/NamedNodeMapImpl.cpp
Index: NamedNodeMapImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NamedNodeMapImpl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NamedNodeMapImpl.cpp 2000/07/05 23:16:11 1.17
+++ NamedNodeMapImpl.cpp 2000/08/17 22:47:10 1.18
@@ -55,7 +55,7 @@
*/
/*
- * $Id: NamedNodeMapImpl.cpp,v 1.17 2000/07/05 23:16:11 jpolast Exp $
+ * $Id: NamedNodeMapImpl.cpp,v 1.18 2000/08/17 22:47:10 lehors Exp $
*/
#include "NamedNodeMapImpl.hpp"
@@ -111,9 +111,9 @@
for (unsigned int i = 0; i < nodes->size(); ++i)
{
NodeImpl *n = nodes->elementAt(i)->cloneNode(true);
- n->specified(nodes->elementAt(i)->specified());
+ n->isSpecified(nodes->elementAt(i)->isSpecified());
n->ownerNode = ownerNod;
- n->owned(true);
+ n->isOwned(true);
newmap->nodes->addElement(n);
}
}
@@ -143,7 +143,7 @@
{
NodeImpl *n = nodes->elementAt(i);
n->ownerNode = ownerNode->getOwnerDocument();
- n->owned(false);
+ n->isOwned(false);
if (n->nodeRefCount == 0)
NodeImpl::deleteIf(n);
}
@@ -241,7 +241,7 @@
n = (NodeImpl *) (nodes->elementAt(i));
nodes->removeElementAt(i);
n->ownerNode = ownerNode->getOwnerDocument();
- n->owned(false);
+ n->isOwned(false);
return n;
};
@@ -268,11 +268,11 @@
throw DOM_DOMException(DOM_DOMException::WRONG_DOCUMENT_ERR,null);
if (readOnly)
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
- if (arg->owned())
+ if (arg->isOwned())
throw DOM_DOMException(DOM_DOMException::INUSE_ATTRIBUTE_ERR,null);
arg->ownerNode = ownerNode;
- arg->owned(true);
+ arg->isOwned(true);
int i=findNamePoint(arg->getNodeName());
NodeImpl * previous=null;
if(i>=0)
@@ -289,7 +289,7 @@
}
if (previous != null) {
previous->ownerNode = ownerNode->getOwnerDocument();
- previous->owned(false);
+ previous->isOwned(false);
}
return previous;
@@ -355,11 +355,11 @@
throw DOM_DOMException(DOM_DOMException::WRONG_DOCUMENT_ERR,null);
if (readOnly)
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
- if (arg->owned())
+ if (arg->isOwned())
throw DOM_DOMException(DOM_DOMException::INUSE_ATTRIBUTE_ERR,null);
arg->ownerNode = ownerNode;
- arg->owned(true);
+ arg->isOwned(true);
int i=findNamePoint(arg->getNamespaceURI(), arg->getLocalName());
NodeImpl *previous=null;
if(i>=0) {
@@ -373,7 +373,7 @@
}
if (previous != null) {
previous->ownerNode = ownerNode->getOwnerDocument();
- previous->owned(false);
+ previous->isOwned(false);
}
return previous;
@@ -398,7 +398,7 @@
NodeImpl * n = nodes -> elementAt(i);
nodes -> removeElementAt(i); //remove n from nodes
n->ownerNode = ownerNode->getOwnerDocument();
- n->owned(false);
+ n->isOwned(false);
return n;
}
@@ -425,9 +425,9 @@
{
NodeImpl *n = srcmap->nodes->elementAt(i);
NodeImpl *clone = n->cloneNode(true);
- clone->specified(n->specified());
+ clone->isSpecified(n->isSpecified());
clone->ownerNode = ownerNode;
- clone->owned(true);
+ clone->isOwned(true);
nodes->addElement(clone);
// n = null;
// clone = null;
1.30 +15 -15 xml-xerces/c/src/dom/NodeImpl.cpp
Index: NodeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NodeImpl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- NodeImpl.cpp 2000/07/07 23:51:49 1.29
+++ NodeImpl.cpp 2000/08/17 22:47:10 1.30
@@ -55,7 +55,7 @@
*/
/*
- * $Id: NodeImpl.cpp,v 1.29 2000/07/07 23:51:49 jpolast Exp $
+ * $Id: NodeImpl.cpp,v 1.30 2000/08/17 22:47:10 lehors Exp $
*/
// This class doesn't support having any children, and implements the behavior
@@ -108,7 +108,7 @@
NodeImpl::NodeImpl(const NodeImpl &other) {
this->flags = other.flags;
this->userData = other.userData;
- this->readOnly(false);
+ this->isReadOnly(false);
this->nodeRefCount = 0;
NodeImpl::gLiveNodeImpls++;
@@ -117,7 +117,7 @@
// Need to break the association w/ original parent
// this->ownerNode = other.getOwnerDocument(); this doesn't work???
this->ownerNode = ((NodeImpl*)&other)->getOwnerDocument();
- this->owned(false);
+ this->isOwned(false);
};
@@ -127,7 +127,7 @@
NodeImpl::~NodeImpl() {
- if (userdata())
+ if (hasUserData())
{
setUserData(null);
}
@@ -175,7 +175,7 @@
if (thisNode == 0)
return;
- if (thisNode->owned())
+ if (thisNode->isOwned())
return;
// Delete this node. There should be no siblings, as the DOM
@@ -189,13 +189,13 @@
// children. This is because the Attr's children Text nodes
// contain the attr's value, which is the hash table key.
//
- if (thisNode->isAttrImpl() && ((AttrImpl *)thisNode->idAttr()))
+ if (thisNode->isAttrImpl() && ((AttrImpl *)thisNode->isIdAttr()))
{
((AttrImpl *)thisNode)->getOwnerDocument() ->
getNodeIDMap()->remove((AttrImpl *)thisNode);
}
- thisNode->readOnly(false); // removeChild requires node not be readonly.
+ thisNode->isReadOnly(false); // removeChild requires node not be readonly.
NodeImpl *theNextChild;
for (NodeImpl *child = thisNode->getFirstChild(); child != 0;
child=theNextChild)
@@ -253,7 +253,7 @@
{
// if we have an owner simply forward the request
// otherwise ownerNode is our ownerDocument
- if (owned()) {
+ if (isOwned()) {
return ownerNode->getDocument();
} else {
return (DocumentImpl *) ownerNode;
@@ -265,7 +265,7 @@
{
// if we have an owner simply forward the request
// otherwise ownerNode is our ownerDocument
- if (owned()) {
+ if (isOwned()) {
return ownerNode->getDocument();
} else {
return (DocumentImpl *) ownerNode;
@@ -276,7 +276,7 @@
void NodeImpl::setOwnerDocument(DocumentImpl *doc) {
// if we have an owner we rely on it to have it right
// otherwise ownerNode is our ownerDocument
- if (!owned()) {
+ if (!isOwned()) {
ownerNode = doc;
}
}
@@ -295,7 +295,7 @@
void *NodeImpl::getUserData()
{
- return (userdata()) ? getOwnerDocument()->getUserData(this) : null;
+ return (hasUserData()) ? getOwnerDocument()->getUserData(this) : null;
};
@@ -357,7 +357,7 @@
void NodeImpl::setNodeValue(const DOMString &val)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
// Default behavior is to do nothing, overridden in some subclasses
@@ -367,7 +367,7 @@
void NodeImpl::setReadOnly(bool readOnl, bool deep)
{
- this->readOnly(readOnl);
+ this->isReadOnly(readOnl);
// by default we do not have children, so deep is meaningless
// this is overridden by ParentNode
}
@@ -377,9 +377,9 @@
{
getOwnerDocument()->setUserData(this, val);
if (val)
- userdata(true);
+ hasUserData(true);
else
- userdata(false);
+ hasUserData(false);
};
1.21 +17 -17 xml-xerces/c/src/dom/NodeImpl.hpp
Index: NodeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NodeImpl.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NodeImpl.hpp 2000/07/07 23:51:49 1.20
+++ NodeImpl.hpp 2000/08/17 22:47:11 1.21
@@ -58,7 +58,7 @@
*/
/*
- * $Id: NodeImpl.hpp,v 1.20 2000/07/07 23:51:49 jpolast Exp $
+ * $Id: NodeImpl.hpp,v 1.21 2000/08/17 22:47:11 lehors Exp $
*/
//
@@ -208,51 +208,51 @@
* Flags setters and getters
*/
- inline bool readOnly() const {
+ inline bool isReadOnly() const {
return (flags & READONLY) != 0;
}
- inline void readOnly(bool value) {
+ inline void isReadOnly(bool value) {
flags = (value ? flags | READONLY : flags & ~READONLY);
}
- inline bool syncData() const {
+ inline bool needsSyncData() const {
return (flags & SYNCDATA) != 0;
}
- inline void syncData(bool value) {
+ inline void needsSyncData(bool value) {
flags = (value ? flags | SYNCDATA : flags & ~SYNCDATA);
}
- inline bool syncChildren() const {
+ inline bool needsSyncChildren() const {
return (flags & SYNCCHILDREN) != 0;
}
- inline void syncChildren(bool value) {
+ inline void needsSyncChildren(bool value) {
flags = (value ? flags | SYNCCHILDREN : flags & ~SYNCCHILDREN);
}
- inline bool owned() const {
+ inline bool isOwned() const {
return (flags & OWNED) != 0;
}
- inline void owned(bool value) {
+ inline void isOwned(bool value) {
flags = (value ? flags | OWNED : flags & ~OWNED);
}
- inline bool firstChild() const {
+ inline bool isFirstChild() const {
return (flags & FIRSTCHILD) != 0;
}
- inline void firstChild(bool value) {
+ inline void isFirstChild(bool value) {
flags = (value ? flags | FIRSTCHILD : flags & ~FIRSTCHILD);
}
- inline bool specified() const {
+ inline bool isSpecified() const {
return (flags & SPECIFIED) != 0;
}
- inline void specified(bool value) {
+ inline void isSpecified(bool value) {
flags = (value ? flags | SPECIFIED : flags & ~SPECIFIED);
}
@@ -272,19 +272,19 @@
flags = (value ? flags | SETVALUE : flags & ~SETVALUE);
}
- inline bool idAttr() const {
+ inline bool isIdAttr() const {
return (flags & ID_ATTR) != 0;
}
- inline void idAttr(bool value) {
+ inline void isIdAttr(bool value) {
flags = (value ? flags | ID_ATTR : flags & ~ID_ATTR);
}
- inline bool userdata() const {
+ inline bool hasUserData() const {
return (flags & USERDATA) != 0;
}
- inline void userdata(bool value) {
+ inline void hasUserData(bool value) {
flags = (value ? flags | USERDATA : flags & ~USERDATA);
}
};
1.11 +3 -3 xml-xerces/c/src/dom/NotationImpl.cpp
Index: NotationImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NotationImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NotationImpl.cpp 2000/04/27 02:52:45 1.10
+++ NotationImpl.cpp 2000/08/17 22:47:11 1.11
@@ -55,7 +55,7 @@
*/
/*
- * $Id: NotationImpl.cpp,v 1.10 2000/04/27 02:52:45 lehors Exp $
+ * $Id: NotationImpl.cpp,v 1.11 2000/08/17 22:47:11 lehors Exp $
*/
#include "NotationImpl.hpp"
@@ -147,7 +147,7 @@
void NotationImpl::setPublicId(const DOMString &arg)
{
- if(readOnly())
+ if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
@@ -157,7 +157,7 @@
void NotationImpl::setSystemId(const DOMString &arg)
{
- if(readOnly())
+ if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
1.11 +3 -3 xml-xerces/c/src/dom/ProcessingInstructionImpl.cpp
Index: ProcessingInstructionImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/ProcessingInstructionImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ProcessingInstructionImpl.cpp 2000/05/02 19:22:02 1.10
+++ ProcessingInstructionImpl.cpp 2000/08/17 22:47:11 1.11
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ProcessingInstructionImpl.cpp,v 1.10 2000/05/02 19:22:02 aruna1 Exp $
+ * $Id: ProcessingInstructionImpl.cpp,v 1.11 2000/08/17 22:47:11 lehors Exp $
*/
#include "ProcessingInstructionImpl.hpp"
@@ -114,7 +114,7 @@
void ProcessingInstructionImpl::setNodeValue(const DOMString &value)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
data = value.clone();
@@ -151,7 +151,7 @@
*/
void ProcessingInstructionImpl::setData(const DOMString &arg)
{
- if (readOnly())
+ if (isReadOnly())
throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,
null);
data = arg.clone();
1.5 +4 -4 xml-xerces/c/src/dom/RangeImpl.cpp
Index: RangeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/RangeImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RangeImpl.cpp 2000/08/10 01:16:33 1.4
+++ RangeImpl.cpp 2000/08/17 22:47:11 1.5
@@ -55,7 +55,7 @@
*/
/*
- * $Id: RangeImpl.cpp,v 1.4 2000/08/10 01:16:33 aruna1 Exp $
+ * $Id: RangeImpl.cpp,v 1.5 2000/08/17 22:47:11 lehors Exp $
*/
#include <util/RefVectorOf.hpp>
@@ -766,7 +766,7 @@
{
if (newNode == null) return; //don't have to do anything
- if (fStartContainer.getParentNode().fImpl->readOnly()) {
+ if (fStartContainer.getParentNode().fImpl->isReadOnly()) {
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
@@ -1374,7 +1374,7 @@
if ((start == null) || (end == null) ) return;
//if both start and end are text check and return
if (start.getNodeType() == DOM_Node::TEXT_NODE) {
- if (start.fImpl->readOnly()) {
+ if (start.fImpl->isReadOnly()) {
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
@@ -1403,7 +1403,7 @@
{
for(DOM_Node node=start; node != null, node !=end; node=node.getNextSibling())
{
- if (node.fImpl->readOnly()) {
+ if (node.fImpl->isReadOnly()) {
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
1.14 +2 -2 xml-xerces/c/src/dom/TextImpl.cpp
Index: TextImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/TextImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TextImpl.cpp 2000/07/28 01:33:32 1.13
+++ TextImpl.cpp 2000/08/17 22:47:12 1.14
@@ -55,7 +55,7 @@
*/
/*
- * $Id: TextImpl.cpp,v 1.13 2000/07/28 01:33:32 aruna1 Exp $
+ * $Id: TextImpl.cpp,v 1.14 2000/08/17 22:47:12 lehors Exp $
*/
#include "DocumentImpl.hpp"
@@ -107,7 +107,7 @@
TextImpl *TextImpl::splitText(unsigned int offset)
{
- if (readOnly())
+ if (isReadOnly())
{
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
1.29 +12 -12 xml-xerces/c/src/parsers/DOMParser.cpp
Index: DOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/parsers/DOMParser.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- DOMParser.cpp 2000/07/25 22:32:40 1.28
+++ DOMParser.cpp 2000/08/17 22:47:17 1.29
@@ -59,7 +59,7 @@
* handler with the scanner. In these handler methods, appropriate DOM nodes
* are created and added to the DOM tree.
*
-* $Id: DOMParser.cpp,v 1.28 2000/07/25 22:32:40 aruna1 Exp $
+* $Id: DOMParser.cpp,v 1.29 2000/08/17 22:47:17 lehors Exp $
*
*/
@@ -455,13 +455,13 @@
//If the node type is entityRef then set the readOnly flag to false before appending node
bool oldReadFlag;
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- oldReadFlag = fCurrentParent.fImpl->readOnly();
- fCurrentParent.fImpl->readOnly(false);
+ oldReadFlag = fCurrentParent.fImpl->isReadOnly();
+ fCurrentParent.fImpl->isReadOnly(false);
}
fCurrentParent.appendChild(node);
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- fCurrentParent.fImpl->readOnly(oldReadFlag);
+ fCurrentParent.fImpl->isReadOnly(oldReadFlag);
}
fCurrentNode = node;
}
@@ -534,13 +534,13 @@
//If the node type is entityRef then set the readOnly flag to false before appending node
bool oldReadFlag;
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- oldReadFlag = fCurrentParent.fImpl->readOnly();
- fCurrentParent.fImpl->readOnly(false);
+ oldReadFlag = fCurrentParent.fImpl->isReadOnly();
+ fCurrentParent.fImpl->isReadOnly(false);
}
fCurrentParent.appendChild(node);
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- fCurrentParent.fImpl->readOnly(oldReadFlag);
+ fCurrentParent.fImpl->isReadOnly(oldReadFlag);
}
fCurrentNode = node;
@@ -612,7 +612,7 @@
if (docImpl->fNodeIDMap == 0)
docImpl->fNodeIDMap = new NodeIDMap(500);
docImpl->fNodeIDMap->add(attr);
- attr->idAttr(true);
+ attr->isIdAttr(true);
}
attr->setSpecified(oneAttrib->getSpecified());
@@ -634,7 +634,7 @@
if (docImpl->fNodeIDMap == 0)
docImpl->fNodeIDMap = new NodeIDMap(500);
docImpl->fNodeIDMap->add(attr);
- attr->idAttr(true);
+ attr->isIdAttr(true);
}
}
@@ -643,13 +643,13 @@
//If the node type is entityRef then set the readOnly flag to false before appending node
bool oldReadFlag;
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- oldReadFlag = fCurrentParent.fImpl->readOnly();
- fCurrentParent.fImpl->readOnly(false);
+ oldReadFlag = fCurrentParent.fImpl->isReadOnly();
+ fCurrentParent.fImpl->isReadOnly(false);
}
fCurrentParent.appendChild(elem);
if (fCurrentParent.getNodeType() == DOM_Node::ENTITY_REFERENCE_NODE) {
- fCurrentParent.fImpl->readOnly(oldReadFlag);
+ fCurrentParent.fImpl->isReadOnly(oldReadFlag);
}
fNodeStack->push(fCurrentParent);