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 2001/12/07 02:35:29 UTC
cvs commit: xml-xerces/c/src/dom DocumentFragmentImpl.cpp DocumentFragmentImpl.hpp DocumentImpl.cpp DocumentImpl.hpp DocumentTypeImpl.cpp DocumentTypeImpl.hpp ElementImpl.cpp ElementImpl.hpp EntityImpl.cpp EntityImpl.hpp EntityReferenceImpl.cpp EntityReferenceImpl.hpp NotationImpl.cpp NotationImpl.hpp
tng 01/12/06 17:35:29
Modified: c/src/dom DocumentFragmentImpl.cpp DocumentFragmentImpl.hpp
DocumentImpl.cpp DocumentImpl.hpp
DocumentTypeImpl.cpp DocumentTypeImpl.hpp
ElementImpl.cpp ElementImpl.hpp EntityImpl.cpp
EntityImpl.hpp EntityReferenceImpl.cpp
EntityReferenceImpl.hpp NotationImpl.cpp
NotationImpl.hpp
Log:
[Bug 1959] setNodeValue throws exception when spec specifies NOP.
Revision Changes Path
1.12 +15 -20 xml-xerces/c/src/dom/DocumentFragmentImpl.cpp
Index: DocumentFragmentImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentFragmentImpl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DocumentFragmentImpl.cpp 2001/10/25 21:47:14 1.11
+++ DocumentFragmentImpl.cpp 2001/12/07 01:35:28 1.12
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DocumentFragmentImpl.cpp,v 1.11 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: DocumentFragmentImpl.cpp,v 1.12 2001/12/07 01:35:28 tng Exp $
*/
#include "DocumentFragmentImpl.hpp"
@@ -71,8 +71,8 @@
: ParentNode(masterDoc)
{
};
-
+
DocumentFragmentImpl::DocumentFragmentImpl(const DocumentFragmentImpl &other,
bool deep)
: ParentNode(other)
@@ -86,8 +86,8 @@
{
};
+
-
NodeImpl *DocumentFragmentImpl::cloneNode(bool deep)
{
return new DocumentFragmentImpl(*this, deep);
@@ -112,11 +112,6 @@
return true;
};
-
-void DocumentFragmentImpl::setNodeValue(const DOMString &x)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-};
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
1.12 +15 -16 xml-xerces/c/src/dom/DocumentFragmentImpl.hpp
Index: DocumentFragmentImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentFragmentImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DocumentFragmentImpl.hpp 2001/10/25 21:47:14 1.11
+++ DocumentFragmentImpl.hpp 2001/12/07 01:35:28 1.12
@@ -2,38 +2,38 @@
#define DocumentFragmentImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,7 +57,7 @@
*/
/*
- * $Id: DocumentFragmentImpl.hpp,v 1.11 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: DocumentFragmentImpl.hpp,v 1.12 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -79,19 +79,18 @@
private:
DocumentFragmentImpl(const DocumentFragmentImpl &other, bool deep);
friend class DocumentImpl;
-
+
public:
virtual ~DocumentFragmentImpl();
virtual NodeImpl *cloneNode(bool deep);
virtual DOMString getNodeName();
virtual short getNodeType();
virtual bool isDocumentFragmentImpl();
- virtual void setNodeValue(const DOMString &);
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
- static void reinitDocumentFragmentImpl();
+ static void reinitDocumentFragmentImpl();
};
#endif
1.38 +1 -9 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- DocumentImpl.cpp 2001/10/25 21:47:14 1.37
+++ DocumentImpl.cpp 2001/12/07 01:35:28 1.38
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DocumentImpl.cpp,v 1.37 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: DocumentImpl.cpp,v 1.38 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -489,14 +489,6 @@
return oldChild;
};
-
-
-
-void DocumentImpl::setNodeValue(const DOMString &x)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-};
-
//
1.25 +2 -3 xml-xerces/c/src/dom/DocumentImpl.hpp
Index: DocumentImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentImpl.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DocumentImpl.hpp 2001/10/25 21:47:14 1.24
+++ DocumentImpl.hpp 2001/12/07 01:35:28 1.25
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DocumentImpl.hpp,v 1.24 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: DocumentImpl.hpp,v 1.25 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -201,7 +201,6 @@
static bool isXMLName(const DOMString & s);
virtual void referenced();
virtual NodeImpl *removeChild(NodeImpl *oldChild);
- virtual void setNodeValue(const DOMString & x);
virtual void unreferenced();
static NodeIteratorImpl* createNodeIterator(DOM_Node root, unsigned long whatToShow, DOM_NodeFilter* filter, bool entityReferenceExpansion);
static TreeWalkerImpl* createTreeWalker(DOM_Node root, unsigned long whatToShow, DOM_NodeFilter* filter, bool entityReferenceExpansion);
@@ -269,7 +268,7 @@
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
- static void reinitDocumentImpl();
+ static void reinitDocumentImpl();
};
1.23 +1 -8 xml-xerces/c/src/dom/DocumentTypeImpl.cpp
Index: DocumentTypeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentTypeImpl.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DocumentTypeImpl.cpp 2001/05/11 13:25:21 1.22
+++ DocumentTypeImpl.cpp 2001/12/07 01:35:28 1.23
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DocumentTypeImpl.cpp,v 1.22 2001/05/11 13:25:21 tng Exp $
+ * $Id: DocumentTypeImpl.cpp,v 1.23 2001/12/07 01:35:28 tng Exp $
*/
#include "DocumentTypeImpl.hpp"
@@ -189,13 +189,6 @@
bool DocumentTypeImpl::isDocumentTypeImpl()
{
return true;
-};
-
-
-void DocumentTypeImpl::setNodeValue(const DOMString &val)
-{
- throw DOM_DOMException(
- DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
};
1.18 +1 -2 xml-xerces/c/src/dom/DocumentTypeImpl.hpp
Index: DocumentTypeImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DocumentTypeImpl.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DocumentTypeImpl.hpp 2001/05/11 13:25:22 1.17
+++ DocumentTypeImpl.hpp 2001/12/07 01:35:28 1.18
@@ -58,7 +58,7 @@
*/
/*
- * $Id: DocumentTypeImpl.hpp,v 1.17 2001/05/11 13:25:22 tng Exp $
+ * $Id: DocumentTypeImpl.hpp,v 1.18 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -113,7 +113,6 @@
virtual DOMString getName();
virtual NamedNodeMapImpl * getNotations();
virtual NamedNodeMapImpl * getElements();
- virtual void setNodeValue(const DOMString &arg);
virtual void setReadOnly(bool readOnly, bool deep);
//Introduced in DOM Level 2
1.33 +2 -9 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ElementImpl.cpp 2001/10/25 21:47:14 1.32
+++ ElementImpl.cpp 2001/12/07 01:35:28 1.33
@@ -55,7 +55,7 @@
*/
/*
- * $Id: ElementImpl.cpp,v 1.32 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: ElementImpl.cpp,v 1.33 2001/12/07 01:35:28 tng Exp $
*/
#include "DeepNodeListImpl.hpp"
@@ -274,13 +274,6 @@
};
-void ElementImpl::setNodeValue(const DOMString &x)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-};
-
-
-
void ElementImpl::setReadOnly(bool readOnl, bool deep)
{
ParentNode::setReadOnly(readOnl,deep);
@@ -511,6 +504,6 @@
void ElementImpl::reinitElementImpl() {
delete gEmptyString;
- gEmptyString = 0;
+ gEmptyString = 0;
}
1.19 +2 -3 xml-xerces/c/src/dom/ElementImpl.hpp
Index: ElementImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/ElementImpl.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElementImpl.hpp 2001/10/25 21:47:14 1.18
+++ ElementImpl.hpp 2001/12/07 01:35:28 1.19
@@ -58,7 +58,7 @@
*/
/*
- * $Id: ElementImpl.hpp,v 1.18 2001/10/25 21:47:14 peiyongz Exp $
+ * $Id: ElementImpl.hpp,v 1.19 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -101,7 +101,6 @@
virtual AttrImpl * removeAttributeNode(AttrImpl * oldAttr);
virtual AttrImpl *setAttribute(const DOMString &name, const DOMString &value);
virtual AttrImpl *setAttributeNode(AttrImpl *newAttr);
- virtual void setNodeValue(const DOMString &arg);
virtual void setReadOnly(bool readOnly, bool deep);
//Introduced in DOM Level 2
@@ -144,7 +143,7 @@
// -----------------------------------------------------------------------
// Notification that lazy data has been deleted
// -----------------------------------------------------------------------
- static void reinitElementImpl();
+ static void reinitElementImpl();
};
#endif
1.15 +22 -28 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- EntityImpl.cpp 2000/12/08 21:12:14 1.14
+++ EntityImpl.cpp 2001/12/07 01:35:28 1.15
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: EntityImpl.cpp,v 1.14 2000/12/08 21:12:14 tng Exp $
+ * $Id: EntityImpl.cpp,v 1.15 2001/12/07 01:35:28 tng Exp $
*/
#include "DOM_DOMException.hpp"
@@ -114,23 +114,17 @@
DOMString EntityImpl::getNotationName()
{
return notationName;
-};
+};
DOMString EntityImpl::getPublicId() {
return publicId;
-};
+};
DOMString EntityImpl::getSystemId()
{
return systemId;
-};
-
-
-void EntityImpl::setNodeValue(const DOMString &arg)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
};
@@ -163,9 +157,9 @@
return refEntity;
}
-void EntityImpl::cloneEntityRefTree()
+void EntityImpl::cloneEntityRefTree()
{
- //lazily clone the entityRef tree to this entity
+ //lazily clone the entityRef tree to this entity
if (firstChild != 0)
return;
@@ -177,32 +171,32 @@
isReadOnly(true);
}
-NodeImpl * EntityImpl::getFirstChild()
+NodeImpl * EntityImpl::getFirstChild()
{
cloneEntityRefTree();
return firstChild;
};
-NodeImpl* EntityImpl::getLastChild()
+NodeImpl* EntityImpl::getLastChild()
{
cloneEntityRefTree();
return lastChild();
}
-NodeListImpl* EntityImpl::getChildNodes()
+NodeListImpl* EntityImpl::getChildNodes()
{
cloneEntityRefTree();
return this;
}
-bool EntityImpl::hasChildNodes()
+bool EntityImpl::hasChildNodes()
{
cloneEntityRefTree();
return firstChild!=null;
}
-NodeImpl* EntityImpl::item(unsigned int index)
+NodeImpl* EntityImpl::item(unsigned int index)
{
cloneEntityRefTree();
ChildNode *node = firstChild;
1.12 +14 -15 xml-xerces/c/src/dom/EntityImpl.hpp
Index: EntityImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/EntityImpl.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- EntityImpl.hpp 2000/04/27 02:52:43 1.11
+++ EntityImpl.hpp 2001/12/07 01:35:28 1.12
@@ -3,38 +3,38 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -48,7 +48,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -58,7 +58,7 @@
*/
/*
- * $Id: EntityImpl.hpp,v 1.11 2000/04/27 02:52:43 lehors Exp $
+ * $Id: EntityImpl.hpp,v 1.12 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -91,14 +91,13 @@
EntityImpl(DocumentImpl*, const DOMString &eName);
EntityImpl(const EntityImpl &other, bool deep=false);
virtual ~EntityImpl();
-
+
virtual NodeImpl* cloneNode(bool deep);
virtual DOMString getNodeName();
virtual short getNodeType();
virtual DOMString getPublicId();
virtual DOMString getSystemId();
virtual DOMString getNotationName();
- virtual void setNodeValue(const DOMString &arg);
virtual void setNotationName(const DOMString &arg);
virtual void setPublicId(const DOMString &arg);
virtual void setSystemId(const DOMString &arg);
1.19 +1 -11 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- EntityReferenceImpl.cpp 2001/05/11 13:25:23 1.18
+++ EntityReferenceImpl.cpp 2001/12/07 01:35:28 1.19
@@ -55,7 +55,7 @@
*/
/*
- * $Id: EntityReferenceImpl.cpp,v 1.18 2001/05/11 13:25:23 tng Exp $
+ * $Id: EntityReferenceImpl.cpp,v 1.19 2001/12/07 01:35:28 tng Exp $
*/
/**
@@ -171,16 +171,6 @@
bool EntityReferenceImpl::isEntityReference()
{
return true;
-}
-
-
-/**
-* EntityReferences never have a nodeValue.
-* @throws DOMException(NO_MODIFICATION_ALLOWED_ERR)
-*/
-void EntityReferenceImpl::setNodeValue(const DOMString &x)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
}
1.16 +1 -2 xml-xerces/c/src/dom/EntityReferenceImpl.hpp
Index: EntityReferenceImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/EntityReferenceImpl.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- EntityReferenceImpl.hpp 2001/05/11 13:25:23 1.15
+++ EntityReferenceImpl.hpp 2001/12/07 01:35:28 1.16
@@ -58,7 +58,7 @@
*/
/*
- * $Id: EntityReferenceImpl.hpp,v 1.15 2001/05/11 13:25:23 tng Exp $
+ * $Id: EntityReferenceImpl.hpp,v 1.16 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -87,7 +87,6 @@
virtual DOMString getNodeName();
virtual short getNodeType();
virtual bool isEntityReference();
- virtual void setNodeValue(const DOMString &);
virtual void setReadOnly(bool readOnly,bool deep);
};
1.12 +16 -22 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NotationImpl.cpp 2000/08/17 22:47:11 1.11
+++ NotationImpl.cpp 2001/12/07 01:35:28 1.12
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -55,7 +55,7 @@
*/
/*
- * $Id: NotationImpl.cpp,v 1.11 2000/08/17 22:47:11 lehors Exp $
+ * $Id: NotationImpl.cpp,v 1.12 2001/12/07 01:35:28 tng Exp $
*/
#include "NotationImpl.hpp"
@@ -81,7 +81,7 @@
* <P>
* Level 1 of the DOM does not support editing Notation contents.
*
-* @author Rania Y. Khalaf
+* @author Rania Y. Khalaf
* @author Joseph Kesselman
* @since PR-DOM-Level-1-19980818.
*/
@@ -139,18 +139,12 @@
};
-void NotationImpl::setNodeValue(const DOMString &arg)
-{
- throw DOM_DOMException(DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR, null);
-};
-
-
void NotationImpl::setPublicId(const DOMString &arg)
{
if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
-
+
publicId = arg.clone();
};
@@ -160,7 +154,7 @@
if(isReadOnly())
throw DOM_DOMException(
DOM_DOMException::NO_MODIFICATION_ALLOWED_ERR,null);
-
+
systemId = arg.clone();
};
1.10 +25 -30 xml-xerces/c/src/dom/NotationImpl.hpp
Index: NotationImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/NotationImpl.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NotationImpl.hpp 2000/04/06 23:59:24 1.9
+++ NotationImpl.hpp 2001/12/07 01:35:28 1.10
@@ -2,38 +2,38 @@
#define NotationImpl_HEADER_GUARD_
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2000 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,7 +57,7 @@
*/
/*
- * $Id: NotationImpl.hpp,v 1.9 2000/04/06 23:59:24 lehors Exp $
+ * $Id: NotationImpl.hpp,v 1.10 2001/12/07 01:35:28 tng Exp $
*/
//
@@ -79,13 +79,13 @@
DOMString name;
DOMString publicId;
DOMString systemId;
-
+
public:
NotationImpl(DocumentImpl *, const DOMString &);
NotationImpl(const NotationImpl &other, bool deep=false);
-
+
virtual ~NotationImpl();
-
+
virtual NodeImpl *cloneNode(bool deep);
virtual DOMString getNodeName();
virtual short getNodeType();
@@ -93,28 +93,23 @@
//
// The Public Identifier for this Notation. If no public identifier
- // was specified, this will be null.
+ // was specified, this will be null.
virtual DOMString getPublicId();
-
+
// The System Identifier for this Notation. If no system identifier
- // was specified, this will be null.
+ // was specified, this will be null.
virtual DOMString getSystemId();
-
-
- // Notations never have a nodeValue.
- // @throws DOMException(NO_MODIFICATION_ALLOWED_ERR)
- virtual void setNodeValue(const DOMString &arg);
-
-
+
+
// NON-DOM: The Public Identifier for this Notation. If no public
// identifier was specified, this will be null. */
virtual void setPublicId(const DOMString &arg);
-
-
+
+
// NON-DOM: The System Identifier for this Notation. If no system
// identifier was specified, this will be null. */
virtual void setSystemId(const DOMString &arg);
-
+
};
-#endif
+#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org