You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/05/27 20:20:10 UTC
cvs commit: xml-xerces/c/src/xercesc/dom/impl DOMNamedNodeMapImpl.cpp DOMNamedNodeMapImpl.hpp DOMNodeIDMap.cpp DOMNodeIDMap.hpp DOMNodeListImpl.cpp DOMNodeListImpl.hpp DOMNodeVector.cpp DOMNodeVector.hpp DOMParentNode.cpp DOMParentNode.hpp DOMRangeImpl.cpp DOMRangeImpl.hpp DOMTextImpl.cpp DOMTextImpl.hpp
tng 02/05/27 11:20:10
Modified: c/src/xercesc/dom/impl DOMNamedNodeMapImpl.cpp
DOMNamedNodeMapImpl.hpp DOMNodeIDMap.cpp
DOMNodeIDMap.hpp DOMNodeListImpl.cpp
DOMNodeListImpl.hpp DOMNodeVector.cpp
DOMNodeVector.hpp DOMParentNode.cpp
DOMParentNode.hpp DOMRangeImpl.cpp DOMRangeImpl.hpp
DOMTextImpl.cpp DOMTextImpl.hpp
Log:
Use XMLSize_t instead of DOMSize_t for consistency.
Revision Changes Path
1.2 +5 -5 xml-xerces/c/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp
Index: DOMNamedNodeMapImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNamedNodeMapImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNamedNodeMapImpl.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNamedNodeMapImpl.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMNamedNodeMapImpl.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNamedNodeMapImpl.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
@@ -95,7 +95,7 @@
if (fNodes != 0)
{
newmap->fNodes = new (doc) DOMNodeVector(doc, fNodes->size());
- for (DOMSize_t i = 0; i < fNodes->size(); ++i)
+ for (XMLSize_t i = 0; i < fNodes->size(); ++i)
{
DOMNode *n = fNodes->elementAt(i)->cloneNode(true);
castToNodeImpl(n)->isSpecified(castToNodeImpl(fNodes->elementAt(i))->isSpecified());
@@ -183,7 +183,7 @@
-DOMSize_t DOMNamedNodeMapImpl::getLength() const
+XMLSize_t DOMNamedNodeMapImpl::getLength() const
{
return (fNodes != 0) ? fNodes->size() : 0;
};
@@ -198,7 +198,7 @@
-DOMNode * DOMNamedNodeMapImpl::item(DOMSize_t index) const
+DOMNode * DOMNamedNodeMapImpl::item(XMLSize_t index) const
{
return (fNodes != 0 && index < fNodes->size()) ?
fNodes->elementAt(index) : 0;
@@ -421,7 +421,7 @@
DOMDocument *doc = fOwnerNode->getOwnerDocument();
fNodes = new (doc) DOMNodeVector(doc, srcmap->fNodes->size());
}
- for (DOMSize_t i = 0; i < srcmap->fNodes->size(); i++)
+ for (XMLSize_t i = 0; i < srcmap->fNodes->size(); i++)
{
DOMNode *n = srcmap->fNodes->elementAt(i);
DOMNode *clone = n->cloneNode(true);
1.2 +17 -17 xml-xerces/c/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp
Index: DOMNamedNodeMapImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNamedNodeMapImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNamedNodeMapImpl.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNamedNodeMapImpl.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DOMNamedNodeMapImpl.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNamedNodeMapImpl.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -81,9 +81,9 @@
class CDOM_EXPORT DOMNamedNodeMapImpl: public DOMNamedNodeMap {
protected:
- DOMNodeVector *fNodes;
- DOMNode *fOwnerNode; // the node this map belongs to
- // bool fReadOnly; // revisit - flag on owner node instead?
+ DOMNodeVector* fNodes;
+ DOMNode* fOwnerNode; // the node this map belongs to
+ //bool fReadOnly; // revisit - flag on owner node instead?
friend class DOMDocumentImpl;
@@ -97,22 +97,22 @@
virtual ~DOMNamedNodeMapImpl();
virtual DOMNamedNodeMapImpl *cloneMap(DOMNode *ownerNode);
virtual int findNamePoint(const XMLCh *name) const;
- virtual DOMSize_t getLength() const;
- virtual DOMNode *getNamedItem(const XMLCh *name) const;
- virtual DOMNode *item(DOMSize_t index) const;
- virtual void removeAll();
- virtual DOMNode *removeNamedItem(const XMLCh *name);
- virtual DOMNode *setNamedItem(DOMNode *arg);
- virtual void setReadOnly(bool readOnly, bool deep);
+ virtual XMLSize_t getLength() const;
+ virtual DOMNode* getNamedItem(const XMLCh *name) const;
+ virtual DOMNode* item(XMLSize_t index) const;
+ virtual void removeAll();
+ virtual DOMNode* removeNamedItem(const XMLCh *name);
+ virtual DOMNode* setNamedItem(DOMNode *arg);
+ virtual void setReadOnly(bool readOnly, bool deep);
//Introduced in DOM Level 2
- virtual int findNamePoint(const XMLCh *namespaceURI,
+ virtual int findNamePoint(const XMLCh *namespaceURI,
+ const XMLCh *localName) const;
+ virtual DOMNode* getNamedItemNS(const XMLCh *namespaceURI,
const XMLCh *localName) const;
- virtual DOMNode *getNamedItemNS(const XMLCh *namespaceURI,
- const XMLCh *localName) const;
- virtual DOMNode *setNamedItemNS(DOMNode *arg);
- virtual DOMNode *removeNamedItemNS(const XMLCh *namespaceURI,
- const XMLCh *localName);
+ virtual DOMNode* setNamedItemNS(DOMNode *arg);
+ virtual DOMNode* removeNamedItemNS(const XMLCh *namespaceURI,
+ const XMLCh *localName);
};
1.2 +12 -12 xml-xerces/c/src/xercesc/dom/impl/DOMNodeIDMap.cpp
Index: DOMNodeIDMap.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeIDMap.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeIDMap.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeIDMap.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMNodeIDMap.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeIDMap.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
#include "DOMAttrImpl.hpp"
@@ -88,11 +88,11 @@
fSize = gPrimes[fSizeIndex];
fNumEntries = 0;
- fMaxEntries = (DOMSize_t)(float(fSize) * gMaxFill);
+ fMaxEntries = (XMLSize_t)(float(fSize) * gMaxFill);
//fTable = new (fDoc) DOMAttr*[fSize];
fTable = (DOMAttr**) ((DOMDocumentImpl *)fDoc)->allocate(sizeof(DOMAttr*) * fSize);
- DOMSize_t i;
+ XMLSize_t i;
for (i=0; i<fSize; i++)
fTable[i] = 0;
};
@@ -123,9 +123,9 @@
// An initial hash of zero would cause the rehash to fail.
//
const XMLCh *id=attr->getValue();
- DOMSize_t initalHash = XMLString::hash(id, fSize-1);
+ XMLSize_t initalHash = XMLString::hash(id, fSize-1);
initalHash++;
- DOMSize_t currentHash = initalHash;
+ XMLSize_t currentHash = initalHash;
//
// Loop looking for an empty slot for this ID.
@@ -160,9 +160,9 @@
// An initial hash of zero would cause the rehash to fail.
//
const XMLCh *id=attr->getValue();
- DOMSize_t initalHash = XMLString::hash(id, fSize-1);
+ XMLSize_t initalHash = XMLString::hash(id, fSize-1);
initalHash++;
- DOMSize_t currentHash = initalHash;
+ XMLSize_t currentHash = initalHash;
//
// Loop looking for a slot pointing to an attr with this id.
@@ -199,9 +199,9 @@
//
// Get the hashcode for the supplied string.
//
- DOMSize_t initalHash = XMLString::hash(id, fSize-1);
+ XMLSize_t initalHash = XMLString::hash(id, fSize-1);
initalHash++;
- DOMSize_t currentHash = initalHash;
+ XMLSize_t currentHash = initalHash;
//
// Loop looking for a slot pointing to an attr with this id.
@@ -235,7 +235,7 @@
void DOMNodeIDMap::growTable()
{
DOMAttr **oldTable = fTable;
- DOMSize_t oldSize = fSize;
+ XMLSize_t oldSize = fSize;
//
// Figure the new table size.
@@ -258,11 +258,11 @@
//
//fTable = new (fDoc) DOMAttr *[fSize];
fTable = (DOMAttr**) ((DOMDocumentImpl *)fDoc)->allocate(sizeof(DOMAttr*) * fSize);
- DOMSize_t i;
+ XMLSize_t i;
for (i=0; i<fSize; i++)
fTable[i] = 0;
- fMaxEntries = (DOMSize_t)(float(fSize) * gMaxFill);
+ fMaxEntries = (XMLSize_t)(float(fSize) * gMaxFill);
//
// Move entries over from the old table to the new one.
1.2 +5 -5 xml-xerces/c/src/xercesc/dom/impl/DOMNodeIDMap.hpp
Index: DOMNodeIDMap.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeIDMap.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeIDMap.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeIDMap.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DOMNodeIDMap.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeIDMap.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -107,12 +107,12 @@
private:
DOMAttr **fTable;
- DOMSize_t fSizeIndex; // Index of the current table size in the
+ XMLSize_t fSizeIndex; // Index of the current table size in the
// array of possible table sizes.
- DOMSize_t fSize; // The current size of the table array
+ XMLSize_t fSize; // The current size of the table array
// (number of slots, not bytes.)
- DOMSize_t fNumEntries; // The number of entries used.
- DOMSize_t fMaxEntries; // The max number of entries to use before
+ XMLSize_t fNumEntries; // The number of entries used.
+ XMLSize_t fMaxEntries; // The max number of entries to use before
// growing the table.
DOMDocument *fDoc; // The owning document.
1.2 +5 -5 xml-xerces/c/src/xercesc/dom/impl/DOMNodeListImpl.cpp
Index: DOMNodeListImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeListImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeListImpl.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeListImpl.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMNodeListImpl.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeListImpl.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
@@ -79,8 +79,8 @@
-DOMSize_t DOMNodeListImpl::getLength(){
- DOMSize_t count = 0;
+XMLSize_t DOMNodeListImpl::getLength(){
+ XMLSize_t count = 0;
if (fNode) {
DOMNode *node = castToParentImpl(fNode)->fFirstChild;
while(node != 0){
@@ -94,10 +94,10 @@
-DOMNode *DOMNodeListImpl::item(DOMSize_t index){
+DOMNode *DOMNodeListImpl::item(XMLSize_t index){
if (fNode) {
DOMNode *node = castToParentImpl(fNode)->fFirstChild;
- for(DOMSize_t i=0; i<index && node!=0; ++i)
+ for(XMLSize_t i=0; i<index && node!=0; ++i)
node = castToChildImpl(node)->nextSibling;
return node;
}
1.2 +3 -3 xml-xerces/c/src/xercesc/dom/impl/DOMNodeListImpl.hpp
Index: DOMNodeListImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeListImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeListImpl.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeListImpl.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -57,7 +57,7 @@
*/
/*
- * $Id: DOMNodeListImpl.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeListImpl.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -98,8 +98,8 @@
public:
DOMNodeListImpl(DOMNode *node);
virtual ~DOMNodeListImpl();
- virtual DOMNode * item(DOMSize_t index);
- virtual DOMSize_t getLength();
+ virtual DOMNode * item(XMLSize_t index);
+ virtual XMLSize_t getLength();
};
#endif
1.2 +14 -14 xml-xerces/c/src/xercesc/dom/impl/DOMNodeVector.cpp
Index: DOMNodeVector.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeVector.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeVector.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeVector.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMNodeVector.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeVector.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -76,17 +76,17 @@
init(doc, 10);
};
-DOMNodeVector::DOMNodeVector(DOMDocument *doc, DOMSize_t size) {
+DOMNodeVector::DOMNodeVector(DOMDocument *doc, XMLSize_t size) {
init(doc, size);
};
-void DOMNodeVector::init(DOMDocument *doc, DOMSize_t size) {
+void DOMNodeVector::init(DOMDocument *doc, XMLSize_t size) {
assert(size > 0);
//data = new (doc) DOMNode *[size];
data = (DOMNode**) ((DOMDocumentImpl *)doc)->allocate(sizeof(DOMNode*) * size);
assert(data != 0);
- DOMSize_t i;
+ XMLSize_t i;
for (i=0; i<size; i++)
data[i] = 0;
allocatedSize = size;
@@ -107,16 +107,16 @@
void DOMNodeVector::checkSpace() {
if (nextFreeSlot == allocatedSize) {
- DOMSize_t grow = allocatedSize/2;
+ XMLSize_t grow = allocatedSize/2;
if (grow < 50) grow = 50;
- DOMSize_t newAllocatedSize = allocatedSize + grow;
+ XMLSize_t newAllocatedSize = allocatedSize + grow;
DOMDocument *doc = data[0]->getOwnerDocument();
//DOMNode **newData = new (doc) DOMNode *[newAllocatedSize];
DOMNode **newData = (DOMNode**) ((DOMDocumentImpl *)doc)->allocate(sizeof(DOMNode*) * newAllocatedSize);
assert(newData != 0);
- for (DOMSize_t i=0; i<allocatedSize; i++) {
+ for (XMLSize_t i=0; i<allocatedSize; i++) {
newData[i] = data[i];
};
// delete [] data; // revisit. Can't delete! Recycle?
@@ -126,7 +126,7 @@
}
-DOMNode *DOMNodeVector::elementAt(DOMSize_t index) {
+DOMNode *DOMNodeVector::elementAt(XMLSize_t index) {
if (index >= nextFreeSlot)
return 0;
return data[index];
@@ -139,8 +139,8 @@
};
-void DOMNodeVector::insertElementAt(DOMNode *elem, DOMSize_t index) {
- DOMSize_t i;
+void DOMNodeVector::insertElementAt(DOMNode *elem, XMLSize_t index) {
+ XMLSize_t i;
assert(index <= nextFreeSlot);
@@ -154,9 +154,9 @@
};
-void DOMNodeVector::removeElementAt(DOMSize_t index) {
+void DOMNodeVector::removeElementAt(XMLSize_t index) {
assert(index < nextFreeSlot);
- for (DOMSize_t i=index; i<nextFreeSlot-1; ++i) {
+ for (XMLSize_t i=index; i<nextFreeSlot-1; ++i) {
data[i] = data[i+1];
}
--nextFreeSlot;
@@ -166,13 +166,13 @@
nextFreeSlot = 0;
};
-void DOMNodeVector::setElementAt(DOMNode *elem, DOMSize_t index) {
+void DOMNodeVector::setElementAt(DOMNode *elem, XMLSize_t index) {
assert(index < nextFreeSlot);
data[index] = elem;
};
-DOMSize_t DOMNodeVector::size() {
+XMLSize_t DOMNodeVector::size() {
return nextFreeSlot;
};
1.2 +14 -14 xml-xerces/c/src/xercesc/dom/impl/DOMNodeVector.hpp
Index: DOMNodeVector.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeVector.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMNodeVector.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMNodeVector.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -57,7 +57,7 @@
*/
/*
- * $Id: DOMNodeVector.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMNodeVector.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -77,24 +77,24 @@
class DOMNodeVector {
private:
DOMNode **data;
- DOMSize_t allocatedSize;
- DOMSize_t nextFreeSlot;
- void init(DOMDocument *doc, DOMSize_t size);
- void checkSpace();
+ XMLSize_t allocatedSize;
+ XMLSize_t nextFreeSlot;
+ void init(DOMDocument *doc, XMLSize_t size);
+ void checkSpace();
public:
DOMNodeVector(DOMDocument *doc);
- DOMNodeVector(DOMDocument *doc, DOMSize_t size);
+ DOMNodeVector(DOMDocument *doc, XMLSize_t size);
~DOMNodeVector();
- DOMSize_t size();
- DOMNode *elementAt(DOMSize_t index);
- DOMNode *lastElement();
- void addElement(DOMNode *);
- void insertElementAt(DOMNode *, DOMSize_t index);
- void setElementAt(DOMNode *val, DOMSize_t index);
- void removeElementAt(DOMSize_t index);
- void reset();
+ XMLSize_t size();
+ DOMNode* elementAt(XMLSize_t index);
+ DOMNode* lastElement();
+ void addElement(DOMNode *);
+ void insertElementAt(DOMNode *, XMLSize_t index);
+ void setElementAt(DOMNode *val, XMLSize_t index);
+ void removeElementAt(XMLSize_t index);
+ void reset();
};
#endif
1.2 +5 -5 xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.cpp
Index: DOMParentNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMParentNode.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMParentNode.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMParentNode.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMParentNode.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
#include <xercesc/util/XercesDefs.hpp>
@@ -286,9 +286,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if ( ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
ranges->elementAt(i)->updateRangeForInsertedNode(newChild);
}
}
@@ -313,9 +313,9 @@
if (this->getOwnerDocument() != 0 ) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
if (ranges->elementAt(i) != 0)
ranges->elementAt(i)->updateRangeForDeletedNode(oldChild);
}
1.2 +11 -11 xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.hpp
Index: DOMParentNode.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMParentNode.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMParentNode.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMParentNode.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -59,7 +59,7 @@
*/
/*
- * $Id: DOMParentNode.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMParentNode.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -108,16 +108,16 @@
int changes() const;
void changed();
- DOMNode * appendChild(DOMNode *newChild);
- DOMNodeList * getChildNodes() const;
- DOMNode * getFirstChild() const;
- DOMNode * getLastChild() const;
- DOMSize_t getLength() const;
- bool hasChildNodes() const;
- DOMNode * insertBefore(DOMNode *newChild, DOMNode *refChild);
- DOMNode * item(DOMSize_t index) const;
- DOMNode * removeChild(DOMNode *oldChild);
- DOMNode * replaceChild(DOMNode *newChild, DOMNode *oldChild);
+ DOMNode* appendChild(DOMNode *newChild);
+ DOMNodeList* getChildNodes() const;
+ DOMNode* getFirstChild() const;
+ DOMNode* getLastChild() const;
+ XMLSize_t getLength() const;
+ bool hasChildNodes() const;
+ DOMNode* insertBefore(DOMNode *newChild, DOMNode *refChild);
+ DOMNode* item(XMLSize_t index) const;
+ DOMNode* removeChild(DOMNode *oldChild);
+ DOMNode* replaceChild(DOMNode *newChild, DOMNode *oldChild);
//Introduced in DOM Level 2
void normalize();
1.2 +30 -30 xml-xerces/c/src/xercesc/dom/impl/DOMRangeImpl.cpp
Index: DOMRangeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMRangeImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMRangeImpl.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMRangeImpl.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMRangeImpl.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMRangeImpl.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
#include "DOMRangeImpl.hpp"
@@ -114,7 +114,7 @@
return fStartContainer;
}
-DOMSize_t DOMRangeImpl::getStartOffset() const
+XMLSize_t DOMRangeImpl::getStartOffset() const
{
return fStartOffset;
}
@@ -124,7 +124,7 @@
return fEndContainer;
}
-DOMSize_t DOMRangeImpl::getEndOffset() const
+XMLSize_t DOMRangeImpl::getEndOffset() const
{
return fEndOffset;
}
@@ -158,7 +158,7 @@
fStartContainer = (DOMNode*) node;
}
-void DOMRangeImpl::setStartOffset(DOMSize_t offset)
+void DOMRangeImpl::setStartOffset(XMLSize_t offset)
{
if (fDetached)
{
@@ -181,7 +181,7 @@
}
-void DOMRangeImpl::setEndOffset(DOMSize_t offset)
+void DOMRangeImpl::setEndOffset(XMLSize_t offset)
{
if (fDetached)
{
@@ -192,7 +192,7 @@
fEndOffset = offset;
}
-void DOMRangeImpl::setStart(const DOMNode* refNode, DOMSize_t offset)
+void DOMRangeImpl::setStart(const DOMNode* refNode, XMLSize_t offset)
{
validateNode(refNode);
checkIndex(refNode, offset);
@@ -215,7 +215,7 @@
fCollapsed = false;
}
-void DOMRangeImpl::setEnd(const DOMNode* refNode, DOMSize_t offset)
+void DOMRangeImpl::setEnd(const DOMNode* refNode, XMLSize_t offset)
{
validateNode(refNode);
checkIndex(refNode, offset);
@@ -250,7 +250,7 @@
}
fStartContainer = refNode->getParentNode();
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = (DOMNode*) refNode; n!=0; n = n->getPreviousSibling()) {
i++;
}
@@ -286,7 +286,7 @@
}
fStartContainer = refNode->getParentNode();
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = (DOMNode*) refNode; n!=0; n = n->getPreviousSibling()) {
i++;
}
@@ -320,7 +320,7 @@
}
fEndContainer = refNode->getParentNode();
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = (DOMNode*) refNode; n!=0; n = n->getPreviousSibling(), i++) ;
if (i< 1)
@@ -355,7 +355,7 @@
}
fEndContainer = refNode->getParentNode();
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = (DOMNode*) refNode; n!=0; n = n->getPreviousSibling(), i++) ;
if (i ==0)
@@ -442,7 +442,7 @@
fStartContainer = parent;
fEndContainer = parent;
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = parent->getFirstChild(); n!=0, n!=refNode; n = n->getNextSibling()) {
i++;
}
@@ -470,7 +470,7 @@
fEndOffset = 0;
return;
}
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (DOMNode* n = first; n!=0; n = n->getNextSibling()) {
i++;
}
@@ -685,7 +685,7 @@
parent = fStartContainer;
next = fStartContainer->getFirstChild();
- for(DOMSize_t i = 0; (i < fStartOffset) && (next != 0); i++) {
+ for(XMLSize_t i = 0; (i < fStartOffset) && (next != 0); i++) {
next=next->getNextSibling();
}
}
@@ -748,7 +748,7 @@
}
} else {
- DOMSize_t length = XMLString::stringLen(fStartContainer->getNodeValue());
+ XMLSize_t length = XMLString::stringLen(fStartContainer->getNodeValue());
if (length != fStartOffset) {
XMLCh* tempString;
@@ -770,7 +770,7 @@
}else { //fStartContainer is not a TextNode
node=node->getFirstChild();
if (fStartOffset>0) { //find a first node within a range, specified by fStartOffset
- DOMSize_t counter = 0;
+ XMLSize_t counter = 0;
while (counter<fStartOffset && node!=0) {
node=node->getNextSibling();
counter++;
@@ -890,10 +890,10 @@
return true;
}
-DOMSize_t DOMRangeImpl::indexOf(const DOMNode* child, const DOMNode* parent) const
+XMLSize_t DOMRangeImpl::indexOf(const DOMNode* child, const DOMNode* parent) const
{
- DOMSize_t i = 0;
- if (child->getParentNode() != parent) return (DOMSize_t)-1;
+ XMLSize_t i = 0;
+ if (child->getParentNode() != parent) return (XMLSize_t)-1;
for(DOMNode* node = child->getPreviousSibling(); node!= 0; node=node->getPreviousSibling()) {
i++;
}
@@ -957,7 +957,7 @@
return commonAncestor;
}
-void DOMRangeImpl::checkIndex(const DOMNode* node, DOMSize_t offset) const
+void DOMRangeImpl::checkIndex(const DOMNode* node, XMLSize_t offset) const
{
if (offset < 0) {
throw DOMException( DOMException::INDEX_SIZE_ERR, 0 );
@@ -975,7 +975,7 @@
}
DOMNode* child = node->getFirstChild();
- DOMSize_t i = 0;
+ XMLSize_t i = 0;
for (; child != 0; i++) {
child = child->getNextSibling();
}
@@ -1636,7 +1636,7 @@
}
void DOMRangeImpl::checkReadOnly(DOMNode* start, DOMNode* end,
- DOMSize_t startOffset, DOMSize_t endOffset)
+ XMLSize_t startOffset, XMLSize_t endOffset)
{
if ((start == 0) || (end == 0) ) return;
//if both start and end are text check and return
@@ -1650,7 +1650,7 @@
}
//set the start and end nodes to check
DOMNode*sNode = start->getFirstChild();
- for(DOMSize_t i = 0; i<startOffset; i++)
+ for(XMLSize_t i = 0; i<startOffset; i++)
sNode = sNode->getNextSibling();
DOMNode* eNode;
@@ -1659,7 +1659,7 @@
}
else { //need to check all the kids that fall before the end offset value
eNode = end->getFirstChild();
- for (DOMSize_t i = 0; i<endOffset-1; i++)
+ for (XMLSize_t i = 0; i<endOffset-1; i++)
eNode = eNode->getNextSibling();
}
//recursivly search if any node is readonly
@@ -1720,7 +1720,7 @@
* The text has already beeen inserted.
* Fix-up any offsets.
*/
-void DOMRangeImpl::updateRangeForDeletedText(DOMNode* node, DOMSize_t offset, int count)
+void DOMRangeImpl::updateRangeForDeletedText(DOMNode* node, XMLSize_t offset, int count)
{
if (node == 0) return;
@@ -1755,14 +1755,14 @@
if (fRemoveChild == node) return;
if (node->getParentNode() == fStartContainer) {
- DOMSize_t index = indexOf(node, fStartContainer);
+ XMLSize_t index = indexOf(node, fStartContainer);
if ( fStartOffset > index) {
fStartOffset--;
}
}
if (node->getParentNode() == fEndContainer) {
- DOMSize_t index = indexOf(node, fEndContainer);
+ XMLSize_t index = indexOf(node, fEndContainer);
if ( fEndOffset > index) {
fEndOffset--;
}
@@ -1788,14 +1788,14 @@
if (node == 0) return;
if (node->getParentNode() == fStartContainer) {
- DOMSize_t index = indexOf(node, fStartContainer);
+ XMLSize_t index = indexOf(node, fStartContainer);
if (index < fStartOffset) {
fStartOffset++;
}
}
if (node->getParentNode() == fEndContainer) {
- DOMSize_t index = indexOf(node, fEndContainer);
+ XMLSize_t index = indexOf(node, fEndContainer);
if (index < fEndOffset) {
fEndOffset++;
}
@@ -1803,7 +1803,7 @@
}
-void DOMRangeImpl::updateSplitInfo(DOMText* oldNode, DOMText* startNode, DOMSize_t offset)
+void DOMRangeImpl::updateSplitInfo(DOMText* oldNode, DOMText* startNode, XMLSize_t offset)
{
if (startNode == 0) return;
1.2 +20 -20 xml-xerces/c/src/xercesc/dom/impl/DOMRangeImpl.hpp
Index: DOMRangeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMRangeImpl.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMRangeImpl.hpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMRangeImpl.hpp 27 May 2002 18:20:10 -0000 1.2
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DOMRangeImpl.hpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMRangeImpl.hpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -95,15 +95,15 @@
//private data
- DOMNode *fStartContainer;
- DOMSize_t fStartOffset;
- DOMNode *fEndContainer;
- DOMSize_t fEndOffset;
- bool fCollapsed;
- DOMDocument *fDocument;
- bool fDetached;
+ DOMNode* fStartContainer;
+ XMLSize_t fStartOffset;
+ DOMNode* fEndContainer;
+ XMLSize_t fEndOffset;
+ bool fCollapsed;
+ DOMDocument* fDocument;
+ bool fDetached;
- DOMNode *fRemoveChild;
+ DOMNode* fRemoveChild;
public:
//c'tor
@@ -115,15 +115,15 @@
//getter functions
virtual DOMNode* getStartContainer() const;
- virtual DOMSize_t getStartOffset() const;
+ virtual XMLSize_t getStartOffset() const;
virtual DOMNode* getEndContainer() const;
- virtual DOMSize_t getEndOffset() const;
+ virtual XMLSize_t getEndOffset() const;
virtual bool getCollapsed() const;
virtual const DOMNode* getCommonAncestorContainer() const;
//setter functions
- virtual void setStart(const DOMNode *parent, DOMSize_t offset);
- virtual void setEnd(const DOMNode *parent, DOMSize_t offset);
+ virtual void setStart(const DOMNode *parent, XMLSize_t offset);
+ virtual void setEnd(const DOMNode *parent, XMLSize_t offset);
virtual void setStartBefore(const DOMNode *refNode);
virtual void setStartAfter(const DOMNode *refNode);
@@ -152,34 +152,34 @@
DOMDocument* getDocument();
// functions to inform all existing valid ranges about a change
- void updateSplitInfo(DOMText* oldNode, DOMText* startNode, DOMSize_t offset);
+ void updateSplitInfo(DOMText* oldNode, DOMText* startNode, XMLSize_t offset);
void updateRangeForInsertedNode(DOMNode* node);
void receiveReplacedText(DOMNode* node);
- void updateRangeForDeletedText(DOMNode* node, DOMSize_t offset, int count);
+ void updateRangeForDeletedText(DOMNode* node, XMLSize_t offset, int count);
void updateRangeForDeletedNode(DOMNode* node);
private:
//setter functions
void setStartContainer(const DOMNode* node);
- void setStartOffset(DOMSize_t offset) ;
+ void setStartOffset(XMLSize_t offset) ;
void setEndContainer(const DOMNode* node);
- void setEndOffset(DOMSize_t offset) ;
+ void setEndOffset(XMLSize_t offset) ;
//misc functions
void validateNode(const DOMNode* node) const;
bool isValidAncestorType(const DOMNode* node) const;
bool hasLegalRootContainer(const DOMNode* node) const;
bool isLegalContainedNode(const DOMNode* node ) const;
- void checkIndex(const DOMNode* node, DOMSize_t offset) const;
+ void checkIndex(const DOMNode* node, XMLSize_t offset) const;
static bool isAncestorOf(const DOMNode* a, const DOMNode* b);
- DOMSize_t indexOf(const DOMNode* child, const DOMNode* parent) const;
+ XMLSize_t indexOf(const DOMNode* child, const DOMNode* parent) const;
const DOMNode* commonAncestorOf(const DOMNode* pointA, const DOMNode* pointB) const;
DOMNode* nextNode(const DOMNode* node, bool visitChildren) const;
DOMDocumentFragment* traverseContents(TraversalType type);
void checkReadOnly(DOMNode* start, DOMNode* end,
- DOMSize_t starOffset, DOMSize_t endOffset);
+ XMLSize_t starOffset, XMLSize_t endOffset);
void recurseTreeAndCheck(DOMNode* start, DOMNode* end);
DOMNode* removeChild(DOMNode* parent, DOMNode* child);
1.2 +10 -10 xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.cpp
Index: DOMTextImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMTextImpl.cpp 21 May 2002 20:29:32 -0000 1.1
+++ DOMTextImpl.cpp 27 May 2002 18:20:10 -0000 1.2
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOMTextImpl.cpp,v 1.1 2002/05/21 20:29:32 tng Exp $
+ * $Id: DOMTextImpl.cpp,v 1.2 2002/05/27 18:20:10 tng Exp $
*/
@@ -108,14 +108,14 @@
};
-DOMText *DOMTextImpl::splitText(DOMSize_t offset)
+DOMText *DOMTextImpl::splitText(XMLSize_t offset)
{
if (fNode.isReadOnly())
{
throw DOMException(
DOMException::NO_MODIFICATION_ALLOWED_ERR, 0);
}
- DOMSize_t len = XMLString::stringLen(fCharacterData.fData);
+ XMLSize_t len = XMLString::stringLen(fCharacterData.fData);
if (offset > len || offset < 0)
throw DOMException(DOMException::INDEX_SIZE_ERR, 0);
@@ -135,9 +135,9 @@
if (this->getOwnerDocument() != 0) {
Ranges* ranges = ((DOMDocumentImpl *)this->getOwnerDocument())->getRanges();
if (ranges != 0) {
- DOMSize_t sz = ranges->size();
+ XMLSize_t sz = ranges->size();
if (sz != 0) {
- for (DOMSize_t i =0; i<sz; i++) {
+ for (XMLSize_t i =0; i<sz; i++) {
ranges->elementAt(i)->updateSplitInfo( this, newText, offset);
}
}
@@ -196,15 +196,15 @@
const XMLCh * DOMTextImpl::getData() const {return fCharacterData.getData();};
- DOMSize_t DOMTextImpl::getLength() const {return fCharacterData.getLength();};
- const XMLCh * DOMTextImpl::substringData(DOMSize_t offset, DOMSize_t count) const
+ XMLSize_t DOMTextImpl::getLength() const {return fCharacterData.getLength();};
+ const XMLCh * DOMTextImpl::substringData(XMLSize_t offset, XMLSize_t count) const
{return fCharacterData.substringData(this, offset, count);};
void DOMTextImpl::appendData(const XMLCh *arg) {fCharacterData.appendData(this, arg);};
- void DOMTextImpl::insertData(DOMSize_t offset, const XMLCh *arg)
+ void DOMTextImpl::insertData(XMLSize_t offset, const XMLCh *arg)
{fCharacterData.insertData(this, offset, arg);};
- void DOMTextImpl::deleteData(DOMSize_t offset, DOMSize_t count)
+ void DOMTextImpl::deleteData(XMLSize_t offset, XMLSize_t count)
{fCharacterData.deleteData(this, offset, count);};
- void DOMTextImpl::replaceData(DOMSize_t offset, DOMSize_t count, const XMLCh *arg)
+ void DOMTextImpl::replaceData(XMLSize_t offset, XMLSize_t count, const XMLCh *arg)
{fCharacterData.replaceData(this, offset, count, arg);};
void DOMTextImpl::setData(const XMLCh *data) {fCharacterData.setData(this, data);};
void DOMTextImpl::setNodeValue(const XMLCh *nodeValue) {fCharacterData.setNodeValue (this, nodeValue); };
1.3 +10 -10 xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.hpp
Index: DOMTextImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMTextImpl.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DOMTextImpl.hpp 22 May 2002 20:54:57 -0000 1.2
+++ DOMTextImpl.hpp 27 May 2002 18:20:10 -0000 1.3
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DOMTextImpl.hpp,v 1.2 2002/05/22 20:54:57 knoaman Exp $
+ * $Id: DOMTextImpl.hpp,v 1.3 2002/05/27 18:20:10 tng Exp $
*/
//
@@ -90,7 +90,7 @@
DOMTextImpl(const DOMTextImpl& other, bool deep=false);
virtual ~DOMTextImpl();
- virtual DOMText* splitText(DOMSize_t offset);
+ virtual DOMText* splitText(XMLSize_t offset);
virtual bool isIgnorableWhitespace() const;
// Declare the functions coming from DOMNode.
@@ -99,15 +99,15 @@
// All of the functions coming from DOMCharacterData
virtual const XMLCh* getData() const;
- virtual DOMSize_t getLength() const;
- virtual const XMLCh* substringData(DOMSize_t offset,
- DOMSize_t count) const;
+ virtual XMLSize_t getLength() const;
+ virtual const XMLCh* substringData(XMLSize_t offset,
+ XMLSize_t count) const;
virtual void appendData(const XMLCh *arg);
- virtual void insertData(DOMSize_t offset, const XMLCh *arg);
- virtual void deleteData(DOMSize_t offset,
- DOMSize_t count);
- virtual void replaceData(DOMSize_t offset,
- DOMSize_t count,
+ virtual void insertData(XMLSize_t offset, const XMLCh *arg);
+ virtual void deleteData(XMLSize_t offset,
+ XMLSize_t count);
+ virtual void replaceData(XMLSize_t offset,
+ XMLSize_t count,
const XMLCh *arg);
virtual void setData(const XMLCh *data);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org